Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename --font-size-* variables to --text-* #14909

Merged
merged 12 commits into from
Nov 7, 2024
Merged

Rename --font-size-* variables to --text-* #14909

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e39d1d9
Rename `--font-size-*` variables to `--text-*`
adamwathan Nov 7, 2024
7b4b556
WIP
adamwathan Nov 7, 2024
c98a414
WIP
philipp-spiess Nov 7, 2024
ffd3126
wip
thecrypticace Nov 7, 2024
096f518
Move plugin registration back
thecrypticace Nov 7, 2024
66377f4
wip
thecrypticace Nov 7, 2024
bb49443
Update tests
thecrypticace Nov 7, 2024
231b15b
undo formatting change
thecrypticace Nov 7, 2024
8d2788e
Cleanup a bit
thecrypticace Nov 7, 2024
7e88a30
Update Playwright tests
thecrypticace Nov 7, 2024
cec060b
Convert to number instead of typecast
adamwathan Nov 7, 2024
e6f33fa
Update changelog
adamwathan Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move plugin registration back
  • Loading branch information
@thecrypticace
thecrypticace committed Nov 7, 2024
commit 096f518fb89e684a34aaabbbedfc7796e4ae348f
11 changes: 6 additions & 5 deletions packages/tailwindcss/src/compat/apply-compat-hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,12 @@ function upgradeToFullPluginSupport({
userConfig,
)

let pluginApi = buildPluginApi(designSystem, ast, resolvedConfig)

for (let { handler } of resolvedConfig.plugins) {
handler(pluginApi)
}

// Merge the user-configured theme keys into the design system. The compat
// config would otherwise expand into namespaces like `background-color` which
// core utilities already read from.
Expand All @@ -234,11 +240,6 @@ function upgradeToFullPluginSupport({
registerThemeVariantOverrides(resolvedUserConfig, designSystem)
registerScreensConfig(resolvedUserConfig, designSystem)

let pluginApi = buildPluginApi(designSystem, ast, resolvedConfig)
for (let { handler } of resolvedConfig.plugins) {
handler(pluginApi)
}

// If a prefix has already been set in CSS don't override it
if (!designSystem.theme.prefix && resolvedConfig.prefix) {
if (resolvedConfig.prefix.endsWith('-')) {
Expand Down