tailwindcss 0.0.0-insiders.bd4dddd → 0.0.0-insiders.bda8421
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/LICENSE +1 -2
- package/README.md +13 -10
- package/colors.d.ts +3 -0
- package/defaultConfig.d.ts +3 -0
- package/defaultTheme.d.ts +4 -0
- package/lib/cli/build/deps.js +62 -0
- package/lib/cli/build/index.js +54 -0
- package/lib/cli/build/plugin.js +371 -0
- package/lib/cli/build/utils.js +88 -0
- package/lib/cli/build/watching.js +182 -0
- package/lib/cli/help/index.js +73 -0
- package/lib/cli/index.js +230 -0
- package/lib/cli/init/index.js +63 -0
- package/lib/cli-peer-dependencies.js +28 -7
- package/lib/cli.js +1 -741
- package/lib/corePluginList.js +17 -4
- package/lib/corePlugins.js +2503 -1839
- package/lib/css/preflight.css +32 -13
- package/lib/featureFlags.js +45 -28
- package/lib/index.js +1 -29
- package/lib/lib/cacheInvalidation.js +92 -0
- package/lib/lib/collapseAdjacentRules.js +30 -10
- package/lib/lib/collapseDuplicateDeclarations.js +13 -8
- package/lib/lib/content.js +214 -0
- package/lib/lib/defaultExtractor.js +240 -31
- package/lib/lib/evaluateTailwindFunctions.js +117 -50
- package/lib/lib/expandApplyAtRules.js +466 -230
- package/lib/lib/expandTailwindAtRules.js +156 -135
- package/lib/lib/findAtConfigPath.js +46 -0
- package/lib/lib/generateRules.js +554 -200
- package/lib/lib/getModuleDependencies.js +88 -37
- package/lib/lib/load-config.js +57 -0
- package/lib/lib/normalizeTailwindDirectives.js +39 -33
- package/lib/lib/offsets.js +355 -0
- package/lib/lib/partitionApplyAtRules.js +58 -0
- package/lib/lib/regex.js +74 -0
- package/lib/lib/remap-bitfield.js +89 -0
- package/lib/lib/resolveDefaultsAtRules.js +97 -69
- package/lib/lib/setupContextUtils.js +796 -341
- package/lib/lib/setupTrackingContext.js +66 -71
- package/lib/lib/sharedState.js +45 -14
- package/lib/lib/substituteScreenAtRules.js +14 -10
- package/lib/plugin.js +48 -0
- package/{nesting → lib/postcss-plugins/nesting}/README.md +2 -2
- package/lib/postcss-plugins/nesting/index.js +21 -0
- package/lib/postcss-plugins/nesting/plugin.js +89 -0
- package/lib/processTailwindFeatures.js +37 -27
- package/lib/public/colors.js +272 -246
- package/lib/public/create-plugin.js +9 -5
- package/lib/public/default-config.js +10 -6
- package/lib/public/default-theme.js +10 -6
- package/lib/public/load-config.js +12 -0
- package/lib/public/resolve-config.js +11 -6
- package/lib/util/applyImportantSelector.js +36 -0
- package/lib/util/bigSign.js +6 -1
- package/lib/util/buildMediaQuery.js +13 -6
- package/lib/util/cloneDeep.js +9 -6
- package/lib/util/cloneNodes.js +44 -4
- package/lib/util/color.js +70 -53
- package/lib/util/colorNames.js +752 -0
- package/lib/util/configurePlugins.js +7 -2
- package/lib/util/createPlugin.js +8 -6
- package/lib/util/createUtilityPlugin.js +16 -16
- package/lib/util/dataTypes.js +295 -113
- package/lib/util/defaults.js +12 -7
- package/lib/util/escapeClassName.js +13 -8
- package/lib/util/escapeCommas.js +7 -2
- package/lib/util/flattenColorPalette.js +11 -12
- package/lib/util/formatVariantSelector.js +235 -151
- package/lib/util/getAllConfigs.js +33 -12
- package/lib/util/hashConfig.js +9 -4
- package/lib/util/isKeyframeRule.js +7 -2
- package/lib/util/isPlainObject.js +8 -3
- package/lib/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +25 -15
- package/lib/util/log.js +25 -15
- package/lib/util/nameClass.js +27 -10
- package/lib/util/negateValue.js +25 -8
- package/lib/util/normalizeConfig.js +127 -82
- package/lib/util/normalizeScreens.js +128 -11
- package/lib/util/parseAnimationValue.js +44 -40
- package/lib/util/parseBoxShadowValue.js +34 -23
- package/lib/util/parseDependency.js +39 -55
- package/lib/util/parseGlob.js +36 -0
- package/lib/util/parseObjectStyles.js +15 -10
- package/lib/util/pluginUtils.js +172 -69
- package/lib/util/prefixSelector.js +30 -12
- package/lib/util/pseudoElements.js +212 -0
- package/lib/util/removeAlphaVariables.js +31 -0
- package/lib/util/resolveConfig.js +101 -87
- package/lib/util/resolveConfigPath.js +30 -12
- package/lib/util/responsive.js +11 -6
- package/lib/util/splitAtTopLevelOnly.js +51 -0
- package/lib/util/tap.js +6 -1
- package/lib/util/toColorValue.js +7 -3
- package/lib/util/toPath.js +22 -4
- package/lib/util/transformThemeValue.js +40 -30
- package/lib/util/validateConfig.js +37 -0
- package/lib/util/validateFormalSyntax.js +26 -0
- package/lib/util/withAlphaVariable.js +27 -15
- package/lib/value-parser/LICENSE +22 -0
- package/lib/value-parser/README.md +3 -0
- package/lib/value-parser/index.d.js +2 -0
- package/lib/value-parser/index.js +22 -0
- package/lib/value-parser/parse.js +259 -0
- package/lib/value-parser/stringify.js +38 -0
- package/lib/value-parser/unit.js +86 -0
- package/lib/value-parser/walk.js +16 -0
- package/loadConfig.d.ts +4 -0
- package/loadConfig.js +2 -0
- package/nesting/index.d.ts +4 -0
- package/nesting/index.js +2 -12
- package/package.json +60 -55
- package/peers/index.js +75503 -55095
- package/plugin.d.ts +11 -0
- package/resolveConfig.d.ts +31 -0
- package/scripts/generate-types.js +104 -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 +437 -0
- package/src/cli/build/utils.js +76 -0
- package/src/cli/build/watching.js +229 -0
- package/src/cli/help/index.js +70 -0
- package/src/cli/index.js +216 -0
- package/src/cli/init/index.js +79 -0
- package/src/cli-peer-dependencies.js +7 -1
- package/src/cli.js +1 -811
- package/src/corePluginList.js +1 -1
- package/src/corePlugins.js +849 -243
- package/src/css/preflight.css +32 -13
- package/src/featureFlags.js +13 -9
- package/src/index.js +1 -28
- package/src/lib/cacheInvalidation.js +52 -0
- package/src/lib/collapseAdjacentRules.js +21 -2
- package/src/lib/content.js +249 -0
- package/src/lib/defaultExtractor.js +215 -33
- package/src/lib/evaluateTailwindFunctions.js +82 -8
- package/src/lib/expandApplyAtRules.js +512 -224
- package/src/lib/expandTailwindAtRules.js +102 -87
- package/src/lib/findAtConfigPath.js +48 -0
- package/src/lib/generateRules.js +541 -146
- package/src/lib/getModuleDependencies.js +70 -30
- package/src/lib/load-config.ts +44 -0
- package/src/lib/normalizeTailwindDirectives.js +1 -0
- package/src/lib/offsets.js +432 -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 +55 -30
- package/src/lib/setupContextUtils.js +720 -190
- package/src/lib/setupTrackingContext.js +47 -61
- package/src/lib/sharedState.js +15 -4
- package/src/plugin.js +47 -0
- 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 +11 -4
- package/src/public/colors.js +22 -0
- package/src/public/default-config.js +1 -1
- package/src/public/default-theme.js +2 -2
- package/src/public/load-config.js +2 -0
- package/src/util/applyImportantSelector.js +27 -0
- package/src/util/buildMediaQuery.js +5 -3
- package/src/util/cloneNodes.js +40 -2
- package/src/util/color.js +39 -20
- package/src/util/colorNames.js +150 -0
- package/src/util/dataTypes.js +184 -26
- package/src/util/formatVariantSelector.js +272 -144
- package/src/util/getAllConfigs.js +21 -2
- package/src/util/isPlainObject.js +1 -1
- package/src/util/{isValidArbitraryValue.js → isSyntacticallyValidPropertyValue.js} +1 -1
- package/src/util/log.js +8 -8
- package/src/util/nameClass.js +4 -0
- package/src/util/negateValue.js +11 -3
- package/src/util/normalizeConfig.js +45 -6
- package/src/util/normalizeScreens.js +99 -4
- package/src/util/parseBoxShadowValue.js +4 -3
- package/src/util/parseDependency.js +37 -42
- package/src/util/parseGlob.js +24 -0
- package/src/util/pluginUtils.js +139 -24
- package/src/util/prefixSelector.js +31 -10
- package/src/util/pseudoElements.js +171 -0
- package/src/util/removeAlphaVariables.js +24 -0
- package/src/util/resolveConfig.js +70 -32
- package/src/util/resolveConfigPath.js +12 -1
- package/src/util/splitAtTopLevelOnly.js +52 -0
- package/src/util/toPath.js +1 -1
- package/src/util/transformThemeValue.js +13 -3
- package/src/util/validateConfig.js +26 -0
- package/src/util/validateFormalSyntax.js +34 -0
- package/src/util/withAlphaVariable.js +1 -1
- package/src/value-parser/LICENSE +22 -0
- package/src/value-parser/README.md +3 -0
- package/src/value-parser/index.d.ts +177 -0
- package/src/value-parser/index.js +28 -0
- package/src/value-parser/parse.js +303 -0
- package/src/value-parser/stringify.js +41 -0
- package/src/value-parser/unit.js +118 -0
- package/src/value-parser/walk.js +18 -0
- package/stubs/.gitignore +1 -0
- package/stubs/.prettierrc.json +6 -0
- package/stubs/{defaultConfig.stub.js → config.full.js} +290 -178
- package/stubs/postcss.config.js +6 -0
- package/stubs/tailwind.config.cjs +2 -0
- package/stubs/tailwind.config.js +2 -0
- package/stubs/tailwind.config.ts +3 -0
- package/types/config.d.ts +376 -0
- package/types/generated/.gitkeep +0 -0
- package/types/generated/colors.d.ts +298 -0
- package/types/generated/corePluginList.d.ts +1 -0
- package/types/generated/default-theme.d.ts +397 -0
- package/types/index.d.ts +11 -0
- package/CHANGELOG.md +0 -1959
- package/lib/constants.js +0 -37
- package/lib/lib/detectNesting.js +0 -34
- package/nesting/plugin.js +0 -41
- package/scripts/install-integrations.js +0 -27
- package/scripts/rebuildFixtures.js +0 -68
- package/src/constants.js +0 -17
- package/src/lib/detectNesting.js +0 -39
- /package/stubs/{simpleConfig.stub.js → config.simple.js} +0 -0
- /package/stubs/{defaultPostCssConfig.stub.js → postcss.config.cjs} +0 -0
|
@@ -1,40 +1,222 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
1
|
+
import * as regex from './regex'
|
|
2
|
+
|
|
3
|
+
export function defaultExtractor(context) {
|
|
4
|
+
let patterns = Array.from(buildRegExps(context))
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* @param {string} content
|
|
8
|
+
*/
|
|
9
|
+
return (content) => {
|
|
10
|
+
/** @type {(string|string)[]} */
|
|
11
|
+
let results = []
|
|
12
|
+
|
|
13
|
+
for (let pattern of patterns) {
|
|
14
|
+
for (let result of content.match(pattern) ?? []) {
|
|
15
|
+
results.push(clipAtBalancedParens(result))
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
return results
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
function* buildRegExps(context) {
|
|
24
|
+
let separator = context.tailwindConfig.separator
|
|
25
|
+
let prefix =
|
|
26
|
+
context.tailwindConfig.prefix !== ''
|
|
27
|
+
? regex.optional(regex.pattern([/-?/, regex.escape(context.tailwindConfig.prefix)]))
|
|
28
|
+
: ''
|
|
29
|
+
|
|
30
|
+
let utility = regex.any([
|
|
31
|
+
// Arbitrary properties (without square brackets)
|
|
32
|
+
/\[[^\s:'"`]+:[^\s\[\]]+\]/,
|
|
33
|
+
|
|
34
|
+
// Arbitrary properties with balanced square brackets
|
|
35
|
+
// This is a targeted fix to continue to allow theme()
|
|
36
|
+
// with square brackets to work in arbitrary properties
|
|
37
|
+
// while fixing a problem with the regex matching too much
|
|
38
|
+
/\[[^\s:'"`\]]+:[^\s]+?\[[^\s]+\][^\s]+?\]/,
|
|
39
|
+
|
|
40
|
+
// Utilities
|
|
41
|
+
regex.pattern([
|
|
42
|
+
// Utility Name / Group Name
|
|
43
|
+
regex.any([
|
|
44
|
+
/-?(?:\w+)/,
|
|
45
|
+
|
|
46
|
+
// This is here to make sure @container supports everything that other utilities do
|
|
47
|
+
/@(?:\w+)/,
|
|
48
|
+
]),
|
|
49
|
+
|
|
50
|
+
// Normal/Arbitrary values
|
|
51
|
+
regex.optional(
|
|
52
|
+
regex.any([
|
|
53
|
+
regex.pattern([
|
|
54
|
+
// Arbitrary values
|
|
55
|
+
regex.any([
|
|
56
|
+
/-(?:\w+-)*\['[^\s]+'\]/,
|
|
57
|
+
/-(?:\w+-)*\["[^\s]+"\]/,
|
|
58
|
+
/-(?:\w+-)*\[`[^\s]+`\]/,
|
|
59
|
+
/-(?:\w+-)*\[(?:[^\s\[\]]+\[[^\s\[\]]+\])*[^\s:\[\]]+\]/,
|
|
60
|
+
]),
|
|
61
|
+
|
|
62
|
+
// Not immediately followed by an `{[(`
|
|
63
|
+
/(?![{([]])/,
|
|
64
|
+
|
|
65
|
+
// optionally followed by an opacity modifier
|
|
66
|
+
/(?:\/[^\s'"`\\><$]*)?/,
|
|
67
|
+
]),
|
|
68
|
+
|
|
69
|
+
regex.pattern([
|
|
70
|
+
// Arbitrary values
|
|
71
|
+
regex.any([
|
|
72
|
+
/-(?:\w+-)*\['[^\s]+'\]/,
|
|
73
|
+
/-(?:\w+-)*\["[^\s]+"\]/,
|
|
74
|
+
/-(?:\w+-)*\[`[^\s]+`\]/,
|
|
75
|
+
/-(?:\w+-)*\[(?:[^\s\[\]]+\[[^\s\[\]]+\])*[^\s\[\]]+\]/,
|
|
76
|
+
]),
|
|
77
|
+
|
|
78
|
+
// Not immediately followed by an `{[(`
|
|
79
|
+
/(?![{([]])/,
|
|
80
|
+
|
|
81
|
+
// optionally followed by an opacity modifier
|
|
82
|
+
/(?:\/[^\s'"`\\$]*)?/,
|
|
83
|
+
]),
|
|
84
|
+
|
|
85
|
+
// Normal values w/o quotes — may include an opacity modifier
|
|
86
|
+
/[-\/][^\s'"`\\$={><]*/,
|
|
87
|
+
])
|
|
88
|
+
),
|
|
89
|
+
]),
|
|
90
|
+
])
|
|
91
|
+
|
|
92
|
+
let variantPatterns = [
|
|
93
|
+
// Without quotes
|
|
94
|
+
regex.any([
|
|
95
|
+
// This is here to provide special support for the `@` variant
|
|
96
|
+
regex.pattern([/@\[[^\s"'`]+\](\/[^\s"'`]+)?/, separator]),
|
|
97
|
+
|
|
98
|
+
// With variant modifier (e.g.: group-[..]/modifier)
|
|
99
|
+
regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s"'`]+\]\/[\w_-]+/, separator]),
|
|
100
|
+
|
|
101
|
+
regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s"'`]+\]/, separator]),
|
|
102
|
+
regex.pattern([/[^\s"'`\[\\]+/, separator]),
|
|
103
|
+
]),
|
|
104
|
+
|
|
105
|
+
// With quotes allowed
|
|
106
|
+
regex.any([
|
|
107
|
+
// With variant modifier (e.g.: group-[..]/modifier)
|
|
108
|
+
regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s`]+\]\/[\w_-]+/, separator]),
|
|
109
|
+
|
|
110
|
+
regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s`]+\]/, separator]),
|
|
111
|
+
regex.pattern([/[^\s`\[\\]+/, separator]),
|
|
112
|
+
]),
|
|
113
|
+
]
|
|
114
|
+
|
|
115
|
+
for (const variantPattern of variantPatterns) {
|
|
116
|
+
yield regex.pattern([
|
|
117
|
+
// Variants
|
|
118
|
+
'((?=((',
|
|
119
|
+
variantPattern,
|
|
120
|
+
')+))\\2)?',
|
|
121
|
+
|
|
122
|
+
// Important (optional)
|
|
123
|
+
/!?/,
|
|
124
|
+
|
|
125
|
+
prefix,
|
|
126
|
+
|
|
127
|
+
utility,
|
|
128
|
+
])
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
// 5. Inner matches
|
|
132
|
+
yield /[^<>"'`\s.(){}[\]#=%$]*[^<>"'`\s.(){}[\]#=%:$]/g
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
// We want to capture any "special" characters
|
|
136
|
+
// AND the characters immediately following them (if there is one)
|
|
137
|
+
let SPECIALS = /([\[\]'"`])([^\[\]'"`])?/g
|
|
138
|
+
let ALLOWED_CLASS_CHARACTERS = /[^"'`\s<>\]]+/
|
|
28
139
|
|
|
29
140
|
/**
|
|
30
|
-
*
|
|
141
|
+
* Clips a string ensuring that parentheses, quotes, etc… are balanced
|
|
142
|
+
* Used for arbitrary values only
|
|
143
|
+
*
|
|
144
|
+
* We will go past the end of the balanced parens until we find a non-class character
|
|
145
|
+
*
|
|
146
|
+
* Depth matching behavior:
|
|
147
|
+
* w-[calc(100%-theme('spacing[some_key][1.5]'))]']
|
|
148
|
+
* ┬ ┬ ┬┬ ┬ ┬┬ ┬┬┬┬┬┬┬
|
|
149
|
+
* 1 2 3 4 34 3 210 END
|
|
150
|
+
* ╰────┴──────────┴────────┴────────┴┴───┴─┴┴┴
|
|
151
|
+
*
|
|
152
|
+
* @param {string} input
|
|
31
153
|
*/
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
154
|
+
function clipAtBalancedParens(input) {
|
|
155
|
+
// We are care about this for arbitrary values
|
|
156
|
+
if (!input.includes('-[')) {
|
|
157
|
+
return input
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
let depth = 0
|
|
161
|
+
let openStringTypes = []
|
|
162
|
+
|
|
163
|
+
// Find all parens, brackets, quotes, etc
|
|
164
|
+
// Stop when we end at a balanced pair
|
|
165
|
+
// This is naive and will treat mismatched parens as balanced
|
|
166
|
+
// This shouldn't be a problem in practice though
|
|
167
|
+
let matches = input.matchAll(SPECIALS)
|
|
168
|
+
|
|
169
|
+
// We can't use lookbehind assertions because we have to support Safari
|
|
170
|
+
// So, instead, we've emulated it using capture groups and we'll re-work the matches to accommodate
|
|
171
|
+
matches = Array.from(matches).flatMap((match) => {
|
|
172
|
+
const [, ...groups] = match
|
|
173
|
+
|
|
174
|
+
return groups.map((group, idx) =>
|
|
175
|
+
Object.assign([], match, {
|
|
176
|
+
index: match.index + idx,
|
|
177
|
+
0: group,
|
|
178
|
+
})
|
|
179
|
+
)
|
|
180
|
+
})
|
|
181
|
+
|
|
182
|
+
for (let match of matches) {
|
|
183
|
+
let char = match[0]
|
|
184
|
+
let inStringType = openStringTypes[openStringTypes.length - 1]
|
|
185
|
+
|
|
186
|
+
if (char === inStringType) {
|
|
187
|
+
openStringTypes.pop()
|
|
188
|
+
} else if (char === "'" || char === '"' || char === '`') {
|
|
189
|
+
openStringTypes.push(char)
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
if (inStringType) {
|
|
193
|
+
continue
|
|
194
|
+
} else if (char === '[') {
|
|
195
|
+
depth++
|
|
196
|
+
continue
|
|
197
|
+
} else if (char === ']') {
|
|
198
|
+
depth--
|
|
199
|
+
continue
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
// We've gone one character past the point where we should stop
|
|
203
|
+
// This means that there was an extra closing `]`
|
|
204
|
+
// We'll clip to just before it
|
|
205
|
+
if (depth < 0) {
|
|
206
|
+
return input.substring(0, match.index - 1)
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
// We've finished balancing the brackets but there still may be characters that can be included
|
|
210
|
+
// For example in the class `text-[#336699]/[.35]`
|
|
211
|
+
// The depth goes to `0` at the closing `]` but goes up again at the `[`
|
|
212
|
+
|
|
213
|
+
// If we're at zero and encounter a non-class character then we clip the class there
|
|
214
|
+
if (depth === 0 && !ALLOWED_CLASS_CHARACTERS.test(char)) {
|
|
215
|
+
return input.substring(0, match.index)
|
|
216
|
+
}
|
|
217
|
+
}
|
|
36
218
|
|
|
37
|
-
return
|
|
219
|
+
return input
|
|
38
220
|
}
|
|
39
221
|
|
|
40
222
|
// Regular utilities
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import dlv from 'dlv'
|
|
2
2
|
import didYouMean from 'didyoumean'
|
|
3
3
|
import transformThemeValue from '../util/transformThemeValue'
|
|
4
|
-
import parseValue from '
|
|
4
|
+
import parseValue from '../value-parser/index'
|
|
5
5
|
import { normalizeScreens } from '../util/normalizeScreens'
|
|
6
6
|
import buildMediaQuery from '../util/buildMediaQuery'
|
|
7
7
|
import { toPath } from '../util/toPath'
|
|
8
|
+
import { withAlphaValue } from '../util/withAlphaVariable'
|
|
9
|
+
import { parseColorFormat } from '../util/pluginUtils'
|
|
10
|
+
import log from '../util/log'
|
|
8
11
|
|
|
9
12
|
function isObject(input) {
|
|
10
13
|
return typeof input === 'object' && input !== null
|
|
@@ -37,10 +40,8 @@ function listKeys(obj) {
|
|
|
37
40
|
return list(Object.keys(obj))
|
|
38
41
|
}
|
|
39
42
|
|
|
40
|
-
function validatePath(config, path, defaultValue) {
|
|
41
|
-
const pathString = Array.isArray(path)
|
|
42
|
-
? pathToString(path)
|
|
43
|
-
: path.replace(/^['"]+/g, '').replace(/['"]+$/g, '')
|
|
43
|
+
function validatePath(config, path, defaultValue, themeOpts = {}) {
|
|
44
|
+
const pathString = Array.isArray(path) ? pathToString(path) : path.replace(/^['"]+|['"]+$/g, '')
|
|
44
45
|
const pathSegments = Array.isArray(path) ? path : toPath(pathString)
|
|
45
46
|
const value = dlv(config.theme, pathSegments, defaultValue)
|
|
46
47
|
|
|
@@ -114,7 +115,7 @@ function validatePath(config, path, defaultValue) {
|
|
|
114
115
|
|
|
115
116
|
return {
|
|
116
117
|
isValid: true,
|
|
117
|
-
value: transformThemeValue(themeSection)(value),
|
|
118
|
+
value: transformThemeValue(themeSection)(value, themeOpts),
|
|
118
119
|
}
|
|
119
120
|
}
|
|
120
121
|
|
|
@@ -145,6 +146,9 @@ function resolveVNode(node, vNode, functions) {
|
|
|
145
146
|
}
|
|
146
147
|
|
|
147
148
|
function resolveFunctions(node, input, functions) {
|
|
149
|
+
let hasAnyFn = Object.keys(functions).some((fn) => input.includes(`${fn}(`))
|
|
150
|
+
if (!hasAnyFn) return input
|
|
151
|
+
|
|
148
152
|
return parseValue(input)
|
|
149
153
|
.walk((vNode) => {
|
|
150
154
|
resolveVNode(node, vNode, functions)
|
|
@@ -157,19 +161,89 @@ let nodeTypePropertyMap = {
|
|
|
157
161
|
decl: 'value',
|
|
158
162
|
}
|
|
159
163
|
|
|
160
|
-
|
|
164
|
+
/**
|
|
165
|
+
* @param {string} path
|
|
166
|
+
* @returns {Iterable<[path: string, alpha: string|undefined]>}
|
|
167
|
+
*/
|
|
168
|
+
function* toPaths(path) {
|
|
169
|
+
// Strip quotes from beginning and end of string
|
|
170
|
+
// This allows the alpha value to be present inside of quotes
|
|
171
|
+
path = path.replace(/^['"]+|['"]+$/g, '')
|
|
172
|
+
|
|
173
|
+
let matches = path.match(/^([^\s]+)(?![^\[]*\])(?:\s*\/\s*([^\/\s]+))$/)
|
|
174
|
+
let alpha = undefined
|
|
175
|
+
|
|
176
|
+
yield [path, undefined]
|
|
177
|
+
|
|
178
|
+
if (matches) {
|
|
179
|
+
path = matches[1]
|
|
180
|
+
alpha = matches[2]
|
|
181
|
+
|
|
182
|
+
yield [path, alpha]
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/**
|
|
187
|
+
*
|
|
188
|
+
* @param {any} config
|
|
189
|
+
* @param {string} path
|
|
190
|
+
* @param {any} defaultValue
|
|
191
|
+
*/
|
|
192
|
+
function resolvePath(config, path, defaultValue) {
|
|
193
|
+
const results = Array.from(toPaths(path)).map(([path, alpha]) => {
|
|
194
|
+
return Object.assign(validatePath(config, path, defaultValue, { opacityValue: alpha }), {
|
|
195
|
+
resolvedPath: path,
|
|
196
|
+
alpha,
|
|
197
|
+
})
|
|
198
|
+
})
|
|
199
|
+
|
|
200
|
+
return results.find((result) => result.isValid) ?? results[0]
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
export default function (context) {
|
|
204
|
+
let config = context.tailwindConfig
|
|
205
|
+
|
|
161
206
|
let functions = {
|
|
162
207
|
theme: (node, path, ...defaultValue) => {
|
|
163
|
-
|
|
208
|
+
let { isValid, value, error, alpha } = resolvePath(
|
|
164
209
|
config,
|
|
165
210
|
path,
|
|
166
211
|
defaultValue.length ? defaultValue : undefined
|
|
167
212
|
)
|
|
168
213
|
|
|
169
214
|
if (!isValid) {
|
|
215
|
+
let parentNode = node.parent
|
|
216
|
+
let candidate = parentNode?.raws.tailwind?.candidate
|
|
217
|
+
|
|
218
|
+
if (parentNode && candidate !== undefined) {
|
|
219
|
+
// Remove this utility from any caches
|
|
220
|
+
context.markInvalidUtilityNode(parentNode)
|
|
221
|
+
|
|
222
|
+
// Remove the CSS node from the markup
|
|
223
|
+
parentNode.remove()
|
|
224
|
+
|
|
225
|
+
// Show a warning
|
|
226
|
+
log.warn('invalid-theme-key-in-class', [
|
|
227
|
+
`The utility \`${candidate}\` contains an invalid theme value and was not generated.`,
|
|
228
|
+
])
|
|
229
|
+
|
|
230
|
+
return
|
|
231
|
+
}
|
|
232
|
+
|
|
170
233
|
throw node.error(error)
|
|
171
234
|
}
|
|
172
235
|
|
|
236
|
+
let maybeColor = parseColorFormat(value)
|
|
237
|
+
let isColorFunction = maybeColor !== undefined && typeof maybeColor === 'function'
|
|
238
|
+
|
|
239
|
+
if (alpha !== undefined || isColorFunction) {
|
|
240
|
+
if (alpha === undefined) {
|
|
241
|
+
alpha = 1.0
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
value = withAlphaValue(maybeColor, alpha, maybeColor)
|
|
245
|
+
}
|
|
246
|
+
|
|
173
247
|
return value
|
|
174
248
|
},
|
|
175
249
|
screen: (node, screen) => {
|