diff --git a/jit/corePlugins/animation.js b/jit/corePlugins/animation.js index 055efd667..048f9ac93 100644 --- a/jit/corePlugins/animation.js +++ b/jit/corePlugins/animation.js @@ -1,6 +1,6 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -const parseAnimationValue = require('tailwindcss/lib/util/parseAnimationValue').default +const transformThemeValue = require('../../lib/util/transformThemeValue').default +const parseAnimationValue = require('../../lib/util/parseAnimationValue').default module.exports = function ({ matchUtilities, jit: { theme } }) { let keyframes = Object.fromEntries( diff --git a/jit/corePlugins/backgroundColor.js b/jit/corePlugins/backgroundColor.js index 78dd52f50..b4f74e5b9 100644 --- a/jit/corePlugins/backgroundColor.js +++ b/jit/corePlugins/backgroundColor.js @@ -1,14 +1,12 @@ -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default +const flattenColorPalette = require('../../lib/util/flattenColorPalette').default +const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const { asColor, nameClass } = require('../pluginUtils') module.exports = function ({ matchUtilities, jit: { theme } }) { let colorPalette = flattenColorPalette(theme.backgroundColor) matchUtilities({ - bg: (modifier, { theme }) => { + bg: (modifier) => { let value = asColor(modifier, colorPalette) if (value === undefined) { diff --git a/jit/corePlugins/borderColor.js b/jit/corePlugins/borderColor.js index ce50a5624..9dc09c0c1 100644 --- a/jit/corePlugins/borderColor.js +++ b/jit/corePlugins/borderColor.js @@ -1,13 +1,12 @@ -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default +const flattenColorPalette = require('../../lib/util/flattenColorPalette').default +const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const { asColor, nameClass } = require('../pluginUtils') module.exports = function ({ matchUtilities, jit: { theme } }) { let colorPalette = flattenColorPalette(theme.borderColor) matchUtilities({ - border: (modifier, { theme }) => { + border: (modifier) => { if (modifier === 'DEFAULT') { return [] } diff --git a/jit/corePlugins/boxShadow.js b/jit/corePlugins/boxShadow.js index c282dd208..dcca1040c 100644 --- a/jit/corePlugins/boxShadow.js +++ b/jit/corePlugins/boxShadow.js @@ -1,5 +1,5 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default +const transformThemeValue = require('../../lib/util/transformThemeValue').default let transformValue = transformThemeValue('boxShadow') let shadowReset = { @@ -8,7 +8,7 @@ let shadowReset = { }, } -module.exports = function ({ addBase, matchUtilities, jit: { theme } }) { +module.exports = function ({ addBase, matchUtilities }) { addBase(shadowReset) matchUtilities({ shadow: (modifier, { theme }) => { diff --git a/jit/corePlugins/container.js b/jit/corePlugins/container.js index 0eb1dc5ab..cf278e798 100644 --- a/jit/corePlugins/container.js +++ b/jit/corePlugins/container.js @@ -1,3 +1,3 @@ -const container = require('tailwindcss/lib/plugins/container') +const container = require('../../lib/plugins/container') module.exports = container() diff --git a/jit/corePlugins/divideColor.js b/jit/corePlugins/divideColor.js index 15f605a53..32f734b9e 100644 --- a/jit/corePlugins/divideColor.js +++ b/jit/corePlugins/divideColor.js @@ -1,6 +1,5 @@ -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default +const flattenColorPalette = require('../../lib/util/flattenColorPalette').default +const withAlphaVariable = require('../../lib/util/withAlphaVariable').default const { asColor, nameClass } = require('../pluginUtils') module.exports = function ({ matchUtilities, jit: { theme } }) { @@ -8,7 +7,7 @@ module.exports = function ({ matchUtilities, jit: { theme } }) { // TODO: Make sure there is no issue with DEFAULT here matchUtilities({ - divide: (modifier, { theme }) => { + divide: (modifier) => { let value = asColor(modifier, colorPalette) if (value === undefined) { diff --git a/jit/corePlugins/fill.js b/jit/corePlugins/fill.js index 5a8a0115a..4d91dcfa9 100644 --- a/jit/corePlugins/fill.js +++ b/jit/corePlugins/fill.js @@ -1,6 +1,6 @@ -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default +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 } }) { diff --git a/jit/corePlugins/flex.js b/jit/corePlugins/flex.js index 82edabb90..0567bd917 100644 --- a/jit/corePlugins/flex.js +++ b/jit/corePlugins/flex.js @@ -1,7 +1,6 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ flex: (modifier, { theme }) => { let value = theme.flex[modifier] diff --git a/jit/corePlugins/fontFamily.js b/jit/corePlugins/fontFamily.js index 415733e72..2d7607851 100644 --- a/jit/corePlugins/fontFamily.js +++ b/jit/corePlugins/fontFamily.js @@ -1,12 +1,11 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default +const transformThemeValue = require('../../lib/util/transformThemeValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { let transformValue = transformThemeValue('fontFamily') matchUtilities({ font: (modifier, { theme }) => { - let transformValue = transformThemeValue('fontFamily') let value = transformValue(theme.fontFamily[modifier]) if (modifier === '' || value === undefined) { diff --git a/jit/corePlugins/fontWeight.js b/jit/corePlugins/fontWeight.js index f3ccd3018..3365d46f3 100644 --- a/jit/corePlugins/fontWeight.js +++ b/jit/corePlugins/fontWeight.js @@ -1,7 +1,6 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ font: (modifier, { theme }) => { let value = theme.fontWeight[modifier] diff --git a/jit/corePlugins/gradientColorStops.js b/jit/corePlugins/gradientColorStops.js index 5d1f4f8b2..a1497ae28 100644 --- a/jit/corePlugins/gradientColorStops.js +++ b/jit/corePlugins/gradientColorStops.js @@ -1,6 +1,6 @@ -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default -const toRgba = require('tailwindcss/lib/util/withAlphaVariable').toRgba +const flattenColorPalette = require('../../lib/util/flattenColorPalette').default +const toColorValue = require('../../lib/util/toColorValue').default +const toRgba = require('../../lib/util/withAlphaVariable').toRgba const { asColor, nameClass } = require('../pluginUtils') function transparentTo(value) { diff --git a/jit/corePlugins/gridColumn.js b/jit/corePlugins/gridColumn.js index ba4394f89..241615bea 100644 --- a/jit/corePlugins/gridColumn.js +++ b/jit/corePlugins/gridColumn.js @@ -1,7 +1,6 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ col: (modifier, { theme }) => { if (modifier === '' || theme.gridColumn[modifier] === undefined) { diff --git a/jit/corePlugins/gridColumnEnd.js b/jit/corePlugins/gridColumnEnd.js index 862027111..53c7543c4 100644 --- a/jit/corePlugins/gridColumnEnd.js +++ b/jit/corePlugins/gridColumnEnd.js @@ -1,11 +1,9 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'col-end': (modifier, { theme }) => { - let transformValue = transformThemeValue('gridColumnEnd') - let value = transformValue(theme.gridColumnEnd[modifier]) + let value = theme.gridColumnEnd[modifier] if (value === undefined) { return [] diff --git a/jit/corePlugins/gridColumnStart.js b/jit/corePlugins/gridColumnStart.js index 6699ade56..e9adf8474 100644 --- a/jit/corePlugins/gridColumnStart.js +++ b/jit/corePlugins/gridColumnStart.js @@ -1,11 +1,9 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ 'col-start': (modifier, { theme }) => { - let transformValue = transformThemeValue('gridColumnStart') - let value = transformValue(theme.gridColumnStart[modifier]) + let value = theme.gridColumnStart[modifier] if (value === undefined) { return [] diff --git a/jit/corePlugins/gridRow.js b/jit/corePlugins/gridRow.js index df4334527..2e560c3fa 100644 --- a/jit/corePlugins/gridRow.js +++ b/jit/corePlugins/gridRow.js @@ -1,7 +1,6 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ row: (modifier, { theme }) => { let value = theme.gridRow[modifier] diff --git a/jit/corePlugins/index.js b/jit/corePlugins/index.js index d419472f8..2d5f0d330 100644 --- a/jit/corePlugins/index.js +++ b/jit/corePlugins/index.js @@ -1,6 +1,6 @@ const postcss = require('postcss') -const buildMediaQuery = require('tailwindcss/lib/util/buildMediaQuery').default -const prefixSelector = require('tailwindcss/lib/util/prefixSelector').default +const buildMediaQuery = require('../../lib/util/buildMediaQuery').default +const prefixSelector = require('../../lib/util/prefixSelector').default const { updateLastClasses, updateAllClasses, diff --git a/jit/corePlugins/listStyleType.js b/jit/corePlugins/listStyleType.js index c8ba14241..275d2dd17 100644 --- a/jit/corePlugins/listStyleType.js +++ b/jit/corePlugins/listStyleType.js @@ -1,7 +1,6 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ list: (modifier, { theme }) => { if (modifier === '' || theme.listStyleType[modifier] === undefined) { diff --git a/jit/corePlugins/objectPosition.js b/jit/corePlugins/objectPosition.js index c20e1d9ec..01afca056 100644 --- a/jit/corePlugins/objectPosition.js +++ b/jit/corePlugins/objectPosition.js @@ -1,7 +1,6 @@ const { nameClass } = require('../pluginUtils') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ object: (modifier, { theme }) => { if (modifier === '' || theme.objectPosition[modifier] === undefined) { diff --git a/jit/corePlugins/placeholderColor.js b/jit/corePlugins/placeholderColor.js index 17d40381c..d25fe654c 100644 --- a/jit/corePlugins/placeholderColor.js +++ b/jit/corePlugins/placeholderColor.js @@ -1,6 +1,6 @@ -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default +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 } }) { diff --git a/jit/corePlugins/preflight.js b/jit/corePlugins/preflight.js index 57598d43b..64de4c7db 100644 --- a/jit/corePlugins/preflight.js +++ b/jit/corePlugins/preflight.js @@ -1,3 +1,3 @@ -const preflight = require('tailwindcss/lib/plugins/preflight').default +const preflight = require('../../lib/plugins/preflight').default module.exports = preflight() diff --git a/jit/corePlugins/ringColor.js b/jit/corePlugins/ringColor.js index b2fdd5763..dcfcc5357 100644 --- a/jit/corePlugins/ringColor.js +++ b/jit/corePlugins/ringColor.js @@ -1,6 +1,6 @@ -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default +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 } }) { diff --git a/jit/corePlugins/ringOffsetColor.js b/jit/corePlugins/ringOffsetColor.js index 109aac98c..45ec9081c 100644 --- a/jit/corePlugins/ringOffsetColor.js +++ b/jit/corePlugins/ringOffsetColor.js @@ -1,6 +1,6 @@ -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default +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 } }) { diff --git a/jit/corePlugins/ringWidth.js b/jit/corePlugins/ringWidth.js index 16626ff95..1716be1c8 100644 --- a/jit/corePlugins/ringWidth.js +++ b/jit/corePlugins/ringWidth.js @@ -1,5 +1,5 @@ const dlv = require('dlv') -const toRgba = require('tailwindcss/lib/util/withAlphaVariable').toRgba +const toRgba = require('../../lib/util/withAlphaVariable').toRgba const { asLength, nameClass } = require('../pluginUtils') function safeCall(callback, defaultValue) { diff --git a/jit/corePlugins/space.js b/jit/corePlugins/space.js index 46eea6a98..6a33c3c90 100644 --- a/jit/corePlugins/space.js +++ b/jit/corePlugins/space.js @@ -1,7 +1,6 @@ -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, addUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities, addUtilities }) { matchUtilities({ 'space-x': (modifier, { theme }) => { let value = asLength(modifier, theme['space']) diff --git a/jit/corePlugins/stroke.js b/jit/corePlugins/stroke.js index 0b474719c..0099fbede 100644 --- a/jit/corePlugins/stroke.js +++ b/jit/corePlugins/stroke.js @@ -1,6 +1,6 @@ -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default +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 } }) { diff --git a/jit/corePlugins/strokeWidth.js b/jit/corePlugins/strokeWidth.js index c9ff9a623..de7f68aa8 100644 --- a/jit/corePlugins/strokeWidth.js +++ b/jit/corePlugins/strokeWidth.js @@ -1,7 +1,6 @@ -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default const { asLength, nameClass } = require('../pluginUtils') -module.exports = function ({ matchUtilities, jit: { theme } }) { +module.exports = function ({ matchUtilities }) { matchUtilities({ stroke: (modifier, { theme }) => { let value = asLength(modifier, theme['strokeWidth']) diff --git a/jit/corePlugins/textColor.js b/jit/corePlugins/textColor.js index 8cbe8cd09..b685e73b7 100644 --- a/jit/corePlugins/textColor.js +++ b/jit/corePlugins/textColor.js @@ -1,6 +1,6 @@ -const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default -const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default -const toColorValue = require('tailwindcss/lib/util/toColorValue').default +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 } }) { diff --git a/jit/index.js b/jit/index.js index 3d21d2c70..c4bd7d257 100644 --- a/jit/index.js +++ b/jit/index.js @@ -1,7 +1,7 @@ const postcss = require('postcss') -const evaluateTailwindFunctions = require('tailwindcss/lib/lib/evaluateTailwindFunctions').default -const substituteScreenAtRules = require('tailwindcss/lib/lib/substituteScreenAtRules').default +const evaluateTailwindFunctions = require('../lib/lib/evaluateTailwindFunctions').default +const substituteScreenAtRules = require('../lib/lib/substituteScreenAtRules').default const rewriteTailwindImports = require('./lib/rewriteTailwindImports') const setupContext = require('./lib/setupContext') diff --git a/jit/lib/generateRules.js b/jit/lib/generateRules.js index fe48a0dae..c3fca99ad 100644 --- a/jit/lib/generateRules.js +++ b/jit/lib/generateRules.js @@ -1,8 +1,8 @@ const postcss = require('postcss') -const parseObjectStyles = require('tailwindcss/lib/util/parseObjectStyles').default +const parseObjectStyles = require('../../lib/util/parseObjectStyles').default const { isPlainObject, bigSign } = require('./utils') const selectorParser = require('postcss-selector-parser') -const prefixSelector = require('tailwindcss/lib/util/prefixSelector').default +const prefixSelector = require('../../lib/util/prefixSelector').default const { updateAllClasses } = require('../pluginUtils') let classNameParser = selectorParser((selectors) => { diff --git a/jit/lib/setupContext.js b/jit/lib/setupContext.js index 65538d0e6..f1c566754 100644 --- a/jit/lib/setupContext.js +++ b/jit/lib/setupContext.js @@ -11,12 +11,12 @@ const selectorParser = require('postcss-selector-parser') const LRU = require('quick-lru') const normalizePath = require('normalize-path') -const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default -const parseObjectStyles = require('tailwindcss/lib/util/parseObjectStyles').default -const getModuleDependencies = require('tailwindcss/lib/lib/getModuleDependencies').default -const prefixSelector = require('tailwindcss/lib/util/prefixSelector').default +const transformThemeValue = require('../../lib/util/transformThemeValue').default +const parseObjectStyles = require('../../lib/util/parseObjectStyles').default +const getModuleDependencies = require('../../lib/lib/getModuleDependencies').default +const prefixSelector = require('../../lib/util/prefixSelector').default -const resolveConfig = require('tailwindcss/resolveConfig') +const resolveConfig = require('../../resolveConfig') const sharedState = require('./sharedState') const corePlugins = require('../corePlugins') @@ -401,7 +401,7 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs return '*' } - if (! options.respectPrefix) { + if (!options.respectPrefix) { return identifier } diff --git a/jit/lib/utils.js b/jit/lib/utils.js index 8fcbf06d3..6b754159e 100644 --- a/jit/lib/utils.js +++ b/jit/lib/utils.js @@ -1,7 +1,7 @@ const postcss = require('postcss') const tailwindUtils = { - escapeClassName: require('tailwindcss/lib/util/escapeClassName').default, - nameClass: require('tailwindcss/lib/util/nameClass').default, + escapeClassName: require('../../lib/util/escapeClassName').default, + nameClass: require('../../lib/util/nameClass').default, } // Takes our lightweight rule structure and turns it into a PostCSS node. diff --git a/jit/pluginUtils.js b/jit/pluginUtils.js index cac73dc44..34d9c183c 100644 --- a/jit/pluginUtils.js +++ b/jit/pluginUtils.js @@ -1,6 +1,6 @@ const selectorParser = require('postcss-selector-parser') const postcss = require('postcss') -const { toRgba } = require('tailwindcss/lib/util/withAlphaVariable') +const { toRgba } = require('../lib/util/withAlphaVariable') const { nameClass, escapeCommas } = require('./lib/utils') function updateAllClasses(selectors, updateClass) {