From 31b9466cc7815b653e527a50710756f464cd44ca Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:33:08 -0500 Subject: [PATCH 01/64] Source alignContent options from config --- src/plugins/alignContent.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/alignContent.js b/src/plugins/alignContent.js index a70ec6cbe..52372d146 100644 --- a/src/plugins/alignContent.js +++ b/src/plugins/alignContent.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.content-center': { @@ -18,7 +18,7 @@ export default function({ variants }) { 'align-content': 'space-around', }, }, - variants + config('variants.alignContent') ) } } From d0460f7e0d4ac29bfbe7c012c68831e8fad974e6 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:33:50 -0500 Subject: [PATCH 02/64] Source alignItems options from config --- src/plugins/alignItems.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/alignItems.js b/src/plugins/alignItems.js index 5933a829b..8391decc9 100644 --- a/src/plugins/alignItems.js +++ b/src/plugins/alignItems.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.items-start': { @@ -18,7 +18,7 @@ export default function({ variants }) { 'align-items': 'stretch', }, }, - variants + config('variants.alignItems') ) } } From b08455b8a15112f8b4ca8f2f64beaa7023041a48 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:34:18 -0500 Subject: [PATCH 03/64] Source alignSelf options from config --- src/plugins/alignSelf.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/alignSelf.js b/src/plugins/alignSelf.js index 579fbf757..8d0fadaae 100644 --- a/src/plugins/alignSelf.js +++ b/src/plugins/alignSelf.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.self-auto': { @@ -18,7 +18,7 @@ export default function({ variants }) { 'align-self': 'stretch', }, }, - variants + config('variants.alignSelf') ) } } From a973e84ceb077682ea5d821b43ae6dde72bd43fa Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:34:58 -0500 Subject: [PATCH 04/64] Source appearance options from config --- src/plugins/appearance.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/appearance.js b/src/plugins/appearance.js index 74bbd600d..bc8eff980 100644 --- a/src/plugins/appearance.js +++ b/src/plugins/appearance.js @@ -1,10 +1,10 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.appearance-none': { appearance: 'none' }, }, - variants + config('variants.appearance') ) } } From 89fc1e42bcf80d20586d44883db0c6494ed6e556 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:35:34 -0500 Subject: [PATCH 05/64] Source backgroundAttachment options from config --- src/plugins/backgroundAttachment.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/backgroundAttachment.js b/src/plugins/backgroundAttachment.js index 9b9371b75..c85914eb6 100644 --- a/src/plugins/backgroundAttachment.js +++ b/src/plugins/backgroundAttachment.js @@ -1,12 +1,12 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.bg-fixed': { 'background-attachment': 'fixed' }, '.bg-local': { 'background-attachment': 'local' }, '.bg-scroll': { 'background-attachment': 'scroll' }, }, - variants + config('variants.backgroundAttachment') ) } } From 6f1852adf2d37637563452cce039c55a0a154aa4 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:36:26 -0500 Subject: [PATCH 06/64] Source backgroundColor options from config --- src/plugins/backgroundColor.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/backgroundColor.js b/src/plugins/backgroundColor.js index b77413f02..49fca7f66 100644 --- a/src/plugins/backgroundColor.js +++ b/src/plugins/backgroundColor.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.backgroundColor'), (value, modifier) => { return [ `.${e(`bg-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.backgroundColor')) } } From 237baa3188d6e043ab62488681e3f73951f98e9a Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:37:02 -0500 Subject: [PATCH 07/64] Source backgroundPosition options from config --- src/plugins/backgroundPosition.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/backgroundPosition.js b/src/plugins/backgroundPosition.js index 92df71400..530d89801 100644 --- a/src/plugins/backgroundPosition.js +++ b/src/plugins/backgroundPosition.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.backgroundPosition'), (value, modifier) => { return [ `.${e(`bg-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.backgroundPosition')) } } From 6d9cff798d7999146d94468881d6f5160f0076dd Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:39:59 -0500 Subject: [PATCH 08/64] Source backgroundRepeat options from config --- src/plugins/backgroundRepeat.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/backgroundRepeat.js b/src/plugins/backgroundRepeat.js index 9cde18f42..0584e05c4 100644 --- a/src/plugins/backgroundRepeat.js +++ b/src/plugins/backgroundRepeat.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.bg-repeat': { 'background-repeat': 'repeat' }, @@ -7,7 +7,7 @@ export default function({ variants }) { '.bg-repeat-x': { 'background-repeat': 'repeat-x' }, '.bg-repeat-y': { 'background-repeat': 'repeat-y' }, }, - variants + config('variants.backgroundRepeat') ) } } From 28ad7b9e2d8d5e6f52eb1b0d4766d88e98321173 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:40:31 -0500 Subject: [PATCH 09/64] Source backgroundSize options from config --- src/plugins/backgroundSize.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/backgroundSize.js b/src/plugins/backgroundSize.js index 3c2a00285..80114e59e 100644 --- a/src/plugins/backgroundSize.js +++ b/src/plugins/backgroundSize.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.backgroundSize'), (value, modifier) => { return [ `.${e(`bg-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.backgroundSize')) } } From 0f66ec4a97fb449127ccdd6ece2e9d27a63d9729 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:40:54 -0500 Subject: [PATCH 10/64] Source borderCollapse options from config --- src/plugins/borderCollapse.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/borderCollapse.js b/src/plugins/borderCollapse.js index 3a48f9712..0c1ab434e 100644 --- a/src/plugins/borderCollapse.js +++ b/src/plugins/borderCollapse.js @@ -1,11 +1,11 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.border-collapse': { 'border-collapse': 'collapse' }, '.border-separate': { 'border-collapse': 'separate' }, }, - variants + config('variants.borderCollapse') ) } } From 517743513f7053c916ccafee75e83f53c5c43160 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:41:28 -0500 Subject: [PATCH 11/64] Source borderColor options from config --- src/plugins/borderColor.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/borderColor.js b/src/plugins/borderColor.js index 8b0c08b5b..d5af0be69 100644 --- a/src/plugins/borderColor.js +++ b/src/plugins/borderColor.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(_.omit(values, 'default'), (value, modifier) => { + _.map(_.omit(config('theme.borderColor'), 'default'), (value, modifier) => { return [ `.${e(`border-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.borderColor')) } } From 4378cb629b6c489b53e9c1032b8e2a91175957ec Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:50:01 -0500 Subject: [PATCH 12/64] Source borderRadius options from config --- src/plugins/borderRadius.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/borderRadius.js b/src/plugins/borderRadius.js index 26a85d0c5..20b3e2019 100644 --- a/src/plugins/borderRadius.js +++ b/src/plugins/borderRadius.js @@ -1,7 +1,7 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const generators = [ (value, modifier) => ({ [`.${e(`rounded${modifier}`)}`]: { borderRadius: `${value}` }, @@ -33,11 +33,11 @@ export default function({ values, variants }) { ] const utilities = _.flatMap(generators, generator => { - return _.flatMap(values, (value, modifier) => { + return _.flatMap(config('theme.borderRadius'), (value, modifier) => { return generator(value, modifier === 'default' ? '' : `-${modifier}`) }) }) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.borderRadius')) } } From a3c3007a8117b841f6657c094f786ec65121434e Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:50:27 -0500 Subject: [PATCH 13/64] Source borderStyle options from config --- src/plugins/borderStyle.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/borderStyle.js b/src/plugins/borderStyle.js index 336123890..f509ff6b9 100644 --- a/src/plugins/borderStyle.js +++ b/src/plugins/borderStyle.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.border-solid': { @@ -15,7 +15,7 @@ export default function({ variants }) { 'border-style': 'none', }, }, - variants + config('borderStyle.variants') ) } } From ae7d2a1ff10d00ac5ee7cbdcaa8364b58e3df936 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:50:56 -0500 Subject: [PATCH 14/64] Source borderWidth options from config --- src/plugins/borderWidth.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/borderWidth.js b/src/plugins/borderWidth.js index 07e3e1734..becebefa2 100644 --- a/src/plugins/borderWidth.js +++ b/src/plugins/borderWidth.js @@ -1,7 +1,7 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const generators = [ (value, modifier) => ({ [`.${e(`border${modifier}`)}`]: { borderWidth: `${value}` }, @@ -15,11 +15,11 @@ export default function({ values, variants }) { ] const utilities = _.flatMap(generators, generator => { - return _.flatMap(values, (value, modifier) => { + return _.flatMap(config('theme.borderWidth'), (value, modifier) => { return generator(value, modifier === 'default' ? '' : `-${modifier}`) }) }) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.borderWidth')) } } From 8e5a7442377d94f9da9c12863a71dde534e51d9b Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:51:23 -0500 Subject: [PATCH 15/64] Source boxShadow options from config --- src/plugins/boxShadow.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/boxShadow.js b/src/plugins/boxShadow.js index e2ec6705f..7d188bc9d 100644 --- a/src/plugins/boxShadow.js +++ b/src/plugins/boxShadow.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.boxShadow'), (value, modifier) => { const className = modifier === 'default' ? 'shadow' : `shadow-${modifier}` return [ `.${e(className)}`, @@ -14,6 +14,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.boxShadow')) } } From d9bdafecf4d96c7bcf5f89cc5a26de28202cb0bd Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:52:00 -0500 Subject: [PATCH 16/64] Source cursor options from config --- src/plugins/cursor.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/cursor.js b/src/plugins/cursor.js index a81f34ef0..c932ba2b7 100644 --- a/src/plugins/cursor.js +++ b/src/plugins/cursor.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.cursor'), (value, modifier) => { return [ `.${e(`cursor-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.cursor')) } } From 3ca9e20ed227ada5c48a539f434878538166f2c5 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:52:18 -0500 Subject: [PATCH 17/64] Source display options from config --- src/plugins/display.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/display.js b/src/plugins/display.js index 0dd583453..48d627962 100644 --- a/src/plugins/display.js +++ b/src/plugins/display.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.block': { @@ -30,7 +30,7 @@ export default function({ variants }) { display: 'none', }, }, - variants + config('variants.display') ) } } From 35094c9804fd9c38a5b962f29b4852cdd88acabb Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:52:39 -0500 Subject: [PATCH 18/64] Source fill options from config --- src/plugins/fill.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/fill.js b/src/plugins/fill.js index 95d051651..88a84cc9b 100644 --- a/src/plugins/fill.js +++ b/src/plugins/fill.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, fill }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.fill'), (value, modifier) => { return [ `.${e(`fill-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.fill')) } } From 35442918eeef0882e9a6c867025feef0a327d7b0 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:53:36 -0500 Subject: [PATCH 19/64] Fix mistakes --- src/plugins/borderStyle.js | 2 +- src/plugins/fill.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/borderStyle.js b/src/plugins/borderStyle.js index f509ff6b9..5cb053243 100644 --- a/src/plugins/borderStyle.js +++ b/src/plugins/borderStyle.js @@ -15,7 +15,7 @@ export default function() { 'border-style': 'none', }, }, - config('borderStyle.variants') + config('variants.borderStyle') ) } } diff --git a/src/plugins/fill.js b/src/plugins/fill.js index 88a84cc9b..d975cfd0d 100644 --- a/src/plugins/fill.js +++ b/src/plugins/fill.js @@ -1,7 +1,7 @@ import _ from 'lodash' export default function() { - return function({ addUtilities, e, fill }) { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( _.map(config('theme.fill'), (value, modifier) => { return [ From f355af33c446a700d961ca65b3a24baad9b09c25 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:54:37 -0500 Subject: [PATCH 20/64] Source flex options from config --- src/plugins/flex.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/flex.js b/src/plugins/flex.js index ee3e0c80f..0016cc885 100644 --- a/src/plugins/flex.js +++ b/src/plugins/flex.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.flex-1': { @@ -15,7 +15,7 @@ export default function({ variants }) { flex: 'none', }, }, - variants + config('variants.flex') ) } } From 9c1104a7098225b010e5b3846712db9c11ffcf53 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:55:37 -0500 Subject: [PATCH 21/64] Source flexDirection options from config --- src/plugins/flexDirection.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/flexDirection.js b/src/plugins/flexDirection.js index 338c113c2..1bbe00a26 100644 --- a/src/plugins/flexDirection.js +++ b/src/plugins/flexDirection.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.flex-row': { @@ -15,7 +15,7 @@ export default function({ variants }) { 'flex-direction': 'column-reverse', }, }, - variants + config('variants.flexDirection') ) } } From f7a2411a9672ac08e1cda783c1654c670a006ccd Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:56:01 -0500 Subject: [PATCH 22/64] Source flexGrow options from config --- src/plugins/flexGrow.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/flexGrow.js b/src/plugins/flexGrow.js index b7bd9a7f8..a33571dd3 100644 --- a/src/plugins/flexGrow.js +++ b/src/plugins/flexGrow.js @@ -1,10 +1,10 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { addUtilities( _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.flexGrow'), (value, modifier) => { const className = modifier === 'default' ? 'flex-grow' : `flex-grow-${modifier}` return [ `.${e(className)}`, @@ -14,7 +14,7 @@ export default function({ values, variants }) { ] }) ), - variants + config('variants.flexGrow') ) } } From b850ba28854d2b49f41fb4b6931eeab64649b9c1 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:56:46 -0500 Subject: [PATCH 23/64] Source flexShrink options from config --- src/plugins/flexShrink.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/flexShrink.js b/src/plugins/flexShrink.js index cbce7c127..2dbc7ecbe 100644 --- a/src/plugins/flexShrink.js +++ b/src/plugins/flexShrink.js @@ -1,10 +1,10 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { addUtilities( _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.flexShrink'), (value, modifier) => { const className = modifier === 'default' ? 'flex-shrink' : `flex-shrink-${modifier}` return [ `.${e(className)}`, @@ -14,7 +14,7 @@ export default function({ values, variants }) { ] }) ), - variants + config('variants.flexShrink') ) } } From 5504bd1360409e92ad003eab4db75146e5b0a96b Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:57:07 -0500 Subject: [PATCH 24/64] Source flexWrap options from config --- src/plugins/flexWrap.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/flexWrap.js b/src/plugins/flexWrap.js index 369d1bb35..45e6783d2 100644 --- a/src/plugins/flexWrap.js +++ b/src/plugins/flexWrap.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.flex-wrap': { @@ -12,7 +12,7 @@ export default function({ variants }) { 'flex-wrap': 'nowrap', }, }, - variants + config('variants.flexWrap') ) } } From 1f7f9e394eeffbec43c84136e69f371db6507ca8 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:58:21 -0500 Subject: [PATCH 25/64] Source float options from config --- src/plugins/float.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/float.js b/src/plugins/float.js index c39a4fbcf..03aed4583 100644 --- a/src/plugins/float.js +++ b/src/plugins/float.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.float-right': { float: 'right' }, @@ -11,7 +11,7 @@ export default function({ variants }) { clear: 'both', }, }, - variants + config('variants.float') ) } } From 444236c4276fe0b693d08bafcbb3da8ec7899bd2 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:58:49 -0500 Subject: [PATCH 26/64] Source fontFamily options from config --- src/plugins/fontFamily.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/fontFamily.js b/src/plugins/fontFamily.js index 03b3a8de1..49dced1ec 100644 --- a/src/plugins/fontFamily.js +++ b/src/plugins/fontFamily.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.fontFamily'), (value, modifier) => { return [ `.${e(`font-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.fontFamily')) } } From db0a283dea7d09bde49e10f22ffc7595777744c2 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:59:17 -0500 Subject: [PATCH 27/64] Source fontSize options from config --- src/plugins/fontSize.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/fontSize.js b/src/plugins/fontSize.js index 05cc4fdd8..f49bec24a 100644 --- a/src/plugins/fontSize.js +++ b/src/plugins/fontSize.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.fontSize'), (value, modifier) => { return [ `.${e(`text-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.fontSize')) } } From 90e28a087a577eb997fff0543be3946dcb587db7 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:59:37 -0500 Subject: [PATCH 28/64] Source fontSmoothing options from config --- src/plugins/fontSmoothing.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/fontSmoothing.js b/src/plugins/fontSmoothing.js index d34fc6e8e..91186056e 100644 --- a/src/plugins/fontSmoothing.js +++ b/src/plugins/fontSmoothing.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.antialiased': { @@ -11,7 +11,7 @@ export default function({ variants }) { '-moz-osx-font-smoothing': 'auto', }, }, - variants + config('variants.fontSmoothing') ) } } From bef8775818ddc26ab7104ec41ea3a040756e011c Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 11:59:54 -0500 Subject: [PATCH 29/64] Source fontStyle options from config --- src/plugins/fontStyle.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/fontStyle.js b/src/plugins/fontStyle.js index 110a628dc..5ff8ccd28 100644 --- a/src/plugins/fontStyle.js +++ b/src/plugins/fontStyle.js @@ -1,11 +1,11 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.italic': { 'font-style': 'italic' }, '.not-italic': { 'font-style': 'normal' }, }, - variants + config('variants.fontStyle') ) } } From f51542fd91a5f9bc1850b37a0cc8c24a35fcf1f7 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:00:22 -0500 Subject: [PATCH 30/64] Source fontWeight options from config --- src/plugins/fontWeight.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/fontWeight.js b/src/plugins/fontWeight.js index ebc19d7db..b677f4f52 100644 --- a/src/plugins/fontWeight.js +++ b/src/plugins/fontWeight.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.fontWeight'), (value, modifier) => { return [ `.${e(`font-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.fontWeight')) } } From 1637e943671e36850e2aa72f77891041807f1be0 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:01:04 -0500 Subject: [PATCH 31/64] Source height options from config --- src/plugins/height.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/height.js b/src/plugins/height.js index f3aed0399..6f87b9ea1 100644 --- a/src/plugins/height.js +++ b/src/plugins/height.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.height'), (value, modifier) => { return [ `.${e(`h-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.height')) } } From ebcd4b0bfe125fa79f920b053b96fccedd20975e Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:01:29 -0500 Subject: [PATCH 32/64] Source justifyContent options from config --- src/plugins/justifyContent.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/justifyContent.js b/src/plugins/justifyContent.js index 1c18b2173..b6567c17d 100644 --- a/src/plugins/justifyContent.js +++ b/src/plugins/justifyContent.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.justify-start': { @@ -18,7 +18,7 @@ export default function({ variants }) { 'justify-content': 'space-around', }, }, - variants + config('variants.justifyContent') ) } } From 9179c8aa36a22091a2fec3780245abe3d0565892 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:02:19 -0500 Subject: [PATCH 33/64] Source letterSpacing options from config --- src/plugins/letterSpacing.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/letterSpacing.js b/src/plugins/letterSpacing.js index 3fb1683f4..ae3e36857 100644 --- a/src/plugins/letterSpacing.js +++ b/src/plugins/letterSpacing.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.letterSpacing'), (value, modifier) => { return [ `.tracking-${modifier}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.letterSpacing')) } } From 00f72f639339b1584a639426c76d95c63a30df54 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:03:56 -0500 Subject: [PATCH 34/64] Source lineHeight options from config --- src/plugins/lineHeight.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/lineHeight.js b/src/plugins/lineHeight.js index 882b62220..1a9b341a4 100644 --- a/src/plugins/lineHeight.js +++ b/src/plugins/lineHeight.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.lineHeight'), (value, modifier) => { return [ `.${e(`leading-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.lineHeight')) } } From 7d6a0220fa4377d39f2877af0e5e5dea89da2e8b Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:05:12 -0500 Subject: [PATCH 35/64] Source listStyle options from config --- src/plugins/listStyle.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/listStyle.js b/src/plugins/listStyle.js index 9d2782854..13a3f5cd2 100644 --- a/src/plugins/listStyle.js +++ b/src/plugins/listStyle.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.list-reset': { @@ -7,7 +7,7 @@ export default function({ variants }) { padding: '0', }, }, - variants + config('variants.listStyle') ) } } From e23dc23c0c2121df2c8fa229bf0d69dc6eab23c0 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:05:36 -0500 Subject: [PATCH 36/64] Source margin options from config --- src/plugins/margin.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/margin.js b/src/plugins/margin.js index f5c2937c8..c0ec76bc9 100644 --- a/src/plugins/margin.js +++ b/src/plugins/margin.js @@ -1,7 +1,7 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const generators = [ (size, modifier) => ({ [`.${e(`m-${modifier}`)}`]: { margin: `${size}` }, @@ -19,9 +19,9 @@ export default function({ values, variants }) { ] const utilities = _.flatMap(generators, generator => { - return _.flatMap(values, generator) + return _.flatMap(config('theme.margin'), generator) }) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.margin')) } } From 3c0af9ecb862b9a1ce179edd8de04d80cf233919 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:06:32 -0500 Subject: [PATCH 37/64] Source maxHeight options from config --- src/plugins/maxHeight.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/maxHeight.js b/src/plugins/maxHeight.js index b7a103f24..3d803fdbf 100644 --- a/src/plugins/maxHeight.js +++ b/src/plugins/maxHeight.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.maxHeight'), (value, modifier) => { return [ `.${e(`max-h-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.maxHeight')) } } From aeb37c7e760b76a4b12ddbced46e7a82e842cfb3 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:06:59 -0500 Subject: [PATCH 38/64] Source maxWidth options from config --- src/plugins/maxWidth.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/maxWidth.js b/src/plugins/maxWidth.js index 2aa3720bc..4aa7b2070 100644 --- a/src/plugins/maxWidth.js +++ b/src/plugins/maxWidth.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.maxWidth'), (value, modifier) => { return [ `.${e(`max-w-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.maxWidth')) } } From 55d8b694e3f02a82916d1ced811b2778766f12f5 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:15:40 -0500 Subject: [PATCH 39/64] Source minHeight options from config --- src/plugins/minHeight.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/minHeight.js b/src/plugins/minHeight.js index 651d3d19f..70ae5920b 100644 --- a/src/plugins/minHeight.js +++ b/src/plugins/minHeight.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.minHeight'), (value, modifier) => { return [ `.${e(`min-h-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.minHeight')) } } From 8f6a69f4585e76f3568fdcde284443294f81b385 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:19:07 -0500 Subject: [PATCH 40/64] Source minWidth options from config --- src/plugins/minWidth.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/minWidth.js b/src/plugins/minWidth.js index dff0e7b20..ff830170c 100644 --- a/src/plugins/minWidth.js +++ b/src/plugins/minWidth.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.minWidth'), (value, modifier) => { return [ `.${e(`min-w-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.minWidth')) } } From 7c409e2f4b05ffea113a0a8a9c289a18f465277e Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:20:39 -0500 Subject: [PATCH 41/64] Source negativeMargin options from config --- src/plugins/negativeMargin.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/negativeMargin.js b/src/plugins/negativeMargin.js index 9ef20dfa4..4353c5589 100644 --- a/src/plugins/negativeMargin.js +++ b/src/plugins/negativeMargin.js @@ -1,7 +1,7 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const generators = [ (size, modifier) => ({ [`.${e(`-m-${modifier}`)}`]: { margin: `${size}` }, @@ -19,11 +19,11 @@ export default function({ values, variants }) { ] const utilities = _.flatMap(generators, generator => { - return _.flatMap(values, (size, modifier) => { + return _.flatMap(config('theme.negativeMargin'), (size, modifier) => { return generator(`${size}` === '0' ? `${size}` : `-${size}`, modifier) }) }) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.negativeMargin')) } } From 3c5fad4fb45b4f916abed2e9f5a69e4e407a0e97 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:21:22 -0500 Subject: [PATCH 42/64] Source objectFit options from config --- src/plugins/objectFit.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/objectFit.js b/src/plugins/objectFit.js index bfbcb42a4..883eaf192 100644 --- a/src/plugins/objectFit.js +++ b/src/plugins/objectFit.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.object-contain': { 'object-fit': 'contain' }, @@ -8,7 +8,7 @@ export default function({ variants }) { '.object-none': { 'object-fit': 'none' }, '.object-scale-down': { 'object-fit': 'scale-down' }, }, - variants + config('variants.objectFit') ) } } From 1a2b5652c1ffe6959d54407835b3fab25238adba Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:21:56 -0500 Subject: [PATCH 43/64] Source objectPosition options from config --- src/plugins/objectPosition.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/objectPosition.js b/src/plugins/objectPosition.js index fcabe4a14..a52202549 100644 --- a/src/plugins/objectPosition.js +++ b/src/plugins/objectPosition.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.objectPosition'), (value, modifier) => { return [ `.${e(`object-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.objectPosition')) } } From 4e1774254e691ddd30f3dfb2d43cf7132d878e64 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:22:24 -0500 Subject: [PATCH 44/64] Source opacity options from config --- src/plugins/opacity.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/opacity.js b/src/plugins/opacity.js index 350d62e76..88051c1a1 100644 --- a/src/plugins/opacity.js +++ b/src/plugins/opacity.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.opacity'), (value, modifier) => { return [ `.${e(`opacity-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.opacity')) } } From f323a546bdfe7a6f479985b9b273d12b8529e703 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:24:53 -0500 Subject: [PATCH 45/64] Source outline options from config --- src/plugins/outline.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/outline.js b/src/plugins/outline.js index 352d979e6..4c6483947 100644 --- a/src/plugins/outline.js +++ b/src/plugins/outline.js @@ -1,10 +1,10 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.outline-none': { outline: '0' }, }, - variants + config('variants.outline') ) } } From 3494cf509f1d60f80cc746928ae07a4521ebd857 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:25:04 -0500 Subject: [PATCH 46/64] Source overflow options from config --- src/plugins/overflow.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/overflow.js b/src/plugins/overflow.js index d13969db2..bbd769836 100644 --- a/src/plugins/overflow.js +++ b/src/plugins/overflow.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.overflow-auto': { overflow: 'auto' }, @@ -17,7 +17,7 @@ export default function({ variants }) { '.scrolling-touch': { '-webkit-overflow-scrolling': 'touch' }, '.scrolling-auto': { '-webkit-overflow-scrolling': 'auto' }, }, - variants + config('variants.overflow') ) } } From eea9c9ab75d67030bfdcfb7570181a2478291df3 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:32:13 -0500 Subject: [PATCH 47/64] Source padding options from config --- src/plugins/padding.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/padding.js b/src/plugins/padding.js index 35462b28a..ef8ed7537 100644 --- a/src/plugins/padding.js +++ b/src/plugins/padding.js @@ -1,7 +1,7 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const generators = [ (size, modifier) => ({ [`.${e(`p-${modifier}`)}`]: { padding: `${size}` }, @@ -19,9 +19,9 @@ export default function({ values, variants }) { ] const utilities = _.flatMap(generators, generator => { - return _.flatMap(values, generator) + return _.flatMap(config('theme.padding'), generator) }) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.padding')) } } From 64c026f2e0e6c88ffdbcb393c0e01a73aa577c94 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:32:37 -0500 Subject: [PATCH 48/64] Source pointerEvents options from config --- src/plugins/pointerEvents.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/pointerEvents.js b/src/plugins/pointerEvents.js index b9d6826bf..c82659b76 100644 --- a/src/plugins/pointerEvents.js +++ b/src/plugins/pointerEvents.js @@ -1,11 +1,11 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.pointer-events-none': { 'pointer-events': 'none' }, '.pointer-events-auto': { 'pointer-events': 'auto' }, }, - variants + config('variants.pointerEvents') ) } } From 462530fad2f7eccf15a281f8e130f6eae93b5d92 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:33:10 -0500 Subject: [PATCH 49/64] Source position options from config --- src/plugins/position.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/position.js b/src/plugins/position.js index 4c831aacb..1fdbb7269 100644 --- a/src/plugins/position.js +++ b/src/plugins/position.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.static': { position: 'static' }, @@ -26,7 +26,7 @@ export default function({ variants }) { '.pin-b': { bottom: 0 }, '.pin-l': { left: 0 }, }, - variants + config('variants.position') ) } } From 940043d9b8856a97db85aef4d2a0cd081020a903 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:33:33 -0500 Subject: [PATCH 50/64] Source resize options from config --- src/plugins/resize.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/resize.js b/src/plugins/resize.js index d77a8fbe9..f92477d31 100644 --- a/src/plugins/resize.js +++ b/src/plugins/resize.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.resize-none': { resize: 'none' }, @@ -7,7 +7,7 @@ export default function({ variants }) { '.resize-x': { resize: 'horizontal' }, '.resize': { resize: 'both' }, }, - variants + config('variants.resize') ) } } From 1db5983058b9b1549f9ac988ef61ff4ec932a9ae Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:33:59 -0500 Subject: [PATCH 51/64] Source stroke options from config --- src/plugins/stroke.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/stroke.js b/src/plugins/stroke.js index f8e0513c8..0fae615c3 100644 --- a/src/plugins/stroke.js +++ b/src/plugins/stroke.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.stroke'), (value, modifier) => { return [ `.${e(`stroke-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.stroke')) } } From ecfdf48aefe174783c6548dfc63bea359c901aa7 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:35:29 -0500 Subject: [PATCH 52/64] Source tableLayout options from config --- src/plugins/tableLayout.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/tableLayout.js b/src/plugins/tableLayout.js index b890a2370..88902937f 100644 --- a/src/plugins/tableLayout.js +++ b/src/plugins/tableLayout.js @@ -1,11 +1,11 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.table-auto': { 'table-layout': 'auto' }, '.table-fixed': { 'table-layout': 'fixed' }, }, - variants + config('variants.tableLayout') ) } } From dc57496674396fde46332e82165623e2fbca5e41 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:35:48 -0500 Subject: [PATCH 53/64] Source textAlign options from config --- src/plugins/textAlign.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/textAlign.js b/src/plugins/textAlign.js index 9cd80df08..81d1f286b 100644 --- a/src/plugins/textAlign.js +++ b/src/plugins/textAlign.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.text-left': { 'text-align': 'left' }, @@ -7,7 +7,7 @@ export default function({ variants }) { '.text-right': { 'text-align': 'right' }, '.text-justify': { 'text-align': 'justify' }, }, - variants + config('variants.textAlign') ) } } From 467d810e5823a06c17fe6aed2588716c576d161c Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:36:18 -0500 Subject: [PATCH 54/64] Source textColor options from config --- src/plugins/textColor.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/textColor.js b/src/plugins/textColor.js index 910110608..7737a5e61 100644 --- a/src/plugins/textColor.js +++ b/src/plugins/textColor.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.textColor'), (value, modifier) => { return [ `.${e(`text-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.textColor')) } } From 64ac57f6e75b6cb08fe11eabc1f4bdc7e7ec92e7 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:36:37 -0500 Subject: [PATCH 55/64] Source textDecoration options from config --- src/plugins/textDecoration.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/textDecoration.js b/src/plugins/textDecoration.js index 5217fd026..40a572f2b 100644 --- a/src/plugins/textDecoration.js +++ b/src/plugins/textDecoration.js @@ -1,12 +1,12 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.underline': { 'text-decoration': 'underline' }, '.line-through': { 'text-decoration': 'line-through' }, '.no-underline': { 'text-decoration': 'none' }, }, - variants + config('variants.textDecoration') ) } } From 0c633b8e896bfdbdd672d7f46bcbde2775895dc4 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:37:37 -0500 Subject: [PATCH 56/64] Source textTransform options from config --- src/plugins/textTransform.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/textTransform.js b/src/plugins/textTransform.js index 8e5ed8439..a85d87811 100644 --- a/src/plugins/textTransform.js +++ b/src/plugins/textTransform.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.uppercase': { 'text-transform': 'uppercase' }, @@ -7,7 +7,7 @@ export default function({ variants }) { '.capitalize': { 'text-transform': 'capitalize' }, '.normal-case': { 'text-transform': 'none' }, }, - variants + config('variants.textTransform') ) } } From 7e848e71e4a3c172ad4033034766599a77ebfb7b Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:37:47 -0500 Subject: [PATCH 57/64] Source userSelect options from config --- src/plugins/userSelect.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/userSelect.js b/src/plugins/userSelect.js index 2e60869bf..771ee5890 100644 --- a/src/plugins/userSelect.js +++ b/src/plugins/userSelect.js @@ -1,11 +1,11 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.select-none': { 'user-select': 'none' }, '.select-text': { 'user-select': 'text' }, }, - variants + config('variants.userSelect') ) } } From bcdbcaaf4e1431d87d1efee414a8b2f5b7397f74 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:38:06 -0500 Subject: [PATCH 58/64] Source verticalAlign options from config --- src/plugins/verticalAlign.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/verticalAlign.js b/src/plugins/verticalAlign.js index 3adae6a08..195aa7d2c 100644 --- a/src/plugins/verticalAlign.js +++ b/src/plugins/verticalAlign.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.align-baseline': { 'vertical-align': 'baseline' }, @@ -9,7 +9,7 @@ export default function({ variants }) { '.align-text-top': { 'vertical-align': 'text-top' }, '.align-text-bottom': { 'vertical-align': 'text-bottom' }, }, - variants + config('variants.verticalAlign') ) } } From 340628f2179ae79165cee5013a55a5a74771e83d Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:38:23 -0500 Subject: [PATCH 59/64] Source visibility options from config --- src/plugins/visibility.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/visibility.js b/src/plugins/visibility.js index 528b81a74..063b6c497 100644 --- a/src/plugins/visibility.js +++ b/src/plugins/visibility.js @@ -1,11 +1,11 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.visible': { visibility: 'visible' }, '.invisible': { visibility: 'hidden' }, }, - variants + config('variants.visibility') ) } } From a9d9492ff9d3df53ea5861b364a25b1074164143 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:38:51 -0500 Subject: [PATCH 60/64] Source whitespace options from config --- src/plugins/whitespace.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/whitespace.js b/src/plugins/whitespace.js index 2660dae60..61bf32d32 100644 --- a/src/plugins/whitespace.js +++ b/src/plugins/whitespace.js @@ -1,5 +1,5 @@ -export default function({ variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { addUtilities( { '.whitespace-normal': { 'white-space': 'normal' }, @@ -20,7 +20,7 @@ export default function({ variants }) { 'white-space': 'nowrap', }, }, - variants + config('variants.whitespace') ) } } From 51b2d0550614c5502089b3c01e5a68dd93c8657e Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 12:39:17 -0500 Subject: [PATCH 61/64] Source width options from config --- src/plugins/width.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/width.js b/src/plugins/width.js index 2d5e962ff..4ca39dbb8 100644 --- a/src/plugins/width.js +++ b/src/plugins/width.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities, e }) { +export default function() { + return function({ addUtilities, e, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.width'), (value, modifier) => { return [ `.${e(`w-${modifier}`)}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.width')) } } From 928bc549dd7016fcabe3d3a1741920dc78373e53 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 14:22:52 -0500 Subject: [PATCH 62/64] Source zIndex options from config --- src/plugins/zIndex.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/zIndex.js b/src/plugins/zIndex.js index 9125aff25..fdbee879b 100644 --- a/src/plugins/zIndex.js +++ b/src/plugins/zIndex.js @@ -1,9 +1,9 @@ import _ from 'lodash' -export default function({ values, variants }) { - return function({ addUtilities }) { +export default function() { + return function({ addUtilities, config }) { const utilities = _.fromPairs( - _.map(values, (value, modifier) => { + _.map(config('theme.zIndex'), (value, modifier) => { return [ `.z-${modifier}`, { @@ -13,6 +13,6 @@ export default function({ values, variants }) { }) ) - addUtilities(utilities, variants) + addUtilities(utilities, config('variants.zIndex')) } } From 51e60071cf75b0a0cf8dc10c44287c3ab54c57e9 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 14:39:59 -0500 Subject: [PATCH 63/64] Fix test --- __tests__/applyAtRule.test.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/__tests__/applyAtRule.test.js b/__tests__/applyAtRule.test.js index a099f1d86..d2ac99272 100644 --- a/__tests__/applyAtRule.test.js +++ b/__tests__/applyAtRule.test.js @@ -5,12 +5,14 @@ import resolveConfig from '../src/util/resolveConfig' import corePlugins from '../src/corePlugins' import defaultConfig from '../defaultConfig.stub.js' +const resolvedDefaultConfig = resolveConfig([defaultConfig]) + const { utilities: defaultUtilities } = processPlugins( - corePlugins(resolveConfig([defaultConfig])), - defaultConfig + corePlugins(resolvedDefaultConfig), + resolvedDefaultConfig ) -function run(input, config = defaultConfig, utilities = defaultUtilities) { +function run(input, config = resolvedDefaultConfig, utilities = defaultUtilities) { return postcss([substituteClassApplyAtRules(config, utilities)]).process(input, { from: undefined, }) From e99753bc33513fae1f3dbd1c2dadabfcbd67f738 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 28 Feb 2019 14:53:55 -0500 Subject: [PATCH 64/64] Update plugins to source their config themselves Instead of plugins being configured directly, they grab their configuration from the Tailwind config passed to them. This makes core plugins consistent with how we will recommend third-party plugins be authored so that the configuration for everything in the system is readable through the theme. --- __tests__/configurePlugins.test.js | 175 +---------------------------- src/corePlugins.js | 19 +--- src/util/configurePlugins.js | 6 +- 3 files changed, 10 insertions(+), 190 deletions(-) diff --git a/__tests__/configurePlugins.test.js b/__tests__/configurePlugins.test.js index a06ea79d6..69c341a09 100644 --- a/__tests__/configurePlugins.test.js +++ b/__tests__/configurePlugins.test.js @@ -2,180 +2,17 @@ import configurePlugins from '../src/util/configurePlugins' test('setting a plugin to false removes it', () => { const plugins = { - fontSize: options => { - return { - plugin: 'fontSize', - options, - } - }, - display: options => { - return { - plugin: 'display', - options, - } - }, - backgroundPosition: options => { - return { - plugin: 'backgroundPosition', - options, - } - }, - } - - const configuredPlugins = configurePlugins(plugins, { - fontSize: {}, - display: false, - backgroundPosition: {}, - }) - - expect(configuredPlugins).toEqual([ - { plugin: 'fontSize', options: {} }, - { plugin: 'backgroundPosition', options: {} }, - ]) -}) - -test('setting a plugin to an object configures that plugin', () => { - const plugins = { - fontSize: options => { - return { - plugin: 'fontSize', - options, - } - }, - display: options => { - return { - plugin: 'display', - options, - } - }, - backgroundPosition: options => { - return { - plugin: 'backgroundPosition', - options, - } - }, - } - - const configuredPlugins = configurePlugins(plugins, { - fontSize: { - variants: ['responsive', 'hover'], - values: { '12': '12px', '14': '14px', '16': '16px' }, - }, - display: { variants: ['responsive'] }, - backgroundPosition: {}, - }) - - expect(configuredPlugins).toEqual([ - { - plugin: 'fontSize', - options: { - variants: ['responsive', 'hover'], - values: { '12': '12px', '14': '14px', '16': '16px' }, - }, - }, - { plugin: 'display', options: { variants: ['responsive'] } }, - { plugin: 'backgroundPosition', options: {} }, - ]) -}) - -test('plugins are configured with their default configuration if no custom config is provided', () => { - const plugins = { - fontSize: options => { - return { - plugin: 'fontSize', - options, - } - }, - display: options => { - return { - plugin: 'display', - options, - } - }, - backgroundPosition: options => { - return { - plugin: 'backgroundPosition', - options, - } - }, + fontSize: () => 'fontSize', + display: () => 'display', + backgroundPosition: () => 'backgroundPosition', } const configuredPlugins = configurePlugins( - plugins, { - fontSize: { - variants: ['responsive', 'hover'], - values: { '12': '12px', '14': '14px', '16': '16px' }, - }, - backgroundPosition: {}, + display: false, }, - { - display: { variants: ['responsive'] }, - } + plugins ) - expect(configuredPlugins).toEqual([ - { - plugin: 'fontSize', - options: { - variants: ['responsive', 'hover'], - values: { '12': '12px', '14': '14px', '16': '16px' }, - }, - }, - { plugin: 'display', options: { variants: ['responsive'] } }, - { plugin: 'backgroundPosition', options: {} }, - ]) -}) - -test('custom plugin configuration overrides default plugin configuration', () => { - const plugins = { - fontSize: options => { - return { - plugin: 'fontSize', - options, - } - }, - display: options => { - return { - plugin: 'display', - options, - } - }, - backgroundPosition: options => { - return { - plugin: 'backgroundPosition', - options, - } - }, - } - - const configuredPlugins = configurePlugins( - plugins, - { - fontSize: { - variants: ['responsive', 'hover'], - values: { '12': '12px', '14': '14px', '16': '16px' }, - }, - display: { variants: ['responsive'] }, - backgroundPosition: {}, - }, - { - fontSize: { - variants: ['focus', 'active'], - values: { sm: '.75rem', md: '1rem', lg: '1.5rem' }, - }, - } - ) - - expect(configuredPlugins).toEqual([ - { - plugin: 'fontSize', - options: { - variants: ['responsive', 'hover'], - values: { '12': '12px', '14': '14px', '16': '16px' }, - }, - }, - { plugin: 'display', options: { variants: ['responsive'] } }, - { plugin: 'backgroundPosition', options: {} }, - ]) + expect(configuredPlugins).toEqual(['fontSize', 'backgroundPosition']) }) diff --git a/src/corePlugins.js b/src/corePlugins.js index a1a586194..7711076af 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -61,25 +61,10 @@ import whitespace from './plugins/whitespace' import width from './plugins/width' import zIndex from './plugins/zIndex' -import _ from 'lodash' import configurePlugins from './util/configurePlugins' -function loadPlugins({ theme, variants, corePlugins }, plugins) { - const defaultCorePluginConfig = _.fromPairs( - Object.keys(plugins).map(plugin => [ - plugin, - { - values: theme[plugin], - variants: variants[plugin], - }, - ]) - ) - - return configurePlugins(plugins, corePlugins, defaultCorePluginConfig) -} - -export default function(config) { - return loadPlugins(config, { +export default function({ corePlugins: corePluginConfig }) { + return configurePlugins(corePluginConfig, { preflight, listStyle, appearance, diff --git a/src/util/configurePlugins.js b/src/util/configurePlugins.js index 0d9e1d225..8cda0a189 100644 --- a/src/util/configurePlugins.js +++ b/src/util/configurePlugins.js @@ -1,11 +1,9 @@ -import _ from 'lodash' - -export default function(plugins, pluginConfig, defaultPluginConfig = {}) { +export default function(pluginConfig, plugins) { return Object.keys(plugins) .filter(pluginName => { return pluginConfig[pluginName] !== false }) .map(pluginName => { - return plugins[pluginName](_.get(pluginConfig, pluginName, defaultPluginConfig[pluginName])) + return plugins[pluginName]() }) }