Commit 07a86572 authored by Shu Ding's avatar Shu Ding Committed by Jiachi Liu

Fix Turbopack local font `font-family` declaration (#85913)

This fixes #85912, as the logic of injecting the `font-family` property
should be mirrored from the Webpack implementation.
parent 2a1a6ce4
...@@ -62,11 +62,17 @@ pub(super) async fn build_font_face_definitions( ...@@ -62,11 +62,17 @@ pub(super) async fn build_font_face_definitions(
}; };
let query_str = qstring::QString::from(serde_json::to_string(&query)?.as_str()); let query_str = qstring::QString::from(serde_json::to_string(&query)?.as_str());
// Check if `font-family` is explicitly defined in `declarations`
let has_custom_font_family = options.declarations.as_ref().is_some_and(|declarations| {
declarations
.iter()
.any(|declaration| declaration.prop == "font-family")
});
definitions.push_str(&formatdoc!( definitions.push_str(&formatdoc!(
r#" r#"
@font-face {{ @font-face {{
{} {}{}
font-family: '{}';
src: url('@vercel/turbopack-next/internal/font/local/font?{}') format('{}'); src: url('@vercel/turbopack-next/internal/font/local/font?{}') format('{}');
font-display: {}; font-display: {};
{}{} {}{}
...@@ -79,7 +85,11 @@ pub(super) async fn build_font_face_definitions( ...@@ -79,7 +85,11 @@ pub(super) async fn build_font_face_definitions(
.map(|declaration| format!("{}: {};", declaration.prop, declaration.value)) .map(|declaration| format!("{}: {};", declaration.prop, declaration.value))
.join("\n") .join("\n")
), ),
scoped_font_family, if has_custom_font_family {
"".to_owned()
} else {
format!("\nfont-family: '{}';", scoped_font_family)
},
query_str, query_str,
ext_to_format(&font.ext)?, ext_to_format(&font.ext)?,
options.display, options.display,
...@@ -87,12 +97,12 @@ pub(super) async fn build_font_face_definitions( ...@@ -87,12 +97,12 @@ pub(super) async fn build_font_face_definitions(
.weight .weight
.as_ref() .as_ref()
.or(options.default_weight.as_ref()) .or(options.default_weight.as_ref())
.map_or_else(|| "".to_owned(), |w| format!("font-weight: {w};")), .map_or_else(|| "".to_owned(), |w| format!("\nfont-weight: {w};")),
&font &font
.style .style
.as_ref() .as_ref()
.or(options.default_style.as_ref()) .or(options.default_style.as_ref())
.map_or_else(|| "".to_owned(), |s| format!("font-style: {s};")), .map_or_else(|| "".to_owned(), |s| format!("\nfont-style: {s};")),
)); ));
} }
......
...@@ -13,6 +13,15 @@ const myFont2 = localFont({ ...@@ -13,6 +13,15 @@ const myFont2 = localFont({
preload: false, preload: false,
variable: '--my-font', variable: '--my-font',
}) })
const myFont1Override = localFont({
src: '../fonts/my-font.woff2',
declarations: [
{
prop: 'font-family',
value: 'foobar',
},
],
})
const roboto = localFont({ const roboto = localFont({
preload: false, preload: false,
...@@ -134,6 +143,9 @@ export default function WithFonts() { ...@@ -134,6 +143,9 @@ export default function WithFonts() {
<div id="second-local-font" className={myFont2.className}> <div id="second-local-font" className={myFont2.className}>
{JSON.stringify(myFont2)} {JSON.stringify(myFont2)}
</div> </div>
<div id="first-local-font-override" className={myFont1Override.className}>
{JSON.stringify(myFont1Override)}
</div>
<div id="roboto-local-font" className={roboto.className}> <div id="roboto-local-font" className={roboto.className}>
{JSON.stringify(roboto)} {JSON.stringify(roboto)}
</div> </div>
......
...@@ -650,20 +650,25 @@ describe('next/font', () => { ...@@ -650,20 +650,25 @@ describe('next/font', () => {
// Get all stylesheets // Get all stylesheets
const stylesheets = await browser.eval(` const stylesheets = await browser.eval(`
Array.from(document.styleSheets) Array.from(document.styleSheets)
.map(sheet => { .flatMap(sheet => {
try { try {
return Array.from(sheet.cssRules || sheet.rules || []) return Array.from(sheet.cssRules || sheet.rules || [])
.map(rule => rule.cssText) .map(rule => rule.cssText)
.join('\\n')
} catch (e) { } catch (e) {
return '' return ''
} }
}) })
.join('\\n')
`) `)
// Check that the custom declaration is included in the CSS // Check that the custom declaration is included in the CSS
expect(stylesheets).toContain('ascent-override: 90%') expect(stylesheets).toContainEqual(
expect.stringContaining('ascent-override: 90%;')
)
// Check that the custom declaration is included in the CSS and overrides the default family
expect(stylesheets).toContainEqual(
expect.stringContaining('font-family: foobar;')
)
}) })
}) })
}) })
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