wrapper/tailwindcss
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

ensure we also check wether the modifier exists in the modifiers object

Browse source 
Before we were just checking if the `modifiers` option is `any` or an
object, without actually checking that in case it is an object, the
value actually existed.
This commit is contained in:
Robin Malfait 2022-10-21 16:33:39 +02:00
parent 1445aafd3f
commit 0bbca33a85
No known key found for this signature in database
GPG key ID: 92F53D68B9041AFE
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/util/pluginUtils.js
View file

@ -233,14 +233,20 @@ export function coerceValue(types, modifier, options, tailwindConfig) {
export function* getMatchingTypes(types, rawModifier, options, tailwindConfig) {
let modifiersEnabled = flagEnabled(tailwindConfig, 'generalizedModifiers')
let [modifier, utilityModifier] = splitUtilityModifier(rawModifier)
let canUseUtilityModifier =
modifiersEnabled &&
options.modifiers != null &&
(options.modifiers === 'any' || typeof options.modifiers === 'object')
(options.modifiers === 'any' ||
(typeof options.modifiers === 'object' &&
((utilityModifier && isArbitraryValue(utilityModifier)) ||
utilityModifier in options.modifiers)))
let [modifier, utilityModifier] = canUseUtilityModifier
? splitUtilityModifier(rawModifier)
: [rawModifier, undefined]
if (!canUseUtilityModifier) {
modifier = rawModifier
utilityModifier = undefined
}
if (utilityModifier !== undefined && modifier === '') {
modifier = 'DEFAULT'