Skip to content

fix(fonts): fallback src override #13742

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
merged 2 commits into from
May 6, 2025
Merged

fix(fonts): fallback src override #13742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84468e9
fix(fonts): fallback src override
florian-lefebvre May 2, 2025
27b1e66
Update font-metrics-resolver.ts
florian-lefebvre May 2, 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
6 changes: 6 additions & 0 deletions .changeset/lemon-monkeys-peel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'astro': patch
---

Fixes optimized fallback css generation to properly add a `src` when using the experimental fonts API

2 changes: 1 addition & 1 deletion packages/astro/src/assets/fonts/implementations/font-metrics-resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ export function createCapsizeFontMetricsResolver({
const lineGapOverride = metrics.lineGap / adjustedEmSquare;

return cssRenderer.generateFontFace(fallbackName, {
...properties,
src: renderFontSrc([{ name: fallbackFontName }]),
'size-adjust': toPercentage(sizeAdjust),
'ascent-override': toPercentage(ascentOverride),
'descent-override': toPercentage(descentOverride),
'line-gap-override': toPercentage(lineGapOverride),
...properties,
});
},
};
Expand Down
42 changes: 40 additions & 2 deletions packages/astro/test/units/assets/fonts/implementations.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import { createDataCollector } from '../../../../dist/assets/fonts/implementatio
import { createAstroErrorHandler } from '../../../../dist/assets/fonts/implementations/error-handler.js';
import { createCachedFontFetcher } from '../../../../dist/assets/fonts/implementations/font-fetcher.js';
import { createFontTypeExtractor } from '../../../../dist/assets/fonts/implementations/font-type-extractor.js';
import { createCapsizeFontMetricsResolver } from '../../../../dist/assets/fonts/implementations/font-metrics-resolver.js';
import { createMinifiableCssRenderer } from '../../../../dist/assets/fonts/implementations/css-renderer.js';
import { createSpyStorage, simpleErrorHandler } from './utils.js';

describe('fonts implementations', () => {
Expand Down Expand Up @@ -269,8 +271,44 @@ describe('fonts implementations', () => {
});
});

// TODO: find a good way to test this
// describe('createCapsizeFontMetricsResolver()', () => {});
describe('createCapsizeFontMetricsResolver()', () => {
describe('generateFontFace()', () => {
it('returns a src', () => {
const fontMetricsResolver = createCapsizeFontMetricsResolver({
cssRenderer: createMinifiableCssRenderer({ minify: true }),
fontFetcher: {
async fetch() {
return Buffer.from('');
},
},
});

const css = fontMetricsResolver.generateFontFace({
name: 'Roboto-xxx fallback: Arial',
font: 'Arial',
metrics: {
ascent: 1,
descent: 1,
lineGap: 1,
unitsPerEm: 1,
xWidthAvg: 1,
},
fallbackMetrics: {
ascent: 1,
descent: 1,
lineGap: 1,
unitsPerEm: 1,
xWidthAvg: 1,
},
properties: {
src: undefined
}
});

assert.equal(css.includes('src:local("Arial")'), true)
});
});
});

it('createFontTypeExtractor()', () => {
/** @type {Array<[string, false | string]>} */
Expand Down