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

Use new candidate parsing in resolveMatches

Browse source
This commit is contained in:
Jordan Pittman 2022-05-10 11:50:27 -04:00
parent 0f98fec7f0
commit 5fe5a65029
1 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/lib/generateRules.js
View file

@ -5,14 +5,13 @@ import isPlainObject from '../util/isPlainObject'
import prefixSelector from '../util/prefixSelector'
import { updateAllClasses } from '../util/pluginUtils'
import log from '../util/log'
import * as sharedState from './sharedState'
import { formatVariantSelector, finalizeSelector } from '../util/formatVariantSelector'
import { asClass } from '../util/nameClass'
import { normalize } from '../util/dataTypes'
import { isValidVariantFormatString, parseVariant } from './setupContextUtils'
import isValidArbitraryValue from '../util/isValidArbitraryValue'
import { splitAtTopLevelOnly } from '../util/splitAtTopLevelOnly.js'
import { isParsableNode, isParsableCssValue, isValidPropName } from '../util/css-validation.js'
import { parseCandidate } from '../lib/candidate.js'
let classNameParser = selectorParser((selectors) => {
return selectors.first.filter(({ type }) => type === 'class').pop().value
@ -374,14 +373,6 @@ function* resolveMatchedPlugins(classCandidate, context) {
}
}
function splitWithSeparator(input, separator) {
if (input === sharedState.NOT_ON_DEMAND) {
return [sharedState.NOT_ON_DEMAND]
}
return Array.from(splitAtTopLevelOnly(input, separator))
}
function* recordCandidates(matches, classCandidate) {
for (const match of matches) {
match[1].raws.tailwind = { ...match[1].raws.tailwind, classCandidate }
@ -391,15 +382,16 @@ function* recordCandidates(matches, classCandidate) {
}
function* resolveMatches(candidate, context) {
let separator = context.tailwindConfig.separator
let [classCandidate, ...variants] = splitWithSeparator(candidate, separator).reverse()
let important = false
let parsed = parseCandidate(candidate, context)
if (classCandidate.startsWith('!')) {
important = true
classCandidate = classCandidate.slice(1)
if (parsed === null) {
return
}
let classCandidate = parsed.withoutVariants
let important = parsed.important
let variants = parsed.variants.map((v) => v.raw)
// TODO: Reintroduce this in ways that doesn't break on false positives
// function sortAgainst(toSort, against) {
// return toSort.slice().sort((a, z) => {