Skip to content

Re-enable: Only expose used CSS variables #16676

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

Merged
philipp-spiess merged 8 commits into from
Feb 21, 2025
Merged

Re-enable: Only expose used CSS variables #16676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e443b08
Re-enable feature flag
philipp-spiess Feb 19, 2025
97a1fe6
Emit variables necessary for the styles when using `@reference "…"`
philipp-spiess Feb 19, 2025
38221ac
Remove empty `@layer theme` if no theme variables are emitted
philipp-spiess Feb 19, 2025
2e12f39
Only emits theme variables that are used outside of being defined by …
philipp-spiess Feb 19, 2025
2e4430f
Remove feature flag
philipp-spiess Feb 19, 2025
0dce342
Add change log
philipp-spiess Feb 19, 2025
2d4f37a
Merge branch 'main' into feat/cleanup-unused-vars-v2
philipp-spiess Feb 21, 2025
8d2c478
Update test
philipp-spiess Feb 21, 2025
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
Next Next commit
Re-enable feature flag
  • Loading branch information
@philipp-spiess
philipp-spiess committed Feb 20, 2025
commit e443b081a254d71d79b5e7157e05a6e6d75a40b4
383 changes: 0 additions & 383 deletions packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 2 additions & 10 deletions packages/@tailwindcss-postcss/src/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +330,7 @@ test('runs `Once` plugins in the right order', async () => {
)

expect(result.css.trim()).toMatchInlineSnapshot(`
":root, :host {
--color-red-500: red;
}

.custom-css {
".custom-css {
color: red;
}"
`)
Expand All @@ -347,11 +343,7 @@ test('runs `Once` plugins in the right order', async () => {
}"
`)
expect(after).toMatchInlineSnapshot(`
":root, :host {
--color-red-500: red;
}

.custom-css {
".custom-css {
color: red;
}"
`)
Expand Down
391 changes: 0 additions & 391 deletions packages/tailwindcss/src/__snapshots__/index.test.ts.snap
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 0 additions & 27 deletions packages/tailwindcss/src/__snapshots__/utilities.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

exports[`border-* 1`] = `
":root, :host {
--radius-none: 0px;
--radius-full: 9999px;
--radius-sm: .125rem;
--color-red-500: #ef4444;
}

Expand Down Expand Up @@ -127,9 +124,6 @@ exports[`border-* 1`] = `

exports[`border-b-* 1`] = `
":root, :host {
--radius-none: 0px;
--radius-full: 9999px;
--radius-sm: .125rem;
--color-red-500: #ef4444;
}

Expand Down Expand Up @@ -252,9 +246,6 @@ exports[`border-b-* 1`] = `

exports[`border-e-* 1`] = `
":root, :host {
--radius-none: 0px;
--radius-full: 9999px;
--radius-sm: .125rem;
--color-red-500: #ef4444;
}

Expand Down Expand Up @@ -377,9 +368,6 @@ exports[`border-e-* 1`] = `

exports[`border-l-* 1`] = `
":root, :host {
--radius-none: 0px;
--radius-full: 9999px;
--radius-sm: .125rem;
--color-red-500: #ef4444;
}

Expand Down Expand Up @@ -502,9 +490,6 @@ exports[`border-l-* 1`] = `

exports[`border-r-* 1`] = `
":root, :host {
--radius-none: 0px;
--radius-full: 9999px;
--radius-sm: .125rem;
--color-red-500: #ef4444;
}

Expand Down Expand Up @@ -627,9 +612,6 @@ exports[`border-r-* 1`] = `

exports[`border-s-* 1`] = `
":root, :host {
--radius-none: 0px;
--radius-full: 9999px;
--radius-sm: .125rem;
--color-red-500: #ef4444;
}

Expand Down Expand Up @@ -752,9 +734,6 @@ exports[`border-s-* 1`] = `

exports[`border-t-* 1`] = `
":root, :host {
--radius-none: 0px;
--radius-full: 9999px;
--radius-sm: .125rem;
--color-red-500: #ef4444;
}

Expand Down Expand Up @@ -877,9 +856,6 @@ exports[`border-t-* 1`] = `

exports[`border-x-* 1`] = `
":root, :host {
--radius-none: 0px;
--radius-full: 9999px;
--radius-sm: .125rem;
--color-red-500: #ef4444;
}

Expand Down Expand Up @@ -1002,9 +978,6 @@ exports[`border-x-* 1`] = `

exports[`border-y-* 1`] = `
":root, :host {
--radius-none: 0px;
--radius-full: 9999px;
--radius-sm: .125rem;
--color-red-500: #ef4444;
}

Expand Down
108 changes: 14 additions & 94 deletions packages/tailwindcss/src/compat/config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,7 @@ describe('theme callbacks', () => {

expect(compiler.build(['leading-base', 'leading-md', 'leading-xl', 'prose']))
.toMatchInlineSnapshot(`
":root, :host {
--text-base: 100rem;
--text-md--line-height: 101rem;
}
.prose {
".prose {
[class~=lead-base] {
font-size: 100rem;
line-height: 201rem;
Expand Down Expand Up @@ -562,12 +558,7 @@ describe('default font family compatibility', () => {
})

expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
":root, :host {
--default-font-family: Potato Sans;
--default-font-feature-settings: normal;
--default-font-variation-settings: normal;
}
.font-sans {
".font-sans {
font-family: Potato Sans;
}
"
Expand Down Expand Up @@ -601,12 +592,7 @@ describe('default font family compatibility', () => {
})

expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
":root, :host {
--default-font-family: Potato Sans;
--default-font-feature-settings: "cv06";
--default-font-variation-settings: normal;
}
.font-sans {
".font-sans {
font-family: Potato Sans;
font-feature-settings: "cv06";
}
Expand Down Expand Up @@ -641,12 +627,7 @@ describe('default font family compatibility', () => {
})

expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
":root, :host {
--default-font-family: Potato Sans;
--default-font-feature-settings: normal;
--default-font-variation-settings: "XHGT" 0.7;
}
.font-sans {
".font-sans {
font-family: Potato Sans;
font-variation-settings: "XHGT" 0.7;
}
Expand Down Expand Up @@ -684,12 +665,7 @@ describe('default font family compatibility', () => {
})

expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
":root, :host {
--default-font-family: Potato Sans;
--default-font-feature-settings: "cv06";
--default-font-variation-settings: "XHGT" 0.7;
}
.font-sans {
".font-sans {
font-family: Potato Sans;
font-feature-settings: "cv06";
font-variation-settings: "XHGT" 0.7;
Expand Down Expand Up @@ -729,9 +705,6 @@ describe('default font family compatibility', () => {

expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
":root, :host {
--default-font-family: var(--font-family-sans);
--default-font-feature-settings: var(--font-family-sans--font-feature-settings);
--default-font-variation-settings: var(--font-family-sans--font-variation-settings);
--font-sans: Sandwich Sans;
}
.font-sans {
Expand Down Expand Up @@ -768,12 +741,7 @@ describe('default font family compatibility', () => {
})

expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
":root, :host {
--default-font-family: Inter, system-ui, sans-serif;
--default-font-feature-settings: normal;
--default-font-variation-settings: normal;
}
.font-sans {
".font-sans {
font-family: Inter, system-ui, sans-serif;
}
"
Expand Down Expand Up @@ -806,14 +774,7 @@ describe('default font family compatibility', () => {
}),
})

expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
":root, :host {
--default-font-family: var(--font-family-sans);
--default-font-feature-settings: var(--font-family-sans--font-feature-settings);
--default-font-variation-settings: var(--font-family-sans--font-variation-settings);
}
"
`)
expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`""`)
})

test('overriding `fontFamily.mono` sets `--default-mono-font-family`', async () => {
Expand Down Expand Up @@ -841,12 +802,7 @@ describe('default font family compatibility', () => {
})

expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
":root, :host {
--default-mono-font-family: Potato Mono;
--default-mono-font-feature-settings: normal;
--default-mono-font-variation-settings: normal;
}
.font-mono {
".font-mono {
font-family: Potato Mono;
}
"
Expand Down Expand Up @@ -880,12 +836,7 @@ describe('default font family compatibility', () => {
})

expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
":root, :host {
--default-mono-font-family: Potato Mono;
--default-mono-font-feature-settings: "cv06";
--default-mono-font-variation-settings: normal;
}
.font-mono {
".font-mono {
font-family: Potato Mono;
font-feature-settings: "cv06";
}
Expand Down Expand Up @@ -920,12 +871,7 @@ describe('default font family compatibility', () => {
})

expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
":root, :host {
--default-mono-font-family: Potato Mono;
--default-mono-font-feature-settings: normal;
--default-mono-font-variation-settings: "XHGT" 0.7;
}
.font-mono {
".font-mono {
font-family: Potato Mono;
font-variation-settings: "XHGT" 0.7;
}
Expand Down Expand Up @@ -963,12 +909,7 @@ describe('default font family compatibility', () => {
})

expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
":root, :host {
--default-mono-font-family: Potato Mono;
--default-mono-font-feature-settings: "cv06";
--default-mono-font-variation-settings: "XHGT" 0.7;
}
.font-mono {
".font-mono {
font-family: Potato Mono;
font-feature-settings: "cv06";
font-variation-settings: "XHGT" 0.7;
Expand Down Expand Up @@ -1008,9 +949,6 @@ describe('default font family compatibility', () => {

expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
":root, :host {
--default-mono-font-family: var(--font-mono);
--default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
--default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
--font-mono: Sandwich Mono;
}
.font-mono {
Expand Down Expand Up @@ -1046,14 +984,7 @@ describe('default font family compatibility', () => {
}),
})

expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
":root, :host {
--default-mono-font-family: var(--font-family-mono);
--default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
--default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
}
"
`)
expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`""`)
})
})

Expand Down Expand Up @@ -1179,13 +1110,7 @@ test('merges css breakpoints with js config screens', async () => {

expect(compiler.build(['sm:flex', 'md:flex', 'lg:flex', 'min-sm:max-md:underline']))
.toMatchInlineSnapshot(`
":root, :host {
--breakpoint-md: 50rem;
--breakpoint-lg: 64rem;
--breakpoint-xl: 80rem;
--breakpoint-2xl: 96rem;
}
.sm\\:flex {
".sm\\:flex {
@media (width >= 44rem) {
display: flex;
}
Expand Down Expand Up @@ -1333,12 +1258,7 @@ test('Prefixes configured in CSS take precedence over those defined in JS config
)

expect(compiler.build(['wat:custom'])).toMatchInlineSnapshot(`
":root, :host {
--wat-color-red: #f00;
--wat-color-green: #0f0;
--wat-breakpoint-sm: 640px;
}
.wat\\:custom {
".wat\\:custom {
color: red;
}
"
Expand Down
Loading