Fix style

This commit is contained in:
Adam Wathan 2021-04-02 14:12:47 -04:00
parent f97456483c
commit 7afeeb7084
59 changed files with 84 additions and 143 deletions

View file

@ -3,7 +3,7 @@
"jest": true "jest": true
}, },
"parserOptions": { "parserOptions": {
"ecmaVersion": 2018, "ecmaVersion": 2020,
"sourceType": "module" "sourceType": "module"
}, },
"extends": ["prettier"], "extends": ["prettier"],

View file

@ -2,9 +2,9 @@ const { nameClass } = require('../pluginUtils')
const transformThemeValue = require('../../lib/util/transformThemeValue').default const transformThemeValue = require('../../lib/util/transformThemeValue').default
const parseAnimationValue = require('../../lib/util/parseAnimationValue').default const parseAnimationValue = require('../../lib/util/parseAnimationValue').default
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let keyframes = Object.fromEntries( let keyframes = Object.fromEntries(
Object.entries(theme.keyframes).map(([key, value]) => { Object.entries(theme('keyframes')).map(([key, value]) => {
return [ return [
key, key,
[ [

View file

@ -2,8 +2,8 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').defaul
const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
const { asColor, nameClass } = require('../pluginUtils') const { asColor, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let colorPalette = flattenColorPalette(theme.backgroundColor) let colorPalette = flattenColorPalette(theme('backgroundColor'))
matchUtilities({ matchUtilities({
bg: (modifier) => { bg: (modifier) => {

View file

@ -1,6 +1,6 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
bg: (modifier, { theme }) => { bg: (modifier, { theme }) => {
let value = theme.backgroundImage[modifier] let value = theme.backgroundImage[modifier]

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme, addVariant, e } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'bg-opacity': (modifier, { theme }) => { 'bg-opacity': (modifier, { theme }) => {
let value = asValue(modifier, theme.backgroundOpacity) let value = asValue(modifier, theme.backgroundOpacity)

View file

@ -1,6 +1,6 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
bg: (modifier, { theme }) => { bg: (modifier, { theme }) => {
let value = theme.backgroundPosition[modifier] let value = theme.backgroundPosition[modifier]

View file

@ -1,6 +1,6 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
bg: (modifier, { theme }) => { bg: (modifier, { theme }) => {
let value = theme.backgroundSize[modifier] let value = theme.backgroundSize[modifier]

View file

@ -2,8 +2,8 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').defaul
const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
const { asColor, nameClass } = require('../pluginUtils') const { asColor, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let colorPalette = flattenColorPalette(theme.borderColor) let colorPalette = flattenColorPalette(theme('borderColor'))
matchUtilities({ matchUtilities({
border: (modifier) => { border: (modifier) => {

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'border-opacity': (modifier, { theme }) => { 'border-opacity': (modifier, { theme }) => {
let value = asValue(modifier, theme.borderOpacity) let value = asValue(modifier, theme.borderOpacity)

View file

@ -1,6 +1,6 @@
const { asLength, nameClass } = require('../pluginUtils') const { asLength, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
rounded: (modifier, { theme }) => { rounded: (modifier, { theme }) => {
let value = asLength(modifier, theme['borderRadius']) let value = asLength(modifier, theme['borderRadius'])

View file

@ -1,6 +1,6 @@
const { asLength, nameClass } = require('../pluginUtils') const { asLength, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
border: (modifier, { theme }) => { border: (modifier, { theme }) => {
let value = asLength(modifier, theme['borderWidth']) let value = asLength(modifier, theme['borderWidth'])

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
cursor: (modifier, { theme }) => { cursor: (modifier, { theme }) => {
let value = asValue(modifier, theme.cursor) let value = asValue(modifier, theme.cursor)

View file

@ -2,8 +2,8 @@ const flattenColorPalette = require('../../lib/util/flattenColorPalette').defaul
const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
const { asColor, nameClass } = require('../pluginUtils') const { asColor, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let colorPalette = flattenColorPalette(theme.divideColor) let colorPalette = flattenColorPalette(theme('divideColor'))
// TODO: Make sure there is no issue with DEFAULT here // TODO: Make sure there is no issue with DEFAULT here
matchUtilities({ matchUtilities({

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'divide-opacity': (modifier, { theme }) => { 'divide-opacity': (modifier, { theme }) => {
let value = asValue(modifier, theme.divideOpacity) let value = asValue(modifier, theme.divideOpacity)

View file

@ -1,6 +1,6 @@
const { asLength, nameClass } = require('../pluginUtils') const { asLength, nameClass } = require('../pluginUtils')
module.exports = function ({ addUtilities, matchUtilities, jit: { theme } }) { module.exports = function ({ addUtilities, matchUtilities }) {
matchUtilities({ matchUtilities({
'divide-x': (modifier, { theme }) => { 'divide-x': (modifier, { theme }) => {
let value = asLength(modifier, theme['divideWidth']) let value = asLength(modifier, theme['divideWidth'])

View file

@ -1,13 +1,12 @@
const flattenColorPalette = require('../../lib/util/flattenColorPalette').default const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
const toColorValue = require('../../lib/util/toColorValue').default const toColorValue = require('../../lib/util/toColorValue').default
const { asColor, nameClass } = require('../pluginUtils') const { asColor, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let colorPalette = flattenColorPalette(theme.fill) let colorPalette = flattenColorPalette(theme('fill'))
matchUtilities({ matchUtilities({
fill: (modifier, { theme }) => { fill: (modifier) => {
let value = asColor(modifier, colorPalette) let value = asColor(modifier, colorPalette)
if (value === undefined) { if (value === undefined) {

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'flex-grow': (modifier, { theme }) => { 'flex-grow': (modifier, { theme }) => {
let value = asValue(modifier, theme.flexGrow) let value = asValue(modifier, theme.flexGrow)

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'flex-shrink': (modifier, { theme }) => { 'flex-shrink': (modifier, { theme }) => {
let value = asValue(modifier, theme.flexShrink) let value = asValue(modifier, theme.flexShrink)

View file

@ -1,7 +1,7 @@
const { asLength, nameClass } = require('../pluginUtils') const { asLength, nameClass } = require('../pluginUtils')
const { isPlainObject } = require('../lib/utils') const { isPlainObject } = require('../lib/utils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
text: (modifier, { theme }) => { text: (modifier, { theme }) => {
let value = theme.fontSize[modifier] let value = theme.fontSize[modifier]

View file

@ -1,6 +1,6 @@
const { asLength, nameClass } = require('../pluginUtils') const { asLength, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
gap: (modifier, { theme }) => { gap: (modifier, { theme }) => {
let value = asLength(modifier, theme['gap']) let value = asLength(modifier, theme['gap'])

View file

@ -1,6 +1,6 @@
const { asList, nameClass } = require('../pluginUtils') const { asList, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'auto-cols': (modifier, { theme }) => { 'auto-cols': (modifier, { theme }) => {
let value = asList(modifier, theme.gridAutoColumns) let value = asList(modifier, theme.gridAutoColumns)

View file

@ -1,6 +1,6 @@
const { asList, nameClass } = require('../pluginUtils') const { asList, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'auto-rows': (modifier, { theme }) => { 'auto-rows': (modifier, { theme }) => {
let value = asList(modifier, theme.gridAutoRows) let value = asList(modifier, theme.gridAutoRows)

View file

@ -1,6 +1,6 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'row-end': (modifier, { theme }) => { 'row-end': (modifier, { theme }) => {
let value = theme.gridRowEnd[modifier] let value = theme.gridRowEnd[modifier]

View file

@ -1,6 +1,6 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'row-start': (modifier, { theme }) => { 'row-start': (modifier, { theme }) => {
let value = theme.gridRowStart[modifier] let value = theme.gridRowStart[modifier]

View file

@ -1,6 +1,6 @@
const { asList, nameClass } = require('../pluginUtils') const { asList, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'grid-cols': (modifier, { theme }) => { 'grid-cols': (modifier, { theme }) => {
let value = asList(modifier, theme.gridTemplateColumns) let value = asList(modifier, theme.gridTemplateColumns)

View file

@ -1,6 +1,6 @@
const { asList, nameClass } = require('../pluginUtils') const { asList, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'grid-rows': (modifier, { theme }) => { 'grid-rows': (modifier, { theme }) => {
let value = asList(modifier, theme.gridTemplateRows) let value = asList(modifier, theme.gridTemplateRows)

View file

@ -10,7 +10,7 @@ const {
} = require('../pluginUtils') } = require('../pluginUtils')
module.exports = { module.exports = {
pseudoClassVariants: function ({ config, theme, addVariant }) { pseudoClassVariants: function ({ config, addVariant }) {
let pseudoVariants = [ let pseudoVariants = [
['first', 'first-child'], ['first', 'first-child'],
['last', 'last-child'], ['last', 'last-child'],
@ -62,7 +62,7 @@ module.exports = {
) )
} }
}, },
directionVariants: function ({ config, theme, addVariant }) { directionVariants: function ({ config, addVariant }) {
addVariant( addVariant(
'ltr', 'ltr',
transformAllSelectors( transformAllSelectors(
@ -85,7 +85,7 @@ module.exports = {
) )
) )
}, },
reducedMotionVariants: function ({ config, theme, addVariant }) { reducedMotionVariants: function ({ config, addVariant }) {
addVariant( addVariant(
'motion-safe', 'motion-safe',
transformLastClasses( transformLastClasses(
@ -106,7 +106,7 @@ module.exports = {
) )
) )
}, },
darkVariants: function ({ config, theme, addVariant }) { darkVariants: function ({ config, addVariant }) {
if (config('darkMode') === 'class') { if (config('darkMode') === 'class') {
addVariant( addVariant(
'dark', 'dark',

View file

@ -1,6 +1,6 @@
const { asLength, nameClass } = require('../pluginUtils') const { asLength, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
tracking: (modifier, { theme }) => { tracking: (modifier, { theme }) => {
let value = asLength(modifier, theme['letterSpacing']) let value = asLength(modifier, theme['letterSpacing'])

View file

@ -1,6 +1,6 @@
const { asLength, nameClass } = require('../pluginUtils') const { asLength, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
leading: (modifier, { theme }) => { leading: (modifier, { theme }) => {
let value = asLength(modifier, theme['lineHeight']) let value = asLength(modifier, theme['lineHeight'])

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
opacity: (modifier, { theme }) => { opacity: (modifier, { theme }) => {
let value = asValue(modifier, theme.opacity) let value = asValue(modifier, theme.opacity)

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
order: (modifier, { theme }) => { order: (modifier, { theme }) => {
let value = asValue(modifier, theme.order) let value = asValue(modifier, theme.order)

View file

@ -1,6 +1,6 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
outline: (modifier, { theme }) => { outline: (modifier, { theme }) => {
let value = theme.outline[modifier] let value = theme.outline[modifier]

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
p: (modifier, { theme }) => { p: (modifier, { theme }) => {
let value = asValue(modifier, theme['padding']) let value = asValue(modifier, theme['padding'])

View file

@ -1,13 +1,12 @@
const flattenColorPalette = require('../../lib/util/flattenColorPalette').default const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
const toColorValue = require('../../lib/util/toColorValue').default
const { asColor, nameClass } = require('../pluginUtils') const { asColor, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let colorPalette = flattenColorPalette(theme.placeholderColor) let colorPalette = flattenColorPalette(theme('placeholderColor'))
matchUtilities({ matchUtilities({
placeholder: (modifier, { theme }) => { placeholder: (modifier) => {
let value = asColor(modifier, colorPalette) let value = asColor(modifier, colorPalette)
if (value === undefined) { if (value === undefined) {

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'placeholder-opacity': (modifier, { theme }) => { 'placeholder-opacity': (modifier, { theme }) => {
let value = asValue(modifier, theme.placeholderOpacity) let value = asValue(modifier, theme.placeholderOpacity)

View file

@ -1,13 +1,12 @@
const flattenColorPalette = require('../../lib/util/flattenColorPalette').default const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
const toColorValue = require('../../lib/util/toColorValue').default
const { asColor, nameClass } = require('../pluginUtils') const { asColor, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let colorPalette = flattenColorPalette(theme.ringColor) let colorPalette = flattenColorPalette(theme('ringColor'))
matchUtilities({ matchUtilities({
ring: (modifier, { theme }) => { ring: (modifier) => {
if (modifier === 'DEFAULT') { if (modifier === 'DEFAULT') {
return [] return []
} }

View file

@ -1,13 +1,12 @@
const flattenColorPalette = require('../../lib/util/flattenColorPalette').default const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
const toColorValue = require('../../lib/util/toColorValue').default const toColorValue = require('../../lib/util/toColorValue').default
const { asColor, nameClass } = require('../pluginUtils') const { asColor, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let colorPalette = flattenColorPalette(theme.ringOffsetColor) let colorPalette = flattenColorPalette(theme('ringOffsetColor'))
matchUtilities({ matchUtilities({
'ring-offset': (modifier, { theme }) => { 'ring-offset': (modifier) => {
let value = asColor(modifier, colorPalette) let value = asColor(modifier, colorPalette)
if (value === undefined) { if (value === undefined) {

View file

@ -1,6 +1,6 @@
const { asLength, nameClass } = require('../pluginUtils') const { asLength, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'ring-offset': (modifier, { theme }) => { 'ring-offset': (modifier, { theme }) => {
let value = asLength(modifier, theme['ringOffsetWidth']) let value = asLength(modifier, theme['ringOffsetWidth'])

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'ring-opacity': (modifier, { theme }) => { 'ring-opacity': (modifier, { theme }) => {
let value = asValue(modifier, theme['ringOpacity']) let value = asValue(modifier, theme['ringOpacity'])

View file

@ -1,6 +1,6 @@
const { asAngle, nameClass } = require('../pluginUtils') const { asAngle, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
rotate: (modifier, { theme }) => { rotate: (modifier, { theme }) => {
let value = asAngle(modifier, theme.rotate) let value = asAngle(modifier, theme.rotate)

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
scale: (modifier, { theme }) => { scale: (modifier, { theme }) => {
let value = asValue(modifier, theme.scale) let value = asValue(modifier, theme.scale)

View file

@ -1,6 +1,6 @@
const { asAngle, nameClass } = require('../pluginUtils') const { asAngle, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'skew-x': (modifier, { theme }) => { 'skew-x': (modifier, { theme }) => {
let value = asAngle(modifier, theme.skew) let value = asAngle(modifier, theme.skew)

View file

@ -1,13 +1,12 @@
const flattenColorPalette = require('../../lib/util/flattenColorPalette').default const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
const toColorValue = require('../../lib/util/toColorValue').default const toColorValue = require('../../lib/util/toColorValue').default
const { asColor, nameClass } = require('../pluginUtils') const { asColor, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let colorPalette = flattenColorPalette(theme.stroke) let colorPalette = flattenColorPalette(theme('stroke'))
matchUtilities({ matchUtilities({
stroke: (modifier, { theme }) => { stroke: (modifier) => {
let value = asColor(modifier, colorPalette) let value = asColor(modifier, colorPalette)
if (value === undefined) { if (value === undefined) {

View file

@ -1,13 +1,12 @@
const flattenColorPalette = require('../../lib/util/flattenColorPalette').default const flattenColorPalette = require('../../lib/util/flattenColorPalette').default
const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const withAlphaVariable = require('../../lib/util/withAlphaVariable').default
const toColorValue = require('../../lib/util/toColorValue').default
const { asColor, nameClass } = require('../pluginUtils') const { asColor, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let colorPalette = flattenColorPalette(theme.textColor) let colorPalette = flattenColorPalette(theme('textColor'))
matchUtilities({ matchUtilities({
text: (modifier, { theme }) => { text: (modifier) => {
let value = asColor(modifier, colorPalette) let value = asColor(modifier, colorPalette)
if (value === undefined) { if (value === undefined) {

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'text-opacity': (modifier, { theme }) => { 'text-opacity': (modifier, { theme }) => {
let value = asValue(modifier, theme.textOpacity) let value = asValue(modifier, theme.textOpacity)

View file

@ -1,6 +1,6 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
origin: (modifier, { theme }) => { origin: (modifier, { theme }) => {
let value = theme.transformOrigin[modifier] let value = theme.transformOrigin[modifier]

View file

@ -1,6 +1,6 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
delay: (modifier, { theme }) => { delay: (modifier, { theme }) => {
let value = theme.transitionDelay[modifier] let value = theme.transitionDelay[modifier]

View file

@ -1,6 +1,6 @@
const { nameClass, asValue } = require('../pluginUtils') const { nameClass, asValue } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
duration: (modifier, { theme }) => { duration: (modifier, { theme }) => {
let value = asValue(modifier, theme.transitionDuration) let value = asValue(modifier, theme.transitionDuration)

View file

@ -1,8 +1,8 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities, theme }) {
let defaultTimingFunction = theme.transitionTimingFunction.DEFAULT let defaultTimingFunction = theme('transitionTimingFunction.DEFAULT')
let defaultDuration = theme.transitionDuration.DEFAULT let defaultDuration = theme('transitionDuration.DEFAULT')
matchUtilities({ matchUtilities({
transition: (modifier, { theme }) => { transition: (modifier, { theme }) => {

View file

@ -1,6 +1,6 @@
const { nameClass } = require('../pluginUtils') const { nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
ease: (modifier, { theme }) => { ease: (modifier, { theme }) => {
let value = theme.transitionTimingFunction[modifier] let value = theme.transitionTimingFunction[modifier]

View file

@ -1,6 +1,6 @@
const { asLength, nameClass } = require('../pluginUtils') const { asLength, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
'translate-x': (modifier, { theme }) => { 'translate-x': (modifier, { theme }) => {
let value = asLength(modifier, theme['translate']) let value = asLength(modifier, theme['translate'])

View file

@ -1,6 +1,6 @@
const { asValue, nameClass } = require('../pluginUtils') const { asValue, nameClass } = require('../pluginUtils')
module.exports = function ({ matchUtilities, jit: { theme } }) { module.exports = function ({ matchUtilities }) {
matchUtilities({ matchUtilities({
z: (modifier, { theme }) => { z: (modifier, { theme }) => {
let value = asValue(modifier, theme.zIndex) let value = asValue(modifier, theme.zIndex)

View file

@ -1,5 +1,4 @@
const postcss = require('postcss') const postcss = require('postcss')
const dlv = require('dlv')
const evaluateTailwindFunctions = require('../lib/lib/evaluateTailwindFunctions').default const evaluateTailwindFunctions = require('../lib/lib/evaluateTailwindFunctions').default
const substituteScreenAtRules = require('../lib/lib/substituteScreenAtRules').default const substituteScreenAtRules = require('../lib/lib/substituteScreenAtRules').default
@ -57,53 +56,6 @@ module.exports = (configOrPath = {}) => {
return root return root
}, },
].filter(Boolean) ].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 module.exports.postcss = true

View file

@ -4,7 +4,7 @@ let comparisonMap = {
} }
let types = new Set(Object.keys(comparisonMap)) let types = new Set(Object.keys(comparisonMap))
function collapseAdjacentRules(context) { function collapseAdjacentRules() {
return (root) => { return (root) => {
let currentRule = null let currentRule = null
root.each((node) => { root.each((node) => {

View file

@ -1,6 +1,6 @@
const postcss = require('postcss') const postcss = require('postcss')
const parseObjectStyles = require('../../lib/util/parseObjectStyles').default const parseObjectStyles = require('../../lib/util/parseObjectStyles').default
const { isPlainObject, bigSign } = require('./utils') const { isPlainObject } = require('./utils')
const selectorParser = require('postcss-selector-parser') const selectorParser = require('postcss-selector-parser')
const prefixSelector = require('../../lib/util/prefixSelector').default const prefixSelector = require('../../lib/util/prefixSelector').default
const { updateAllClasses } = require('../pluginUtils') 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) { function* resolveMatches(candidate, context) {
let separator = context.tailwindConfig.separator let separator = context.tailwindConfig.separator
let [classCandidate, ...variants] = candidate.split(separator).reverse() let [classCandidate, ...variants] = candidate.split(separator).reverse()
@ -207,10 +201,12 @@ function* resolveMatches(candidate, context) {
classCandidate = classCandidate.slice(1) classCandidate = classCandidate.slice(1)
} }
// Strip prefix
// md:hover:tw-bg-black
// TODO: Reintroduce this in ways that doesn't break on false positives // 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) // let sorted = sortAgainst(variants, context.variantMap)
// if (sorted.toString() !== variants.toString()) { // if (sorted.toString() !== variants.toString()) {
// let corrected = sorted.reverse().concat(classCandidate).join(':') // let corrected = sorted.reverse().concat(classCandidate).join(':')

View file

@ -1,4 +1,4 @@
function removeLayerAtRules(context) { function removeLayerAtRules() {
return (root) => { return (root) => {
root.walkAtRules((rule) => { root.walkAtRules((rule) => {
if (['layer', 'responsive', 'variants'].includes(rule.name)) { if (['layer', 'responsive', 'variants'].includes(rule.name)) {

View file

@ -21,7 +21,6 @@ const resolveConfig = require('../../resolveConfig')
const sharedState = require('./sharedState') const sharedState = require('./sharedState')
const corePlugins = require('../corePlugins') const corePlugins = require('../corePlugins')
const { isPlainObject, escapeClassName } = require('./utils') const { isPlainObject, escapeClassName } = require('./utils')
const { isBuffer } = require('util')
let contextMap = sharedState.contextMap let contextMap = sharedState.contextMap
let configContextMap = sharedState.configContextMap let configContextMap = sharedState.configContextMap
@ -676,7 +675,7 @@ function setupContext(configOrPath) {
return (result, root) => { return (result, root) => {
let foundTailwind = false let foundTailwind = false
root.walkAtRules('tailwind', (rule) => { root.walkAtRules('tailwind', () => {
foundTailwind = true foundTailwind = true
}) })

View file

@ -66,7 +66,7 @@ function transformAllSelectors(transformSelector, wrap = null) {
} }
} }
function transformAllClasses(transformClass, wrap = null) { function transformAllClasses(transformClass) {
return ({ container }) => { return ({ container }) => {
container.walkRules((rule) => { container.walkRules((rule) => {
let selector = rule.selector let selector = rule.selector

View file

@ -15,7 +15,7 @@ test('modify selectors', () => {
corePlugins: { preflight: false }, corePlugins: { preflight: false },
theme: {}, theme: {},
plugins: [ plugins: [
function ({ addVariant, e }) { function ({ addVariant }) {
addVariant('foo', ({ modifySelectors, separator }) => { addVariant('foo', ({ modifySelectors, separator }) => {
modifySelectors(({ selector }) => { modifySelectors(({ selector }) => {
return selectorParser((selectors) => { return selectorParser((selectors) => {