From 7afeeb70848524a6c055eebff41de01a2fd8cdca Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 2 Apr 2021 14:12:47 -0400 Subject: [PATCH] Fix style --- .eslintrc.json | 2 +- jit/corePlugins/animation.js | 4 +- jit/corePlugins/backgroundColor.js | 4 +- jit/corePlugins/backgroundImage.js | 2 +- jit/corePlugins/backgroundOpacity.js | 2 +- jit/corePlugins/backgroundPosition.js | 2 +- jit/corePlugins/backgroundSize.js | 2 +- jit/corePlugins/borderColor.js | 4 +- jit/corePlugins/borderOpacity.js | 2 +- jit/corePlugins/borderRadius.js | 2 +- jit/corePlugins/borderWidth.js | 2 +- jit/corePlugins/cursor.js | 2 +- jit/corePlugins/divideColor.js | 4 +- jit/corePlugins/divideOpacity.js | 2 +- jit/corePlugins/divideWidth.js | 2 +- jit/corePlugins/fill.js | 7 ++- jit/corePlugins/flexGrow.js | 2 +- jit/corePlugins/flexShrink.js | 2 +- jit/corePlugins/fontSize.js | 2 +- jit/corePlugins/gap.js | 2 +- jit/corePlugins/gridAutoColumns.js | 2 +- jit/corePlugins/gridAutoRows.js | 2 +- jit/corePlugins/gridRowEnd.js | 2 +- jit/corePlugins/gridRowStart.js | 2 +- jit/corePlugins/gridTemplateColumns.js | 2 +- jit/corePlugins/gridTemplateRows.js | 2 +- jit/corePlugins/index.js | 8 ++-- jit/corePlugins/letterSpacing.js | 2 +- jit/corePlugins/lineHeight.js | 2 +- jit/corePlugins/opacity.js | 2 +- jit/corePlugins/order.js | 2 +- jit/corePlugins/outline.js | 2 +- jit/corePlugins/padding.js | 2 +- jit/corePlugins/placeholderColor.js | 7 ++- jit/corePlugins/placeholderOpacity.js | 2 +- jit/corePlugins/ringColor.js | 7 ++- jit/corePlugins/ringOffsetColor.js | 7 ++- jit/corePlugins/ringOffsetWidth.js | 2 +- jit/corePlugins/ringOpacity.js | 2 +- jit/corePlugins/rotate.js | 2 +- jit/corePlugins/scale.js | 2 +- jit/corePlugins/skew.js | 2 +- jit/corePlugins/stroke.js | 7 ++- jit/corePlugins/textColor.js | 7 ++- jit/corePlugins/textOpacity.js | 2 +- jit/corePlugins/transformOrigin.js | 2 +- jit/corePlugins/transitionDelay.js | 2 +- jit/corePlugins/transitionDuration.js | 2 +- jit/corePlugins/transitionProperty.js | 6 +-- jit/corePlugins/transitionTimingFunction.js | 2 +- jit/corePlugins/translate.js | 2 +- jit/corePlugins/zIndex.js | 2 +- jit/index.js | 48 --------------------- jit/lib/collapseAdjacentRules.js | 2 +- jit/lib/generateRules.js | 16 +++---- jit/lib/removeLayerAtRules.js | 2 +- jit/lib/setupContext.js | 3 +- jit/pluginUtils.js | 2 +- jit/tests/modify-selectors.test.js | 2 +- 59 files changed, 84 insertions(+), 143 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index d0832f69..edbcdd19 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,7 +3,7 @@ "jest": true }, "parserOptions": { - "ecmaVersion": 2018, + "ecmaVersion": 2020, "sourceType": "module" }, "extends": ["prettier"], diff --git a/jit/corePlugins/animation.js b/jit/corePlugins/animation.js index 048f9ac9..a45ed9f7 100644 --- a/jit/corePlugins/animation.js +++ b/jit/corePlugins/animation.js @@ -2,9 +2,9 @@ const { nameClass } = require('../pluginUtils') const transformThemeValue = require('../../lib/util/transformThemeValue').default const parseAnimationValue = require('../../lib/util/parseAnimationValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities, theme }) { let keyframes = Object.fromEntries( - Object.entries(theme.keyframes).map(([key, value]) => { + Object.entries(theme('keyframes')).map(([key, value]) => { return [ key, [ diff --git a/jit/corePlugins/backgroundColor.js b/jit/corePlugins/backgroundColor.js index b4f74e5b..2bde03d7 100644 --- a/jit/corePlugins/backgroundColor.js +++ b/jit/corePlugins/backgroundColor.js @@ -2,8 +2,8 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').defaul const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const { asColor, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let colorPalette = flattenColorPalette(theme.backgroundColor) +module.exports = function ({ matchUtilities, theme }) { + let colorPalette = flattenColorPalette(theme('backgroundColor')) matchUtilities({ bg: (modifier) => { diff --git a/jit/corePlugins/backgroundImage.js b/jit/corePlugins/backgroundImage.js index 3de3a40c..69162875 100644 --- a/jit/corePlugins/backgroundImage.js +++ b/jit/corePlugins/backgroundImage.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ bg: (modifier, { theme }) => { let value = theme.backgroundImage[modifier] diff --git a/jit/corePlugins/backgroundOpacity.js b/jit/corePlugins/backgroundOpacity.js index aa0eae3f..ab1b6655 100644 --- a/jit/corePlugins/backgroundOpacity.js +++ b/jit/corePlugins/backgroundOpacity.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme, addVariant, e } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'bg-opacity': (modifier, { theme }) => { let value = asValue(modifier, theme.backgroundOpacity) diff --git a/jit/corePlugins/backgroundPosition.js b/jit/corePlugins/backgroundPosition.js index 1fbeabed..c1a793b3 100644 --- a/jit/corePlugins/backgroundPosition.js +++ b/jit/corePlugins/backgroundPosition.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ bg: (modifier, { theme }) => { let value = theme.backgroundPosition[modifier] diff --git a/jit/corePlugins/backgroundSize.js b/jit/corePlugins/backgroundSize.js index 4dbf5a8c..1659021a 100644 --- a/jit/corePlugins/backgroundSize.js +++ b/jit/corePlugins/backgroundSize.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ bg: (modifier, { theme }) => { let value = theme.backgroundSize[modifier] diff --git a/jit/corePlugins/borderColor.js b/jit/corePlugins/borderColor.js index 9dc09c0c..5c790255 100644 --- a/jit/corePlugins/borderColor.js +++ b/jit/corePlugins/borderColor.js @@ -2,8 +2,8 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').defaul const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const { asColor, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let colorPalette = flattenColorPalette(theme.borderColor) +module.exports = function ({ matchUtilities, theme }) { + let colorPalette = flattenColorPalette(theme('borderColor')) matchUtilities({ border: (modifier) => { diff --git a/jit/corePlugins/borderOpacity.js b/jit/corePlugins/borderOpacity.js index 69b3ae24..4fc4917d 100644 --- a/jit/corePlugins/borderOpacity.js +++ b/jit/corePlugins/borderOpacity.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'border-opacity': (modifier, { theme }) => { let value = asValue(modifier, theme.borderOpacity) diff --git a/jit/corePlugins/borderRadius.js b/jit/corePlugins/borderRadius.js index afbb4215..b3d271c9 100644 --- a/jit/corePlugins/borderRadius.js +++ b/jit/corePlugins/borderRadius.js @@ -1,6 +1,6 @@ const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ rounded: (modifier, { theme }) => { let value = asLength(modifier, theme['borderRadius']) diff --git a/jit/corePlugins/borderWidth.js b/jit/corePlugins/borderWidth.js index 5dc2724b..2177ff5b 100644 --- a/jit/corePlugins/borderWidth.js +++ b/jit/corePlugins/borderWidth.js @@ -1,6 +1,6 @@ const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ border: (modifier, { theme }) => { let value = asLength(modifier, theme['borderWidth']) diff --git a/jit/corePlugins/cursor.js b/jit/corePlugins/cursor.js index 1c04086f..22065f61 100644 --- a/jit/corePlugins/cursor.js +++ b/jit/corePlugins/cursor.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ cursor: (modifier, { theme }) => { let value = asValue(modifier, theme.cursor) diff --git a/jit/corePlugins/divideColor.js b/jit/corePlugins/divideColor.js index 32f734b9..c17d83be 100644 --- a/jit/corePlugins/divideColor.js +++ b/jit/corePlugins/divideColor.js @@ -2,8 +2,8 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').defaul const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const { asColor, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let colorPalette = flattenColorPalette(theme.divideColor) +module.exports = function ({ matchUtilities, theme }) { + let colorPalette = flattenColorPalette(theme('divideColor')) // TODO: Make sure there is no issue with DEFAULT here matchUtilities({ diff --git a/jit/corePlugins/divideOpacity.js b/jit/corePlugins/divideOpacity.js index 5d605147..9c2fa249 100644 --- a/jit/corePlugins/divideOpacity.js +++ b/jit/corePlugins/divideOpacity.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'divide-opacity': (modifier, { theme }) => { let value = asValue(modifier, theme.divideOpacity) diff --git a/jit/corePlugins/divideWidth.js b/jit/corePlugins/divideWidth.js index 72a37726..d572ddb2 100644 --- a/jit/corePlugins/divideWidth.js +++ b/jit/corePlugins/divideWidth.js @@ -1,6 +1,6 @@ const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ addUtilities, matchUtilities, jit: { theme } }) { +module.exports = function ({ addUtilities, matchUtilities }) { matchUtilities({ 'divide-x': (modifier, { theme }) => { let value = asLength(modifier, theme['divideWidth']) diff --git a/jit/corePlugins/fill.js b/jit/corePlugins/fill.js index 4d91dcfa..4d1df2c0 100644 --- a/jit/corePlugins/fill.js +++ b/jit/corePlugins/fill.js @@ -1,13 +1,12 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').default -const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const toColorValue = require('../../lib/util/toColorValue').default const { asColor, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let colorPalette = flattenColorPalette(theme.fill) +module.exports = function ({ matchUtilities, theme }) { + let colorPalette = flattenColorPalette(theme('fill')) matchUtilities({ - fill: (modifier, { theme }) => { + fill: (modifier) => { let value = asColor(modifier, colorPalette) if (value === undefined) { diff --git a/jit/corePlugins/flexGrow.js b/jit/corePlugins/flexGrow.js index 5ef14cc9..b02b0f7e 100644 --- a/jit/corePlugins/flexGrow.js +++ b/jit/corePlugins/flexGrow.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'flex-grow': (modifier, { theme }) => { let value = asValue(modifier, theme.flexGrow) diff --git a/jit/corePlugins/flexShrink.js b/jit/corePlugins/flexShrink.js index e01dee08..c789785d 100644 --- a/jit/corePlugins/flexShrink.js +++ b/jit/corePlugins/flexShrink.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'flex-shrink': (modifier, { theme }) => { let value = asValue(modifier, theme.flexShrink) diff --git a/jit/corePlugins/fontSize.js b/jit/corePlugins/fontSize.js index 1c73c1b7..e20e4663 100644 --- a/jit/corePlugins/fontSize.js +++ b/jit/corePlugins/fontSize.js @@ -1,7 +1,7 @@ const { asLength, nameClass } = require('../pluginUtils') const { isPlainObject } = require('../lib/utils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ text: (modifier, { theme }) => { let value = theme.fontSize[modifier] diff --git a/jit/corePlugins/gap.js b/jit/corePlugins/gap.js index f176e181..5519cd76 100644 --- a/jit/corePlugins/gap.js +++ b/jit/corePlugins/gap.js @@ -1,6 +1,6 @@ const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ gap: (modifier, { theme }) => { let value = asLength(modifier, theme['gap']) diff --git a/jit/corePlugins/gridAutoColumns.js b/jit/corePlugins/gridAutoColumns.js index 9838a46a..90a970b9 100644 --- a/jit/corePlugins/gridAutoColumns.js +++ b/jit/corePlugins/gridAutoColumns.js @@ -1,6 +1,6 @@ const { asList, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'auto-cols': (modifier, { theme }) => { let value = asList(modifier, theme.gridAutoColumns) diff --git a/jit/corePlugins/gridAutoRows.js b/jit/corePlugins/gridAutoRows.js index 4dc38a17..0e40b669 100644 --- a/jit/corePlugins/gridAutoRows.js +++ b/jit/corePlugins/gridAutoRows.js @@ -1,6 +1,6 @@ const { asList, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'auto-rows': (modifier, { theme }) => { let value = asList(modifier, theme.gridAutoRows) diff --git a/jit/corePlugins/gridRowEnd.js b/jit/corePlugins/gridRowEnd.js index 56df03b7..64d6e56f 100644 --- a/jit/corePlugins/gridRowEnd.js +++ b/jit/corePlugins/gridRowEnd.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'row-end': (modifier, { theme }) => { let value = theme.gridRowEnd[modifier] diff --git a/jit/corePlugins/gridRowStart.js b/jit/corePlugins/gridRowStart.js index 270ee48b..683918ed 100644 --- a/jit/corePlugins/gridRowStart.js +++ b/jit/corePlugins/gridRowStart.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'row-start': (modifier, { theme }) => { let value = theme.gridRowStart[modifier] diff --git a/jit/corePlugins/gridTemplateColumns.js b/jit/corePlugins/gridTemplateColumns.js index 9fdf1cef..745b5ba7 100644 --- a/jit/corePlugins/gridTemplateColumns.js +++ b/jit/corePlugins/gridTemplateColumns.js @@ -1,6 +1,6 @@ const { asList, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'grid-cols': (modifier, { theme }) => { let value = asList(modifier, theme.gridTemplateColumns) diff --git a/jit/corePlugins/gridTemplateRows.js b/jit/corePlugins/gridTemplateRows.js index c79cc91f..bff4eb3c 100644 --- a/jit/corePlugins/gridTemplateRows.js +++ b/jit/corePlugins/gridTemplateRows.js @@ -1,6 +1,6 @@ const { asList, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'grid-rows': (modifier, { theme }) => { let value = asList(modifier, theme.gridTemplateRows) diff --git a/jit/corePlugins/index.js b/jit/corePlugins/index.js index 2d5f0d33..3d4c95d7 100644 --- a/jit/corePlugins/index.js +++ b/jit/corePlugins/index.js @@ -10,7 +10,7 @@ const { } = require('../pluginUtils') module.exports = { - pseudoClassVariants: function ({ config, theme, addVariant }) { + pseudoClassVariants: function ({ config, addVariant }) { let pseudoVariants = [ ['first', 'first-child'], ['last', 'last-child'], @@ -62,7 +62,7 @@ module.exports = { ) } }, - directionVariants: function ({ config, theme, addVariant }) { + directionVariants: function ({ config, addVariant }) { addVariant( 'ltr', transformAllSelectors( @@ -85,7 +85,7 @@ module.exports = { ) ) }, - reducedMotionVariants: function ({ config, theme, addVariant }) { + reducedMotionVariants: function ({ config, addVariant }) { addVariant( 'motion-safe', transformLastClasses( @@ -106,7 +106,7 @@ module.exports = { ) ) }, - darkVariants: function ({ config, theme, addVariant }) { + darkVariants: function ({ config, addVariant }) { if (config('darkMode') === 'class') { addVariant( 'dark', diff --git a/jit/corePlugins/letterSpacing.js b/jit/corePlugins/letterSpacing.js index 3767f99e..a4111e9b 100644 --- a/jit/corePlugins/letterSpacing.js +++ b/jit/corePlugins/letterSpacing.js @@ -1,6 +1,6 @@ const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ tracking: (modifier, { theme }) => { let value = asLength(modifier, theme['letterSpacing']) diff --git a/jit/corePlugins/lineHeight.js b/jit/corePlugins/lineHeight.js index b7c8144c..c9e9795e 100644 --- a/jit/corePlugins/lineHeight.js +++ b/jit/corePlugins/lineHeight.js @@ -1,6 +1,6 @@ const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ leading: (modifier, { theme }) => { let value = asLength(modifier, theme['lineHeight']) diff --git a/jit/corePlugins/opacity.js b/jit/corePlugins/opacity.js index 061f547c..2fc8fc85 100644 --- a/jit/corePlugins/opacity.js +++ b/jit/corePlugins/opacity.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ opacity: (modifier, { theme }) => { let value = asValue(modifier, theme.opacity) diff --git a/jit/corePlugins/order.js b/jit/corePlugins/order.js index f7bf2f2a..e17cf14c 100644 --- a/jit/corePlugins/order.js +++ b/jit/corePlugins/order.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ order: (modifier, { theme }) => { let value = asValue(modifier, theme.order) diff --git a/jit/corePlugins/outline.js b/jit/corePlugins/outline.js index ac6f5ecb..c19beb1a 100644 --- a/jit/corePlugins/outline.js +++ b/jit/corePlugins/outline.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ outline: (modifier, { theme }) => { let value = theme.outline[modifier] diff --git a/jit/corePlugins/padding.js b/jit/corePlugins/padding.js index 2b1e7e11..eaf64aea 100644 --- a/jit/corePlugins/padding.js +++ b/jit/corePlugins/padding.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ p: (modifier, { theme }) => { let value = asValue(modifier, theme['padding']) diff --git a/jit/corePlugins/placeholderColor.js b/jit/corePlugins/placeholderColor.js index d25fe654..0e55f2ae 100644 --- a/jit/corePlugins/placeholderColor.js +++ b/jit/corePlugins/placeholderColor.js @@ -1,13 +1,12 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').default const withAlphaVariable = require('../../lib/util/withAlphaVariable').default -const toColorValue = require('../../lib/util/toColorValue').default const { asColor, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let colorPalette = flattenColorPalette(theme.placeholderColor) +module.exports = function ({ matchUtilities, theme }) { + let colorPalette = flattenColorPalette(theme('placeholderColor')) matchUtilities({ - placeholder: (modifier, { theme }) => { + placeholder: (modifier) => { let value = asColor(modifier, colorPalette) if (value === undefined) { diff --git a/jit/corePlugins/placeholderOpacity.js b/jit/corePlugins/placeholderOpacity.js index 118776bb..98614028 100644 --- a/jit/corePlugins/placeholderOpacity.js +++ b/jit/corePlugins/placeholderOpacity.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'placeholder-opacity': (modifier, { theme }) => { let value = asValue(modifier, theme.placeholderOpacity) diff --git a/jit/corePlugins/ringColor.js b/jit/corePlugins/ringColor.js index dcfcc535..347a0079 100644 --- a/jit/corePlugins/ringColor.js +++ b/jit/corePlugins/ringColor.js @@ -1,13 +1,12 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').default const withAlphaVariable = require('../../lib/util/withAlphaVariable').default -const toColorValue = require('../../lib/util/toColorValue').default const { asColor, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let colorPalette = flattenColorPalette(theme.ringColor) +module.exports = function ({ matchUtilities, theme }) { + let colorPalette = flattenColorPalette(theme('ringColor')) matchUtilities({ - ring: (modifier, { theme }) => { + ring: (modifier) => { if (modifier === 'DEFAULT') { return [] } diff --git a/jit/corePlugins/ringOffsetColor.js b/jit/corePlugins/ringOffsetColor.js index 45ec9081..73b61b2f 100644 --- a/jit/corePlugins/ringOffsetColor.js +++ b/jit/corePlugins/ringOffsetColor.js @@ -1,13 +1,12 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').default -const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const toColorValue = require('../../lib/util/toColorValue').default const { asColor, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let colorPalette = flattenColorPalette(theme.ringOffsetColor) +module.exports = function ({ matchUtilities, theme }) { + let colorPalette = flattenColorPalette(theme('ringOffsetColor')) matchUtilities({ - 'ring-offset': (modifier, { theme }) => { + 'ring-offset': (modifier) => { let value = asColor(modifier, colorPalette) if (value === undefined) { diff --git a/jit/corePlugins/ringOffsetWidth.js b/jit/corePlugins/ringOffsetWidth.js index d8218415..a4a5109a 100644 --- a/jit/corePlugins/ringOffsetWidth.js +++ b/jit/corePlugins/ringOffsetWidth.js @@ -1,6 +1,6 @@ const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'ring-offset': (modifier, { theme }) => { let value = asLength(modifier, theme['ringOffsetWidth']) diff --git a/jit/corePlugins/ringOpacity.js b/jit/corePlugins/ringOpacity.js index e6802386..a093882f 100644 --- a/jit/corePlugins/ringOpacity.js +++ b/jit/corePlugins/ringOpacity.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'ring-opacity': (modifier, { theme }) => { let value = asValue(modifier, theme['ringOpacity']) diff --git a/jit/corePlugins/rotate.js b/jit/corePlugins/rotate.js index b033e895..170b6d82 100644 --- a/jit/corePlugins/rotate.js +++ b/jit/corePlugins/rotate.js @@ -1,6 +1,6 @@ const { asAngle, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ rotate: (modifier, { theme }) => { let value = asAngle(modifier, theme.rotate) diff --git a/jit/corePlugins/scale.js b/jit/corePlugins/scale.js index c5b049e7..9e5a1dae 100644 --- a/jit/corePlugins/scale.js +++ b/jit/corePlugins/scale.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ scale: (modifier, { theme }) => { let value = asValue(modifier, theme.scale) diff --git a/jit/corePlugins/skew.js b/jit/corePlugins/skew.js index ed5cd7b1..6e53571c 100644 --- a/jit/corePlugins/skew.js +++ b/jit/corePlugins/skew.js @@ -1,6 +1,6 @@ const { asAngle, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'skew-x': (modifier, { theme }) => { let value = asAngle(modifier, theme.skew) diff --git a/jit/corePlugins/stroke.js b/jit/corePlugins/stroke.js index 0099fbed..3a7d1f72 100644 --- a/jit/corePlugins/stroke.js +++ b/jit/corePlugins/stroke.js @@ -1,13 +1,12 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').default -const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const toColorValue = require('../../lib/util/toColorValue').default const { asColor, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let colorPalette = flattenColorPalette(theme.stroke) +module.exports = function ({ matchUtilities, theme }) { + let colorPalette = flattenColorPalette(theme('stroke')) matchUtilities({ - stroke: (modifier, { theme }) => { + stroke: (modifier) => { let value = asColor(modifier, colorPalette) if (value === undefined) { diff --git a/jit/corePlugins/textColor.js b/jit/corePlugins/textColor.js index b685e73b..fb8e4630 100644 --- a/jit/corePlugins/textColor.js +++ b/jit/corePlugins/textColor.js @@ -1,13 +1,12 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').default const withAlphaVariable = require('../../lib/util/withAlphaVariable').default -const toColorValue = require('../../lib/util/toColorValue').default const { asColor, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let colorPalette = flattenColorPalette(theme.textColor) +module.exports = function ({ matchUtilities, theme }) { + let colorPalette = flattenColorPalette(theme('textColor')) matchUtilities({ - text: (modifier, { theme }) => { + text: (modifier) => { let value = asColor(modifier, colorPalette) if (value === undefined) { diff --git a/jit/corePlugins/textOpacity.js b/jit/corePlugins/textOpacity.js index 90e980f0..5e283625 100644 --- a/jit/corePlugins/textOpacity.js +++ b/jit/corePlugins/textOpacity.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'text-opacity': (modifier, { theme }) => { let value = asValue(modifier, theme.textOpacity) diff --git a/jit/corePlugins/transformOrigin.js b/jit/corePlugins/transformOrigin.js index 5860822c..32735553 100644 --- a/jit/corePlugins/transformOrigin.js +++ b/jit/corePlugins/transformOrigin.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ origin: (modifier, { theme }) => { let value = theme.transformOrigin[modifier] diff --git a/jit/corePlugins/transitionDelay.js b/jit/corePlugins/transitionDelay.js index dc9ed2e2..567101f6 100644 --- a/jit/corePlugins/transitionDelay.js +++ b/jit/corePlugins/transitionDelay.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ delay: (modifier, { theme }) => { let value = theme.transitionDelay[modifier] diff --git a/jit/corePlugins/transitionDuration.js b/jit/corePlugins/transitionDuration.js index 0a3cf925..26667a9e 100644 --- a/jit/corePlugins/transitionDuration.js +++ b/jit/corePlugins/transitionDuration.js @@ -1,6 +1,6 @@ const { nameClass, asValue } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ duration: (modifier, { theme }) => { let value = asValue(modifier, theme.transitionDuration) diff --git a/jit/corePlugins/transitionProperty.js b/jit/corePlugins/transitionProperty.js index be0343cf..2f7ac7e1 100644 --- a/jit/corePlugins/transitionProperty.js +++ b/jit/corePlugins/transitionProperty.js @@ -1,8 +1,8 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { - let defaultTimingFunction = theme.transitionTimingFunction.DEFAULT - let defaultDuration = theme.transitionDuration.DEFAULT +module.exports = function ({ matchUtilities, theme }) { + let defaultTimingFunction = theme('transitionTimingFunction.DEFAULT') + let defaultDuration = theme('transitionDuration.DEFAULT') matchUtilities({ transition: (modifier, { theme }) => { diff --git a/jit/corePlugins/transitionTimingFunction.js b/jit/corePlugins/transitionTimingFunction.js index fb436fc0..cdfb9955 100644 --- a/jit/corePlugins/transitionTimingFunction.js +++ b/jit/corePlugins/transitionTimingFunction.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ ease: (modifier, { theme }) => { let value = theme.transitionTimingFunction[modifier] diff --git a/jit/corePlugins/translate.js b/jit/corePlugins/translate.js index d51e1c2e..c81fbf94 100644 --- a/jit/corePlugins/translate.js +++ b/jit/corePlugins/translate.js @@ -1,6 +1,6 @@ const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'translate-x': (modifier, { theme }) => { let value = asLength(modifier, theme['translate']) diff --git a/jit/corePlugins/zIndex.js b/jit/corePlugins/zIndex.js index 9e3fa1fe..9ce3e286 100644 --- a/jit/corePlugins/zIndex.js +++ b/jit/corePlugins/zIndex.js @@ -1,6 +1,6 @@ const { asValue, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ z: (modifier, { theme }) => { let value = asValue(modifier, theme.zIndex) diff --git a/jit/index.js b/jit/index.js index dccd46b4..e7d466de 100644 --- a/jit/index.js +++ b/jit/index.js @@ -1,5 +1,4 @@ const postcss = require('postcss') -const dlv = require('dlv') const evaluateTailwindFunctions = require('../lib/lib/evaluateTailwindFunctions').default const substituteScreenAtRules = require('../lib/lib/substituteScreenAtRules').default @@ -57,53 +56,6 @@ module.exports = (configOrPath = {}) => { return root }, ].filter(Boolean) - - return { - postcssPlugin: 'tailwindcss-jit', - plugins: [ - env.DEBUG && - function (root) { - console.log('\n') - console.time('JIT TOTAL') - return root - }, - function (root, result) { - function registerDependency(fileName, type = 'dependency') { - result.messages.push({ - type, - plugin: 'tailwindcss-jit', - parent: result.opts.from, - file: fileName, - }) - } - - rewriteTailwindImports(root) - - let context = setupContext(configOrPath)(result, root) - - if (!env.TAILWIND_DISABLE_TOUCH) { - if (context.configPath !== null) { - registerDependency(context.configPath) - } - } - - return postcss([ - removeLayerAtRules(context), - expandTailwindAtRules(context, registerDependency), - expandApplyAtRules(context), - evaluateTailwindFunctions(context.tailwindConfig), - substituteScreenAtRules(context.tailwindConfig), - collapseAdjacentRules(context), - ]).process(root, { from: undefined }) - }, - env.DEBUG && - function (root) { - console.timeEnd('JIT TOTAL') - console.log('\n') - return root - }, - ], - } } module.exports.postcss = true diff --git a/jit/lib/collapseAdjacentRules.js b/jit/lib/collapseAdjacentRules.js index ad5d40bb..5f9c0166 100644 --- a/jit/lib/collapseAdjacentRules.js +++ b/jit/lib/collapseAdjacentRules.js @@ -4,7 +4,7 @@ let comparisonMap = { } let types = new Set(Object.keys(comparisonMap)) -function collapseAdjacentRules(context) { +function collapseAdjacentRules() { return (root) => { let currentRule = null root.each((node) => { diff --git a/jit/lib/generateRules.js b/jit/lib/generateRules.js index c3fca99a..74f2bc64 100644 --- a/jit/lib/generateRules.js +++ b/jit/lib/generateRules.js @@ -1,6 +1,6 @@ const postcss = require('postcss') const parseObjectStyles = require('../../lib/util/parseObjectStyles').default -const { isPlainObject, bigSign } = require('./utils') +const { isPlainObject } = require('./utils') const selectorParser = require('postcss-selector-parser') const prefixSelector = require('../../lib/util/prefixSelector').default const { updateAllClasses } = require('../pluginUtils') @@ -191,12 +191,6 @@ function* resolveMatchedPlugins(classCandidate, context) { } } -function sortAgainst(toSort, against) { - return toSort.slice().sort((a, z) => { - return bigSign(against.get(a)[0] - against.get(z)[0]) - }) -} - function* resolveMatches(candidate, context) { let separator = context.tailwindConfig.separator let [classCandidate, ...variants] = candidate.split(separator).reverse() @@ -207,10 +201,12 @@ function* resolveMatches(candidate, context) { classCandidate = classCandidate.slice(1) } - // Strip prefix - // md:hover:tw-bg-black - // TODO: Reintroduce this in ways that doesn't break on false positives + // function sortAgainst(toSort, against) { + // return toSort.slice().sort((a, z) => { + // return bigSign(against.get(a)[0] - against.get(z)[0]) + // }) + // } // let sorted = sortAgainst(variants, context.variantMap) // if (sorted.toString() !== variants.toString()) { // let corrected = sorted.reverse().concat(classCandidate).join(':') diff --git a/jit/lib/removeLayerAtRules.js b/jit/lib/removeLayerAtRules.js index 3155e348..91fcaeb5 100644 --- a/jit/lib/removeLayerAtRules.js +++ b/jit/lib/removeLayerAtRules.js @@ -1,4 +1,4 @@ -function removeLayerAtRules(context) { +function removeLayerAtRules() { return (root) => { root.walkAtRules((rule) => { if (['layer', 'responsive', 'variants'].includes(rule.name)) { diff --git a/jit/lib/setupContext.js b/jit/lib/setupContext.js index f1c56675..479c8ad6 100644 --- a/jit/lib/setupContext.js +++ b/jit/lib/setupContext.js @@ -21,7 +21,6 @@ const resolveConfig = require('../../resolveConfig') const sharedState = require('./sharedState') const corePlugins = require('../corePlugins') const { isPlainObject, escapeClassName } = require('./utils') -const { isBuffer } = require('util') let contextMap = sharedState.contextMap let configContextMap = sharedState.configContextMap @@ -676,7 +675,7 @@ function setupContext(configOrPath) { return (result, root) => { let foundTailwind = false - root.walkAtRules('tailwind', (rule) => { + root.walkAtRules('tailwind', () => { foundTailwind = true }) diff --git a/jit/pluginUtils.js b/jit/pluginUtils.js index 34d9c183..e3089c26 100644 --- a/jit/pluginUtils.js +++ b/jit/pluginUtils.js @@ -66,7 +66,7 @@ function transformAllSelectors(transformSelector, wrap = null) { } } -function transformAllClasses(transformClass, wrap = null) { +function transformAllClasses(transformClass) { return ({ container }) => { container.walkRules((rule) => { let selector = rule.selector diff --git a/jit/tests/modify-selectors.test.js b/jit/tests/modify-selectors.test.js index 0d06fab4..ae3fede3 100644 --- a/jit/tests/modify-selectors.test.js +++ b/jit/tests/modify-selectors.test.js @@ -15,7 +15,7 @@ test('modify selectors', () => { corePlugins: { preflight: false }, theme: {}, plugins: [ - function ({ addVariant, e }) { + function ({ addVariant }) { addVariant('foo', ({ modifySelectors, separator }) => { modifySelectors(({ selector }) => { return selectorParser((selectors) => {