Skip to content

Migrate @media screen(…) #14603

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
RobinMalfait merged 6 commits into from
Oct 10, 2024
Merged

Migrate @media screen(…) #14603

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66a5a37
migrate `screen(…)`
RobinMalfait Oct 4, 2024
04b69b6
update changelog
RobinMalfait Oct 4, 2024
f8dd2ef
if we resolve to a string, use the `theme(…)` function
RobinMalfait Oct 7, 2024
4079c4c
update tests
RobinMalfait Oct 7, 2024
c60ab4d
alternative solution: `@custom-media`
RobinMalfait Oct 7, 2024
dc85269
Revert "alternative solution: `@custom-media`"
RobinMalfait Oct 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
Revert "alternative solution: @custom-media" 
This reverts commit a1113f8.

This is way too experimental and no browser implements this feature yet.
See: https://caniuse.com/?search=custom-media

We can use lightningcss that transpiles is properly, but in environments
such as the CDN we don't have access to lightningcss.
  • Loading branch information
@RobinMalfait
RobinMalfait committed Oct 10, 2024
commit dc8526940ca19e4994f073a8c49866a62eada8eb
9 changes: 3 additions & 6 deletions packages/@tailwindcss-upgrade/src/codemods/migrate-media-screen.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ it('should migrate a custom max-width screen', async () => {
},
),
).toMatchInlineSnapshot(`
"@custom-media --breakpoint-foo ((123px >= width));
@media (--breakpoint-foo) {
"@media (123px >= width) {
.foo {
color: red;
}
Expand All @@ -142,8 +141,7 @@ it('should migrate a custom min and max-width screen', async () => {
},
),
).toMatchInlineSnapshot(`
"@custom-media --breakpoint-foo ((123px >= width >= 100px));
@media (--breakpoint-foo) {
"@media (123px >= width >= 100px) {
.foo {
color: red;
}
Expand All @@ -170,8 +168,7 @@ it('should migrate a raw media query', async () => {
},
),
).toMatchInlineSnapshot(`
"@custom-media --breakpoint-foo (only screen and (min-width: 123px));
@media (--breakpoint-foo) {
"@media only screen and (min-width: 123px) {
.foo {
color: red;
}
Expand Down
13 changes: 2 additions & 11 deletions packages/@tailwindcss-upgrade/src/codemods/migrate-media-screen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AtRule, type Plugin, type Root } from 'postcss'
import { type Plugin, type Root } from 'postcss'
import type { Config } from 'tailwindcss'
import { resolveConfig } from '../../../tailwindcss/src/compat/config/resolve-config'
import { buildMediaQuery } from '../../../tailwindcss/src/compat/screens-config'
Expand All @@ -21,16 +21,7 @@ export function migrateMediaScreen({
let mediaQueries = new DefaultMap<string, string | null>((name) => {
let value = designSystem?.resolveThemeValue(`--breakpoint-${name}`) ?? screens?.[name]
if (typeof value === 'string') return `(width >= theme(--breakpoint-${name}))`

if (value) {
let query = buildMediaQuery(value)
root.prepend(
new AtRule({ name: 'custom-media', params: `--breakpoint-${name} (${query})` }),
)
return `(--breakpoint-${name})`
}

return null
return value ? buildMediaQuery(value) : null
})

root.walkAtRules((rule) => {
Expand Down