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

Ensure CSS variants and utilities always take precedence

Browse source
This commit is contained in:
Jordan Pittman 2024-08-22 15:19:38 -04:00 • committed by Philipp Spiess
parent bb89c7c6df
commit 73b5dfa9e7
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
packages/tailwindcss/src/index.ts
View file

@ -6,7 +6,7 @@ import { compileCandidates } from './compile'
import * as CSS from './css-parser'
import { buildDesignSystem, type DesignSystem } from './design-system'
import { substituteFunctions, THEME_FUNCTION_INVOCATION } from './functions'
import { registerPlugins, type ConfigFile, type Plugin } from './plugin-api'
import { registerPlugins, type Plugin } from './plugin-api'
import { Theme } from './theme'
import { segment } from './utils/segment'
@ -297,6 +297,17 @@ async function parseCss(
let designSystem = buildDesignSystem(theme)
let configs = await Promise.all(
configPaths.map(async (configPath) => ({
path: configPath,
config: await loadConfig(configPath),
})),
)
let plugins = await Promise.all(pluginPaths.map(loadPlugin))
let { pluginApi, resolvedConfig } = registerPlugins(plugins, designSystem, ast, configs)
for (let customVariant of customVariants) {
customVariant(designSystem)
}
@ -305,15 +316,6 @@ async function parseCss(
customUtility(designSystem)
}
let configs = await Promise.all(configPaths.map(async configPath => ({
path: configPath,
config: await loadConfig(configPath),
})))
let plugins = await Promise.all(pluginPaths.map(loadPlugin))
let { pluginApi, resolvedConfig } = registerPlugins(plugins, designSystem, ast, configs)
// Replace `@apply` rules with the actual utility classes.
if (css.includes('@apply')) {
substituteAtApply(ast, designSystem)