tailwindcss 0.0.0-insiders.7b94fea → 0.0.0-insiders.7d8eb21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +588 -3
- package/LICENSE +1 -2
- package/README.md +15 -7
- package/colors.d.ts +3 -0
- package/colors.js +2 -1
- package/defaultConfig.d.ts +3 -0
- package/defaultConfig.js +2 -1
- package/defaultTheme.d.ts +4 -0
- package/defaultTheme.js +2 -1
- package/lib/cli/build/deps.js +54 -0
- package/lib/cli/build/index.js +48 -0
- package/lib/cli/build/plugin.js +362 -0
- package/lib/cli/build/utils.js +78 -0
- package/lib/cli/build/watching.js +178 -0
- package/lib/cli/help/index.js +71 -0
- package/lib/cli/index.js +18 -0
- package/lib/cli/init/index.js +46 -0
- package/lib/cli/shared.js +12 -0
- package/lib/cli-peer-dependencies.js +20 -7
- package/lib/cli.js +108 -571
- package/lib/constants.js +27 -20
- package/lib/corePluginList.js +15 -4
- package/lib/corePlugins.js +2229 -1868
- package/lib/css/preflight.css +22 -9
- package/lib/featureFlags.js +39 -25
- package/lib/index.js +28 -12
- package/lib/lib/cacheInvalidation.js +90 -0
- package/lib/lib/collapseAdjacentRules.js +28 -10
- package/lib/lib/collapseDuplicateDeclarations.js +83 -0
- package/lib/lib/content.js +177 -0
- package/lib/lib/defaultExtractor.js +241 -0
- package/lib/lib/detectNesting.js +27 -3
- package/lib/lib/evaluateTailwindFunctions.js +117 -50
- package/lib/lib/expandApplyAtRules.js +457 -159
- package/lib/lib/expandTailwindAtRules.js +130 -127
- package/lib/lib/findAtConfigPath.js +44 -0
- package/lib/lib/generateRules.js +610 -141
- package/lib/lib/getModuleDependencies.js +11 -8
- package/lib/lib/normalizeTailwindDirectives.js +43 -32
- package/lib/lib/offsets.js +285 -0
- package/lib/lib/partitionApplyAtRules.js +56 -0
- package/lib/lib/regex.js +60 -0
- package/lib/lib/remap-bitfield.js +87 -0
- package/lib/lib/resolveDefaultsAtRules.js +114 -81
- package/lib/lib/setupContextUtils.js +718 -323
- package/lib/lib/setupTrackingContext.js +43 -71
- package/lib/lib/sharedState.js +50 -9
- package/lib/lib/substituteScreenAtRules.js +13 -8
- package/{nesting → lib/postcss-plugins/nesting}/README.md +2 -2
- package/lib/postcss-plugins/nesting/index.js +19 -0
- package/lib/postcss-plugins/nesting/plugin.js +87 -0
- package/lib/processTailwindFeatures.js +36 -21
- package/lib/public/colors.js +247 -245
- package/lib/public/create-plugin.js +6 -4
- package/lib/public/default-config.js +7 -5
- package/lib/public/default-theme.js +7 -5
- package/lib/public/resolve-config.js +8 -5
- package/lib/util/bigSign.js +4 -1
- package/lib/util/buildMediaQuery.js +18 -24
- package/lib/util/cloneDeep.js +7 -6
- package/lib/util/cloneNodes.js +21 -3
- package/lib/util/color.js +54 -40
- package/lib/util/configurePlugins.js +5 -2
- package/lib/util/createPlugin.js +6 -6
- package/lib/util/createUtilityPlugin.js +12 -14
- package/lib/util/dataTypes.js +164 -100
- package/lib/util/defaults.js +12 -3
- package/lib/util/escapeClassName.js +9 -6
- package/lib/util/escapeCommas.js +5 -2
- package/lib/util/flattenColorPalette.js +9 -12
- package/lib/util/formatVariantSelector.js +353 -0
- package/lib/util/getAllConfigs.js +29 -10
- package/lib/util/hashConfig.js +6 -3
- package/lib/util/isKeyframeRule.js +5 -2
- package/lib/util/isPlainObject.js +5 -2
- package/lib/util/isSyntacticallyValidPropertyValue.js +72 -0
- package/lib/util/log.js +22 -12
- package/lib/util/nameClass.js +20 -8
- package/lib/util/negateValue.js +23 -6
- package/lib/util/normalizeConfig.js +147 -60
- package/lib/util/normalizeScreens.js +170 -0
- package/lib/util/parseAnimationValue.js +42 -40
- package/lib/util/parseBoxShadowValue.js +84 -0
- package/lib/util/parseDependency.js +38 -56
- package/lib/util/parseGlob.js +34 -0
- package/lib/util/parseObjectStyles.js +11 -8
- package/lib/util/pluginUtils.js +182 -181
- package/lib/util/prefixSelector.js +27 -13
- package/lib/util/removeAlphaVariables.js +29 -0
- package/lib/util/resolveConfig.js +97 -73
- package/lib/util/resolveConfigPath.js +11 -9
- package/lib/util/responsive.js +8 -5
- package/lib/util/splitAtTopLevelOnly.js +43 -0
- package/lib/util/tap.js +4 -1
- package/lib/util/toColorValue.js +5 -3
- package/lib/util/toPath.js +24 -3
- package/lib/util/transformThemeValue.js +49 -31
- package/lib/util/validateConfig.js +24 -0
- package/lib/util/validateFormalSyntax.js +24 -0
- package/lib/util/withAlphaVariable.js +23 -15
- package/nesting/index.js +2 -12
- package/package.json +51 -50
- package/peers/index.js +15019 -12583
- package/plugin.d.ts +11 -0
- package/plugin.js +2 -1
- package/resolveConfig.d.ts +12 -0
- package/resolveConfig.js +2 -1
- package/scripts/generate-types.js +105 -0
- package/scripts/release-channel.js +18 -0
- package/scripts/release-notes.js +21 -0
- package/scripts/type-utils.js +27 -0
- package/src/cli/build/deps.js +56 -0
- package/src/cli/build/index.js +49 -0
- package/src/cli/build/plugin.js +434 -0
- package/src/cli/build/utils.js +76 -0
- package/src/cli/build/watching.js +227 -0
- package/src/cli/help/index.js +70 -0
- package/src/cli/index.js +3 -0
- package/src/cli/init/index.js +50 -0
- package/src/cli/shared.js +5 -0
- package/src/cli-peer-dependencies.js +7 -1
- package/src/cli.js +50 -577
- package/src/corePluginList.js +1 -1
- package/src/corePlugins.js +886 -598
- package/src/css/preflight.css +22 -9
- package/src/featureFlags.js +24 -8
- package/src/index.js +19 -6
- package/src/lib/cacheInvalidation.js +52 -0
- package/src/lib/collapseAdjacentRules.js +21 -2
- package/src/lib/collapseDuplicateDeclarations.js +93 -0
- package/src/lib/content.js +213 -0
- package/src/lib/defaultExtractor.js +217 -0
- package/src/lib/detectNesting.js +30 -3
- package/src/lib/evaluateTailwindFunctions.js +84 -10
- package/src/lib/expandApplyAtRules.js +508 -153
- package/src/lib/expandTailwindAtRules.js +82 -79
- package/src/lib/findAtConfigPath.js +48 -0
- package/src/lib/generateRules.js +625 -111
- package/src/lib/normalizeTailwindDirectives.js +7 -1
- package/src/lib/offsets.js +351 -0
- package/src/lib/partitionApplyAtRules.js +52 -0
- package/src/lib/regex.js +74 -0
- package/src/lib/remap-bitfield.js +82 -0
- package/src/lib/resolveDefaultsAtRules.js +98 -60
- package/src/lib/setupContextUtils.js +666 -168
- package/src/lib/setupTrackingContext.js +16 -52
- package/src/lib/sharedState.js +44 -4
- package/src/lib/substituteScreenAtRules.js +6 -3
- package/src/postcss-plugins/nesting/README.md +42 -0
- package/src/postcss-plugins/nesting/index.js +13 -0
- package/src/postcss-plugins/nesting/plugin.js +80 -0
- package/src/processTailwindFeatures.js +17 -2
- package/src/util/buildMediaQuery.js +14 -16
- package/src/util/cloneNodes.js +19 -2
- package/src/util/color.js +31 -14
- package/src/util/createUtilityPlugin.js +2 -2
- package/src/util/dataTypes.js +86 -21
- package/src/util/defaults.js +6 -0
- package/src/util/formatVariantSelector.js +412 -0
- package/src/util/getAllConfigs.js +19 -0
- package/src/util/isSyntacticallyValidPropertyValue.js +61 -0
- package/src/util/log.js +11 -7
- package/src/util/nameClass.js +6 -2
- package/src/util/negateValue.js +14 -4
- package/src/util/normalizeConfig.js +72 -5
- package/src/util/normalizeScreens.js +140 -0
- package/src/util/parseBoxShadowValue.js +72 -0
- package/src/util/parseDependency.js +37 -42
- package/src/util/parseGlob.js +24 -0
- package/src/util/pluginUtils.js +169 -143
- package/src/util/prefixSelector.js +30 -13
- package/src/util/removeAlphaVariables.js +24 -0
- package/src/util/resolveConfig.js +81 -27
- package/src/util/splitAtTopLevelOnly.js +45 -0
- package/src/util/toPath.js +23 -1
- package/src/util/transformThemeValue.js +33 -8
- package/src/util/validateConfig.js +13 -0
- package/src/util/validateFormalSyntax.js +34 -0
- package/src/util/withAlphaVariable.js +1 -1
- package/stubs/defaultConfig.stub.js +246 -213
- package/stubs/simpleConfig.stub.js +1 -0
- package/types/config.d.ts +363 -0
- package/types/generated/.gitkeep +0 -0
- package/types/generated/colors.d.ts +276 -0
- package/types/generated/corePluginList.d.ts +1 -0
- package/types/generated/default-theme.d.ts +342 -0
- package/types/index.d.ts +7 -0
- package/lib/lib/setupWatchingContext.js +0 -284
- package/nesting/plugin.js +0 -41
- package/src/lib/setupWatchingContext.js +0 -304
package/src/util/dataTypes.js
CHANGED
|
@@ -1,13 +1,40 @@
|
|
|
1
1
|
import { parseColor } from './color'
|
|
2
|
+
import { parseBoxShadowValue } from './parseBoxShadowValue'
|
|
3
|
+
import { splitAtTopLevelOnly } from './splitAtTopLevelOnly'
|
|
4
|
+
|
|
5
|
+
let cssFunctions = ['min', 'max', 'clamp', 'calc']
|
|
2
6
|
|
|
3
7
|
// Ref: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Types
|
|
4
8
|
|
|
5
|
-
|
|
6
|
-
|
|
9
|
+
function isCSSFunction(value) {
|
|
10
|
+
return cssFunctions.some((fn) => new RegExp(`^${fn}\\(.*\\)`).test(value))
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
const placeholder = '--tw-placeholder'
|
|
14
|
+
const placeholderRe = new RegExp(placeholder, 'g')
|
|
7
15
|
|
|
8
16
|
// This is not a data type, but rather a function that can normalize the
|
|
9
17
|
// correct values.
|
|
10
|
-
export function normalize(value) {
|
|
18
|
+
export function normalize(value, isRoot = true) {
|
|
19
|
+
if (value.startsWith('--')) {
|
|
20
|
+
return `var(${value})`
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
// Keep raw strings if it starts with `url(`
|
|
24
|
+
if (value.includes('url(')) {
|
|
25
|
+
return value
|
|
26
|
+
.split(/(url\(.*?\))/g)
|
|
27
|
+
.filter(Boolean)
|
|
28
|
+
.map((part) => {
|
|
29
|
+
if (/^url\(.*?\)$/.test(part)) {
|
|
30
|
+
return part
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
return normalize(part, false)
|
|
34
|
+
})
|
|
35
|
+
.join('')
|
|
36
|
+
}
|
|
37
|
+
|
|
11
38
|
// Convert `_` to ` `, except for escaped underscores `\_`
|
|
12
39
|
value = value
|
|
13
40
|
.replace(
|
|
@@ -18,17 +45,24 @@ export function normalize(value) {
|
|
|
18
45
|
.replace(/\\_/g, '_')
|
|
19
46
|
|
|
20
47
|
// Remove leftover whitespace
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
if (value.startsWith('url(')) return value
|
|
48
|
+
if (isRoot) {
|
|
49
|
+
value = value.trim()
|
|
50
|
+
}
|
|
25
51
|
|
|
26
|
-
// Add spaces around operators inside calc() that do not follow an operator
|
|
52
|
+
// Add spaces around operators inside math functions like calc() that do not follow an operator
|
|
27
53
|
// or '('.
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
54
|
+
value = value.replace(/(calc|min|max|clamp)\(.+\)/g, (match) => {
|
|
55
|
+
let vars = []
|
|
56
|
+
return match
|
|
57
|
+
.replace(/var\((--.+?)[,)]/g, (match, g1) => {
|
|
58
|
+
vars.push(g1)
|
|
59
|
+
return match.replace(g1, placeholder)
|
|
60
|
+
})
|
|
61
|
+
.replace(/(-?\d*\.?\d(?!\b-\d.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, '$1 $2 ')
|
|
62
|
+
.replace(placeholderRe, () => vars.shift())
|
|
63
|
+
})
|
|
64
|
+
|
|
65
|
+
return value
|
|
32
66
|
}
|
|
33
67
|
|
|
34
68
|
export function url(value) {
|
|
@@ -36,13 +70,16 @@ export function url(value) {
|
|
|
36
70
|
}
|
|
37
71
|
|
|
38
72
|
export function number(value) {
|
|
39
|
-
return !isNaN(Number(value))
|
|
73
|
+
return !isNaN(Number(value)) || isCSSFunction(value)
|
|
40
74
|
}
|
|
41
75
|
|
|
42
76
|
export function percentage(value) {
|
|
43
|
-
return
|
|
77
|
+
return (value.endsWith('%') && number(value.slice(0, -1))) || isCSSFunction(value)
|
|
44
78
|
}
|
|
45
79
|
|
|
80
|
+
// Please refer to MDN when updating this list:
|
|
81
|
+
// https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Values_and_units
|
|
82
|
+
// https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Container_Queries#container_query_length_units
|
|
46
83
|
let lengthUnits = [
|
|
47
84
|
'cm',
|
|
48
85
|
'mm',
|
|
@@ -56,16 +93,32 @@ let lengthUnits = [
|
|
|
56
93
|
'ch',
|
|
57
94
|
'rem',
|
|
58
95
|
'lh',
|
|
96
|
+
'rlh',
|
|
59
97
|
'vw',
|
|
60
98
|
'vh',
|
|
61
99
|
'vmin',
|
|
62
100
|
'vmax',
|
|
101
|
+
'vb',
|
|
102
|
+
'vi',
|
|
103
|
+
'svw',
|
|
104
|
+
'svh',
|
|
105
|
+
'lvw',
|
|
106
|
+
'lvh',
|
|
107
|
+
'dvw',
|
|
108
|
+
'dvh',
|
|
109
|
+
'cqw',
|
|
110
|
+
'cqh',
|
|
111
|
+
'cqi',
|
|
112
|
+
'cqb',
|
|
113
|
+
'cqmin',
|
|
114
|
+
'cqmax',
|
|
63
115
|
]
|
|
64
116
|
let lengthUnitsPattern = `(?:${lengthUnits.join('|')})`
|
|
65
117
|
export function length(value) {
|
|
66
118
|
return (
|
|
67
|
-
|
|
68
|
-
new RegExp(`^
|
|
119
|
+
value === '0' ||
|
|
120
|
+
new RegExp(`^[+-]?[0-9]*\.?[0-9]+(?:[eE][+-]?[0-9]+)?${lengthUnitsPattern}$`).test(value) ||
|
|
121
|
+
isCSSFunction(value)
|
|
69
122
|
)
|
|
70
123
|
}
|
|
71
124
|
|
|
@@ -74,14 +127,26 @@ export function lineWidth(value) {
|
|
|
74
127
|
return lineWidths.has(value)
|
|
75
128
|
}
|
|
76
129
|
|
|
130
|
+
export function shadow(value) {
|
|
131
|
+
let parsedShadows = parseBoxShadowValue(normalize(value))
|
|
132
|
+
|
|
133
|
+
for (let parsedShadow of parsedShadows) {
|
|
134
|
+
if (!parsedShadow.valid) {
|
|
135
|
+
return false
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
return true
|
|
140
|
+
}
|
|
141
|
+
|
|
77
142
|
export function color(value) {
|
|
78
143
|
let colors = 0
|
|
79
144
|
|
|
80
|
-
let result = value
|
|
145
|
+
let result = splitAtTopLevelOnly(value, '_').every((part) => {
|
|
81
146
|
part = normalize(part)
|
|
82
147
|
|
|
83
148
|
if (part.startsWith('var(')) return true
|
|
84
|
-
if (parseColor(part) !== null) return colors++, true
|
|
149
|
+
if (parseColor(part, { loose: true }) !== null) return colors++, true
|
|
85
150
|
|
|
86
151
|
return false
|
|
87
152
|
})
|
|
@@ -92,7 +157,7 @@ export function color(value) {
|
|
|
92
157
|
|
|
93
158
|
export function image(value) {
|
|
94
159
|
let images = 0
|
|
95
|
-
let result = value
|
|
160
|
+
let result = splitAtTopLevelOnly(value, ',').every((part) => {
|
|
96
161
|
part = normalize(part)
|
|
97
162
|
|
|
98
163
|
if (part.startsWith('var(')) return true
|
|
@@ -133,7 +198,7 @@ export function gradient(value) {
|
|
|
133
198
|
let validPositions = new Set(['center', 'top', 'right', 'bottom', 'left'])
|
|
134
199
|
export function position(value) {
|
|
135
200
|
let positions = 0
|
|
136
|
-
let result = value
|
|
201
|
+
let result = splitAtTopLevelOnly(value, '_').every((part) => {
|
|
137
202
|
part = normalize(part)
|
|
138
203
|
|
|
139
204
|
if (part.startsWith('var(')) return true
|
|
@@ -151,7 +216,7 @@ export function position(value) {
|
|
|
151
216
|
|
|
152
217
|
export function familyName(value) {
|
|
153
218
|
let fonts = 0
|
|
154
|
-
let result = value
|
|
219
|
+
let result = splitAtTopLevelOnly(value, ',').every((part) => {
|
|
155
220
|
part = normalize(part)
|
|
156
221
|
|
|
157
222
|
if (part.startsWith('var(')) return true
|
package/src/util/defaults.js
CHANGED
|
@@ -0,0 +1,412 @@
|
|
|
1
|
+
import selectorParser from 'postcss-selector-parser'
|
|
2
|
+
import unescape from 'postcss-selector-parser/dist/util/unesc'
|
|
3
|
+
import escapeClassName from '../util/escapeClassName'
|
|
4
|
+
import prefixSelector from '../util/prefixSelector'
|
|
5
|
+
|
|
6
|
+
/** @typedef {import('postcss-selector-parser').Root} Root */
|
|
7
|
+
/** @typedef {import('postcss-selector-parser').Selector} Selector */
|
|
8
|
+
/** @typedef {import('postcss-selector-parser').Pseudo} Pseudo */
|
|
9
|
+
/** @typedef {import('postcss-selector-parser').Node} Node */
|
|
10
|
+
|
|
11
|
+
/** @typedef {{format: string, isArbitraryVariant: boolean}[]} RawFormats */
|
|
12
|
+
/** @typedef {import('postcss-selector-parser').Root} ParsedFormats */
|
|
13
|
+
/** @typedef {RawFormats | ParsedFormats} AcceptedFormats */
|
|
14
|
+
|
|
15
|
+
let MERGE = ':merge'
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* @param {RawFormats} formats
|
|
19
|
+
* @param {{context: any, candidate: string, base: string | null}} options
|
|
20
|
+
* @returns {ParsedFormats | null}
|
|
21
|
+
*/
|
|
22
|
+
export function formatVariantSelector(formats, { context, candidate }) {
|
|
23
|
+
let prefix = context?.tailwindConfig.prefix ?? ''
|
|
24
|
+
|
|
25
|
+
// Parse the format selector into an AST
|
|
26
|
+
let parsedFormats = formats.map((format) => {
|
|
27
|
+
let ast = selectorParser().astSync(format.format)
|
|
28
|
+
|
|
29
|
+
return {
|
|
30
|
+
...format,
|
|
31
|
+
ast: format.isArbitraryVariant ? ast : prefixSelector(prefix, ast),
|
|
32
|
+
}
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
// We start with the candidate selector
|
|
36
|
+
let formatAst = selectorParser.root({
|
|
37
|
+
nodes: [
|
|
38
|
+
selectorParser.selector({
|
|
39
|
+
nodes: [selectorParser.className({ value: escapeClassName(candidate) })],
|
|
40
|
+
}),
|
|
41
|
+
],
|
|
42
|
+
})
|
|
43
|
+
|
|
44
|
+
// And iteratively merge each format selector into the candidate selector
|
|
45
|
+
for (let { ast } of parsedFormats) {
|
|
46
|
+
// 1. Handle :merge() special pseudo-class
|
|
47
|
+
;[formatAst, ast] = handleMergePseudo(formatAst, ast)
|
|
48
|
+
|
|
49
|
+
// 2. Merge the format selector into the current selector AST
|
|
50
|
+
ast.walkNesting((nesting) => nesting.replaceWith(...formatAst.nodes[0].nodes))
|
|
51
|
+
|
|
52
|
+
// 3. Keep going!
|
|
53
|
+
formatAst = ast
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
return formatAst
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Given any node in a selector this gets the "simple" selector it's a part of
|
|
61
|
+
* A simple selector is just a list of nodes without any combinators
|
|
62
|
+
* Technically :is(), :not(), :has(), etc… can have combinators but those are nested
|
|
63
|
+
* inside the relevant node and won't be picked up so they're fine to ignore
|
|
64
|
+
*
|
|
65
|
+
* @param {Node} node
|
|
66
|
+
* @returns {Node[]}
|
|
67
|
+
**/
|
|
68
|
+
function simpleSelectorForNode(node) {
|
|
69
|
+
/** @type {Node[]} */
|
|
70
|
+
let nodes = []
|
|
71
|
+
|
|
72
|
+
// Walk backwards until we hit a combinator node (or the start)
|
|
73
|
+
while (node.prev() && node.prev().type !== 'combinator') {
|
|
74
|
+
node = node.prev()
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
// Now record all non-combinator nodes until we hit one (or the end)
|
|
78
|
+
while (node && node.type !== 'combinator') {
|
|
79
|
+
nodes.push(node)
|
|
80
|
+
node = node.next()
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
return nodes
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* Resorts the nodes in a selector to ensure they're in the correct order
|
|
88
|
+
* Tags go before classes, and pseudo classes go after classes
|
|
89
|
+
*
|
|
90
|
+
* @param {Selector} sel
|
|
91
|
+
* @returns {Selector}
|
|
92
|
+
**/
|
|
93
|
+
function resortSelector(sel) {
|
|
94
|
+
sel.sort((a, b) => {
|
|
95
|
+
if (a.type === 'tag' && b.type === 'class') {
|
|
96
|
+
return -1
|
|
97
|
+
} else if (a.type === 'class' && b.type === 'tag') {
|
|
98
|
+
return 1
|
|
99
|
+
} else if (a.type === 'class' && b.type === 'pseudo' && b.value.startsWith('::')) {
|
|
100
|
+
return -1
|
|
101
|
+
} else if (a.type === 'pseudo' && a.value.startsWith('::') && b.type === 'class') {
|
|
102
|
+
return 1
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
return sel.index(a) - sel.index(b)
|
|
106
|
+
})
|
|
107
|
+
|
|
108
|
+
return sel
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* Remove extraneous selectors that do not include the base class/candidate
|
|
113
|
+
*
|
|
114
|
+
* Example:
|
|
115
|
+
* Given the utility `.a, .b { color: red}`
|
|
116
|
+
* Given the candidate `sm:b`
|
|
117
|
+
*
|
|
118
|
+
* The final selector should be `.sm\:b` and not `.a, .sm\:b`
|
|
119
|
+
*
|
|
120
|
+
* @param {Selector} ast
|
|
121
|
+
* @param {string} base
|
|
122
|
+
*/
|
|
123
|
+
function eliminateIrrelevantSelectors(sel, base) {
|
|
124
|
+
let hasClassesMatchingCandidate = false
|
|
125
|
+
|
|
126
|
+
sel.walk((child) => {
|
|
127
|
+
if (child.type === 'class' && child.value === base) {
|
|
128
|
+
hasClassesMatchingCandidate = true
|
|
129
|
+
return false // Stop walking
|
|
130
|
+
}
|
|
131
|
+
})
|
|
132
|
+
|
|
133
|
+
if (!hasClassesMatchingCandidate) {
|
|
134
|
+
sel.remove()
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
// We do NOT recursively eliminate sub selectors that don't have the base class
|
|
138
|
+
// as this is NOT a safe operation. For example, if we have:
|
|
139
|
+
// `.space-x-2 > :not([hidden]) ~ :not([hidden])`
|
|
140
|
+
// We cannot remove the [hidden] from the :not() because it would change the
|
|
141
|
+
// meaning of the selector.
|
|
142
|
+
|
|
143
|
+
// TODO: Can we do this for :matches, :is, and :where?
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
/**
|
|
147
|
+
* @param {string} current
|
|
148
|
+
* @param {AcceptedFormats} formats
|
|
149
|
+
* @param {{context: any, candidate: string, base: string | null}} options
|
|
150
|
+
* @returns {string}
|
|
151
|
+
*/
|
|
152
|
+
export function finalizeSelector(current, formats, { context, candidate, base }) {
|
|
153
|
+
let separator = context?.tailwindConfig?.separator ?? ':'
|
|
154
|
+
|
|
155
|
+
// Split by the separator, but ignore the separator inside square brackets:
|
|
156
|
+
//
|
|
157
|
+
// E.g.: dark:lg:hover:[paint-order:markers]
|
|
158
|
+
// ┬ ┬ ┬ ┬
|
|
159
|
+
// │ │ │ ╰── We will not split here
|
|
160
|
+
// ╰──┴─────┴─────────────── We will split here
|
|
161
|
+
//
|
|
162
|
+
base = base ?? candidate.split(new RegExp(`\\${separator}(?![^[]*\\])`)).pop()
|
|
163
|
+
|
|
164
|
+
// Parse the selector into an AST
|
|
165
|
+
let selector = selectorParser().astSync(current)
|
|
166
|
+
|
|
167
|
+
// Normalize escaped classes, e.g.:
|
|
168
|
+
//
|
|
169
|
+
// The idea would be to replace the escaped `base` in the selector with the
|
|
170
|
+
// `format`. However, in css you can escape the same selector in a few
|
|
171
|
+
// different ways. This would result in different strings and therefore we
|
|
172
|
+
// can't replace it properly.
|
|
173
|
+
//
|
|
174
|
+
// base: bg-[rgb(255,0,0)]
|
|
175
|
+
// base in selector: bg-\\[rgb\\(255\\,0\\,0\\)\\]
|
|
176
|
+
// escaped base: bg-\\[rgb\\(255\\2c 0\\2c 0\\)\\]
|
|
177
|
+
//
|
|
178
|
+
selector.walkClasses((node) => {
|
|
179
|
+
if (node.raws && node.value.includes(base)) {
|
|
180
|
+
node.raws.value = escapeClassName(unescape(node.raws.value))
|
|
181
|
+
}
|
|
182
|
+
})
|
|
183
|
+
|
|
184
|
+
// Remove extraneous selectors that do not include the base candidate
|
|
185
|
+
selector.each((sel) => eliminateIrrelevantSelectors(sel, base))
|
|
186
|
+
|
|
187
|
+
// If there are no formats that means there were no variants added to the candidate
|
|
188
|
+
// so we can just return the selector as-is
|
|
189
|
+
let formatAst = Array.isArray(formats)
|
|
190
|
+
? formatVariantSelector(formats, { context, candidate })
|
|
191
|
+
: formats
|
|
192
|
+
|
|
193
|
+
if (formatAst === null) {
|
|
194
|
+
return selector.toString()
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
let simpleStart = selectorParser.comment({ value: '/*__simple__*/' })
|
|
198
|
+
let simpleEnd = selectorParser.comment({ value: '/*__simple__*/' })
|
|
199
|
+
|
|
200
|
+
// We can safely replace the escaped base now, since the `base` section is
|
|
201
|
+
// now in a normalized escaped value.
|
|
202
|
+
selector.walkClasses((node) => {
|
|
203
|
+
if (node.value !== base) {
|
|
204
|
+
return
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
let parent = node.parent
|
|
208
|
+
let formatNodes = formatAst.nodes[0].nodes
|
|
209
|
+
|
|
210
|
+
// Perf optimization: if the parent is a single class we can just replace it and be done
|
|
211
|
+
if (parent.nodes.length === 1) {
|
|
212
|
+
node.replaceWith(...formatNodes)
|
|
213
|
+
return
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
let simpleSelector = simpleSelectorForNode(node)
|
|
217
|
+
parent.insertBefore(simpleSelector[0], simpleStart)
|
|
218
|
+
parent.insertAfter(simpleSelector[simpleSelector.length - 1], simpleEnd)
|
|
219
|
+
|
|
220
|
+
for (let child of formatNodes) {
|
|
221
|
+
parent.insertBefore(simpleSelector[0], child)
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
node.remove()
|
|
225
|
+
|
|
226
|
+
// Re-sort the simple selector to ensure it's in the correct order
|
|
227
|
+
simpleSelector = simpleSelectorForNode(simpleStart)
|
|
228
|
+
let firstNode = parent.index(simpleStart)
|
|
229
|
+
|
|
230
|
+
parent.nodes.splice(
|
|
231
|
+
firstNode,
|
|
232
|
+
simpleSelector.length,
|
|
233
|
+
...resortSelector(selectorParser.selector({ nodes: simpleSelector })).nodes
|
|
234
|
+
)
|
|
235
|
+
|
|
236
|
+
simpleStart.remove()
|
|
237
|
+
simpleEnd.remove()
|
|
238
|
+
})
|
|
239
|
+
|
|
240
|
+
// Remove unnecessary pseudo selectors that we used as placeholders
|
|
241
|
+
selector.walkPseudos((p) => {
|
|
242
|
+
if (p.value === MERGE) {
|
|
243
|
+
p.replaceWith(p.nodes)
|
|
244
|
+
}
|
|
245
|
+
})
|
|
246
|
+
|
|
247
|
+
// Move pseudo elements to the end of the selector (if necessary)
|
|
248
|
+
selector.each((sel) => {
|
|
249
|
+
let pseudoElements = collectPseudoElements(sel)
|
|
250
|
+
if (pseudoElements.length > 0) {
|
|
251
|
+
sel.nodes.push(pseudoElements.sort(sortSelector))
|
|
252
|
+
}
|
|
253
|
+
})
|
|
254
|
+
|
|
255
|
+
return selector.toString()
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
/**
|
|
259
|
+
*
|
|
260
|
+
* @param {Selector} selector
|
|
261
|
+
* @param {Selector} format
|
|
262
|
+
*/
|
|
263
|
+
export function handleMergePseudo(selector, format) {
|
|
264
|
+
/** @type {{pseudo: Pseudo, value: string}[]} */
|
|
265
|
+
let merges = []
|
|
266
|
+
|
|
267
|
+
// Find all :merge() pseudo-classes in `selector`
|
|
268
|
+
selector.walkPseudos((pseudo) => {
|
|
269
|
+
if (pseudo.value === MERGE) {
|
|
270
|
+
merges.push({
|
|
271
|
+
pseudo,
|
|
272
|
+
value: pseudo.nodes[0].toString(),
|
|
273
|
+
})
|
|
274
|
+
}
|
|
275
|
+
})
|
|
276
|
+
|
|
277
|
+
// Find all :merge() "attachments" in `format` and attach them to the matching selector in `selector`
|
|
278
|
+
format.walkPseudos((pseudo) => {
|
|
279
|
+
if (pseudo.value !== MERGE) {
|
|
280
|
+
return
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
let value = pseudo.nodes[0].toString()
|
|
284
|
+
|
|
285
|
+
// Does `selector` contain a :merge() pseudo-class with the same value?
|
|
286
|
+
let existing = merges.find((merge) => merge.value === value)
|
|
287
|
+
|
|
288
|
+
// Nope so there's nothing to do
|
|
289
|
+
if (!existing) {
|
|
290
|
+
return
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
// Everything after `:merge()` up to the next combinator is what is attached to the merged selector
|
|
294
|
+
let attachments = []
|
|
295
|
+
let next = pseudo.next()
|
|
296
|
+
while (next && next.type !== 'combinator') {
|
|
297
|
+
attachments.push(next)
|
|
298
|
+
next = next.next()
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
let combinator = next
|
|
302
|
+
|
|
303
|
+
existing.pseudo.parent.insertAfter(
|
|
304
|
+
existing.pseudo,
|
|
305
|
+
selectorParser.selector({ nodes: attachments.map((node) => node.clone()) })
|
|
306
|
+
)
|
|
307
|
+
|
|
308
|
+
pseudo.remove()
|
|
309
|
+
attachments.forEach((node) => node.remove())
|
|
310
|
+
|
|
311
|
+
// What about this case:
|
|
312
|
+
// :merge(.group):focus > &
|
|
313
|
+
// :merge(.group):hover &
|
|
314
|
+
if (combinator && combinator.type === 'combinator') {
|
|
315
|
+
combinator.remove()
|
|
316
|
+
}
|
|
317
|
+
})
|
|
318
|
+
|
|
319
|
+
return [selector, format]
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
// Note: As a rule, double colons (::) should be used instead of a single colon
|
|
323
|
+
// (:). This distinguishes pseudo-classes from pseudo-elements. However, since
|
|
324
|
+
// this distinction was not present in older versions of the W3C spec, most
|
|
325
|
+
// browsers support both syntaxes for the original pseudo-elements.
|
|
326
|
+
let pseudoElementsBC = [':before', ':after', ':first-line', ':first-letter']
|
|
327
|
+
|
|
328
|
+
// These pseudo-elements _can_ be combined with other pseudo selectors AND the order does matter.
|
|
329
|
+
let pseudoElementExceptions = [
|
|
330
|
+
'::file-selector-button',
|
|
331
|
+
|
|
332
|
+
// Webkit scroll bar pseudo elements can be combined with user-action pseudo classes
|
|
333
|
+
'::-webkit-scrollbar',
|
|
334
|
+
'::-webkit-scrollbar-button',
|
|
335
|
+
'::-webkit-scrollbar-thumb',
|
|
336
|
+
'::-webkit-scrollbar-track',
|
|
337
|
+
'::-webkit-scrollbar-track-piece',
|
|
338
|
+
'::-webkit-scrollbar-corner',
|
|
339
|
+
'::-webkit-resizer',
|
|
340
|
+
]
|
|
341
|
+
|
|
342
|
+
/**
|
|
343
|
+
* This will make sure to move pseudo's to the correct spot (the end for
|
|
344
|
+
* pseudo elements) because otherwise the selector will never work
|
|
345
|
+
* anyway.
|
|
346
|
+
*
|
|
347
|
+
* E.g.:
|
|
348
|
+
* - `before:hover:text-center` would result in `.before\:hover\:text-center:hover::before`
|
|
349
|
+
* - `hover:before:text-center` would result in `.hover\:before\:text-center:hover::before`
|
|
350
|
+
*
|
|
351
|
+
* `::before:hover` doesn't work, which means that we can make it work for you by flipping the order.
|
|
352
|
+
*
|
|
353
|
+
* @param {Selector} selector
|
|
354
|
+
**/
|
|
355
|
+
function collectPseudoElements(selector) {
|
|
356
|
+
/** @type {Node[]} */
|
|
357
|
+
let nodes = []
|
|
358
|
+
|
|
359
|
+
for (let node of selector.nodes) {
|
|
360
|
+
if (isPseudoElement(node)) {
|
|
361
|
+
nodes.push(node)
|
|
362
|
+
selector.removeChild(node)
|
|
363
|
+
}
|
|
364
|
+
|
|
365
|
+
if (node?.nodes) {
|
|
366
|
+
nodes.push(...collectPseudoElements(node))
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
|
|
370
|
+
return nodes
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
// This will make sure to move pseudo's to the correct spot (the end for
|
|
374
|
+
// pseudo elements) because otherwise the selector will never work
|
|
375
|
+
// anyway.
|
|
376
|
+
//
|
|
377
|
+
// E.g.:
|
|
378
|
+
// - `before:hover:text-center` would result in `.before\:hover\:text-center:hover::before`
|
|
379
|
+
// - `hover:before:text-center` would result in `.hover\:before\:text-center:hover::before`
|
|
380
|
+
//
|
|
381
|
+
// `::before:hover` doesn't work, which means that we can make it work
|
|
382
|
+
// for you by flipping the order.
|
|
383
|
+
function sortSelector(a, z) {
|
|
384
|
+
// Both nodes are non-pseudo's so we can safely ignore them and keep
|
|
385
|
+
// them in the same order.
|
|
386
|
+
if (a.type !== 'pseudo' && z.type !== 'pseudo') {
|
|
387
|
+
return 0
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
// If one of them is a combinator, we need to keep it in the same order
|
|
391
|
+
// because that means it will start a new "section" in the selector.
|
|
392
|
+
if ((a.type === 'combinator') ^ (z.type === 'combinator')) {
|
|
393
|
+
return 0
|
|
394
|
+
}
|
|
395
|
+
|
|
396
|
+
// One of the items is a pseudo and the other one isn't. Let's move
|
|
397
|
+
// the pseudo to the right.
|
|
398
|
+
if ((a.type === 'pseudo') ^ (z.type === 'pseudo')) {
|
|
399
|
+
return (a.type === 'pseudo') - (z.type === 'pseudo')
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
// Both are pseudo's, move the pseudo elements (except for
|
|
403
|
+
// ::file-selector-button) to the right.
|
|
404
|
+
return isPseudoElement(a) - isPseudoElement(z)
|
|
405
|
+
}
|
|
406
|
+
|
|
407
|
+
function isPseudoElement(node) {
|
|
408
|
+
if (node.type !== 'pseudo') return false
|
|
409
|
+
if (pseudoElementExceptions.includes(node.value)) return false
|
|
410
|
+
|
|
411
|
+
return node.value.startsWith('::') || pseudoElementsBC.includes(node.value)
|
|
412
|
+
}
|
|
@@ -9,6 +9,25 @@ export default function getAllConfigs(config) {
|
|
|
9
9
|
|
|
10
10
|
const features = {
|
|
11
11
|
// Add experimental configs here...
|
|
12
|
+
respectDefaultRingColorOpacity: {
|
|
13
|
+
theme: {
|
|
14
|
+
ringColor: ({ theme }) => ({
|
|
15
|
+
DEFAULT: '#3b82f67f',
|
|
16
|
+
...theme('colors'),
|
|
17
|
+
}),
|
|
18
|
+
},
|
|
19
|
+
},
|
|
20
|
+
|
|
21
|
+
disableColorOpacityUtilitiesByDefault: {
|
|
22
|
+
corePlugins: {
|
|
23
|
+
backgroundOpacity: false,
|
|
24
|
+
borderOpacity: false,
|
|
25
|
+
divideOpacity: false,
|
|
26
|
+
placeholderOpacity: false,
|
|
27
|
+
ringOpacity: false,
|
|
28
|
+
textOpacity: false,
|
|
29
|
+
},
|
|
30
|
+
},
|
|
12
31
|
}
|
|
13
32
|
|
|
14
33
|
const experimentals = Object.keys(features)
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
let matchingBrackets = new Map([
|
|
2
|
+
['{', '}'],
|
|
3
|
+
['[', ']'],
|
|
4
|
+
['(', ')'],
|
|
5
|
+
])
|
|
6
|
+
let inverseMatchingBrackets = new Map(
|
|
7
|
+
Array.from(matchingBrackets.entries()).map(([k, v]) => [v, k])
|
|
8
|
+
)
|
|
9
|
+
|
|
10
|
+
let quotes = new Set(['"', "'", '`'])
|
|
11
|
+
|
|
12
|
+
// Arbitrary values must contain balanced brackets (), [] and {}. Escaped
|
|
13
|
+
// values don't count, and brackets inside quotes also don't count.
|
|
14
|
+
//
|
|
15
|
+
// E.g.: w-[this-is]w-[weird-and-invalid]
|
|
16
|
+
// E.g.: w-[this-is\\]w-\\[weird-but-valid]
|
|
17
|
+
// E.g.: content-['this-is-also-valid]-weirdly-enough']
|
|
18
|
+
export default function isSyntacticallyValidPropertyValue(value) {
|
|
19
|
+
let stack = []
|
|
20
|
+
let inQuotes = false
|
|
21
|
+
|
|
22
|
+
for (let i = 0; i < value.length; i++) {
|
|
23
|
+
let char = value[i]
|
|
24
|
+
|
|
25
|
+
if (char === ':' && !inQuotes && stack.length === 0) {
|
|
26
|
+
return false
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
// Non-escaped quotes allow us to "allow" anything in between
|
|
30
|
+
if (quotes.has(char) && value[i - 1] !== '\\') {
|
|
31
|
+
inQuotes = !inQuotes
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
if (inQuotes) continue
|
|
35
|
+
if (value[i - 1] === '\\') continue // Escaped
|
|
36
|
+
|
|
37
|
+
if (matchingBrackets.has(char)) {
|
|
38
|
+
stack.push(char)
|
|
39
|
+
} else if (inverseMatchingBrackets.has(char)) {
|
|
40
|
+
let inverse = inverseMatchingBrackets.get(char)
|
|
41
|
+
|
|
42
|
+
// Nothing to pop from, therefore it is unbalanced
|
|
43
|
+
if (stack.length <= 0) {
|
|
44
|
+
return false
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
// Popped value must match the inverse value, otherwise it is unbalanced
|
|
48
|
+
if (stack.pop() !== inverse) {
|
|
49
|
+
return false
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
// If there is still something on the stack, it is also unbalanced
|
|
55
|
+
if (stack.length > 0) {
|
|
56
|
+
return false
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
// All good, totally balanced!
|
|
60
|
+
return true
|
|
61
|
+
}
|