Skip to content

fix(fontless): skip non-optimial fonts by google provider #660

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(fontless): skip non-optimial fonts by google provider #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c51fc5c
feat(fontless): ability to remove google font for old browser
hi-ogawa Sep 28, 2025
0878084
refactor: tweak
hi-ogawa Sep 28, 2025
e4cade4
test: update
hi-ogawa Sep 28, 2025
281a685
Merge branch 'main' into 09-28-feat_fontless_ability_to_remove_google…
hi-ogawa Sep 30, 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
13 changes: 13 additions & 0 deletions packages/fontless/src/resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ export async function createResolver(context: ResolverContext): Promise<Resolver
if (override?.provider) {
if (override.provider in providers) {
const result = await unifont.resolveFont(fontFamily, defaults, [override.provider])
result.fonts = filterNonOptimalFonts(result.fonts)
// Rewrite font source URLs to be proxied/local URLs
const fonts = normalizeFontData(result?.fonts || [])
if (!fonts.length || !result) {
Expand All @@ -131,6 +132,7 @@ export async function createResolver(context: ResolverContext): Promise<Resolver

const result = await unifont.resolveFont(fontFamily, defaults, [...prioritisedProviders])
if (result) {
result.fonts = filterNonOptimalFonts(result.fonts)
// Rewrite font source URLs to be proxied/local URLs
const fonts = normalizeFontData(result.fonts)
if (fonts.length > 0) {
Expand All @@ -153,3 +155,14 @@ export async function createResolver(context: ResolverContext): Promise<Resolver
}
}
}

function filterNonOptimalFonts(fonts: FontFaceData[]) {
// google provider returns priority=0 and priority=1.
// this filters only priority=0 to avoid loading non-optimal fonts,
// which is for older browser without woff2 and variable font support.
const priorities = new Set(fonts.map(f => f.meta?.priority))
if (priorities.size > 1 && priorities.has(0)) {
fonts = fonts.filter(f => f.meta?.priority === 0)
}
return fonts
}
6 changes: 2 additions & 4 deletions packages/fontless/test/e2e.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ describe.each(fixtures)('e2e %s', (fixture) => {
}
if (fixture === 'tailwind') {
expect(content).toContain('--font-sans:"Geist", "Geist Fallback: Arial",sans-serif')
const woff = content.indexOf('format(woff)')
const woff2 = content.indexOf('format(woff2)')
expect(woff >= 0 && woff2 >= 0).toBe(true)
expect(woff).lessThan(woff2)
expect(content).toContain('format(woff2)')
expect(content).not.toContain('format(woff)')
}
}

Expand Down
Loading