Unverified Commit 4b1c74a3 authored by Sam Poder's avatar Sam Poder Committed by GitHub

Fix support for `custom-media-queries` in LightningCSS (#95689)

Closes https://github.com/vercel/next.js/issues/95677. Added an e2e test
that roughly matches the original issue and tests that it works.
parent 0cfc85ce
...@@ -369,6 +369,14 @@ export async function LightningCssLoader( ...@@ -369,6 +369,14 @@ export async function LightningCssLoader(
: 0 : 0
const includeMask = (1 | userIncludeMask) & ~userExcludeMask // 1 = Features.Nesting const includeMask = (1 | userIncludeMask) & ~userExcludeMask // 1 = Features.Nesting
// `@custom-media` is draft syntax and behind a parser flag
// (`drafts.customMedia`).
//
// See: https://lightningcss.dev/transpilation.html#custom-media-queries
const customMediaMask = featureNamesToMask(['custom-media-queries'])
const drafts =
(includeMask & customMediaMask) !== 0 ? { customMedia: true } : undefined
try { try {
const { const {
code, code,
...@@ -392,6 +400,7 @@ export async function LightningCssLoader( ...@@ -392,6 +400,7 @@ export async function LightningCssLoader(
this.sourceMap && prevMap ? JSON.stringify(prevMap) : undefined, this.sourceMap && prevMap ? JSON.stringify(prevMap) : undefined,
include: includeMask, include: includeMask,
exclude: userExcludeMask, exclude: userExcludeMask,
drafts,
}) })
let cssCodeAsString = code.toString() let cssCodeAsString = code.toString()
......
@custom-media --narrow (max-width: 960px);
.box {
color: blue;
}
@media (--narrow) {
.box {
color: red;
}
}
import styles from './page.module.css'
export default function Page() {
return <div className={styles.box}>Custom media</div>
}
...@@ -52,6 +52,34 @@ describe('experimental-lightningcss-features', () => { ...@@ -52,6 +52,34 @@ describe('experimental-lightningcss-features', () => {
}) })
}) })
describe('custom-media-queries', () => {
const { next } = nextTestSetup({
files: __dirname,
dependencies: { lightningcss: '^1.23.0' },
packageJson: {
browserslist: ['chrome 123'],
},
nextConfig: {
experimental: {
useLightningcss: true,
lightningCssFeatures: {
include: ['custom-media-queries'],
},
},
},
})
it('should substitute @custom-media when custom-media-queries is included', async () => {
const html = await next.render('/custom-media')
expect(html).toContain('Custom media')
const css = await collectPageCss(next, '/custom-media')
expect(css).not.toContain('@custom-media')
expect(css).not.toContain('--narrow')
expect(css).toMatch(/max-width:\s*960px|width\s*<=\s*960px/)
})
})
describe('exclude', () => { describe('exclude', () => {
const { next } = nextTestSetup({ const { next } = nextTestSetup({
files: __dirname, files: __dirname,
......
...@@ -4,7 +4,9 @@ use anyhow::{Result, bail}; ...@@ -4,7 +4,9 @@ use anyhow::{Result, bail};
use async_trait::async_trait; use async_trait::async_trait;
use lightningcss::{ use lightningcss::{
css_modules::{CssModuleExport, Pattern, Segment}, css_modules::{CssModuleExport, Pattern, Segment},
stylesheet::{MinifyOptions, ParserOptions, PrinterOptions, StyleSheet, ToCssResult}, stylesheet::{
MinifyOptions, ParserFlags, ParserOptions, PrinterOptions, StyleSheet, ToCssResult,
},
targets::{BrowserslistConfig, Features, Targets}, targets::{BrowserslistConfig, Features, Targets},
traits::ToCss, traits::ToCss,
values::url::Url, values::url::Url,
...@@ -450,7 +452,19 @@ async fn process_content( ...@@ -450,7 +452,19 @@ async fn process_content(
} }
} }
// `@custom-media` is draft syntax and behind a parser flag.
//
// See: https://lightningcss.dev/transpilation.html#custom-media-queries
let mut flags = ParserFlags::empty();
let include_features = Features::from_bits_truncate(feature_flags.include)
& !Features::from_bits_truncate(feature_flags.exclude);
flags.set(
ParserFlags::CUSTOM_MEDIA,
include_features.contains(Features::CustomMediaQueries),
);
let config = ParserOptions { let config = ParserOptions {
flags,
css_modules: match ty { css_modules: match ty {
CssModuleType::Module => Some(lightningcss::css_modules::Config { CssModuleType::Module => Some(lightningcss::css_modules::Config {
pattern: Pattern { pattern: Pattern {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment