Unverified Commit 745b1b59 authored by Sam Ko's avatar Sam Ko Committed by GitHub

fix(next-font): update capsize css so fallbacks are updated with the … (#62309)

## Description
We need to manually update the `@capsizecss/metrics` every time it
updates so we get the latest fallback fonts.

## Changes
- https://github.com/vercel/next.js/issues/47115

Closes NEXT-2547
parent 9feaffaf
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
"@babel/runtime": "7.22.5", "@babel/runtime": "7.22.5",
"@babel/traverse": "7.22.5", "@babel/traverse": "7.22.5",
"@babel/types": "7.22.5", "@babel/types": "7.22.5",
"@capsizecss/metrics": "1.1.0", "@capsizecss/metrics": "2.0.0",
"@edge-runtime/cookies": "4.0.2", "@edge-runtime/cookies": "4.0.2",
"@edge-runtime/ponyfill": "2.4.1", "@edge-runtime/ponyfill": "2.4.1",
"@edge-runtime/primitives": "4.0.2", "@edge-runtime/primitives": "4.0.2",
......
This diff is collapsed.
...@@ -2387,11 +2387,6 @@ export async function server(task, opts) { ...@@ -2387,11 +2387,6 @@ export async function server(task, opts) {
.source('src/server/**/!(*.test).+(js|ts|tsx)') .source('src/server/**/!(*.test).+(js|ts|tsx)')
.swc('server', { dev: opts.dev }) .swc('server', { dev: opts.dev })
.target('dist/server') .target('dist/server')
await fs.copyFile(
join(__dirname, 'src/server/google-font-metrics.json'),
join(__dirname, 'dist/server/google-font-metrics.json')
)
} }
export async function server_esm(task, opts) { export async function server_esm(task, opts) {
......
...@@ -906,8 +906,8 @@ importers: ...@@ -906,8 +906,8 @@ importers:
specifier: 7.22.5 specifier: 7.22.5
version: 7.22.5 version: 7.22.5
'@capsizecss/metrics': '@capsizecss/metrics':
specifier: 1.1.0 specifier: 2.0.0
version: 1.1.0 version: 2.0.0
'@edge-runtime/cookies': '@edge-runtime/cookies':
specifier: 4.0.2 specifier: 4.0.2
version: 4.0.2 version: 4.0.2
...@@ -3399,8 +3399,8 @@ packages: ...@@ -3399,8 +3399,8 @@ packages:
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
dev: true dev: true
/@capsizecss/metrics@1.1.0: /@capsizecss/metrics@2.0.0:
resolution: {integrity: sha512-HnnFHi/WXkvwueKEaQbBVsBSFcBG8xoumbHlI4+tIMUv7oqmtqDsrm48cHREFl1MfFuowNP96AJVHj17JH+VyA==} resolution: {integrity: sha512-tbYOyIXIMqWZJ2mw2JXvpQiecgTpvioBmduzUEJ+55xGbJz4AtlcatiuNI/rVYiOLLLvGuOOxpkuaY8qAxN63g==}
dev: true dev: true
/@csstools/postcss-color-function@1.1.0(postcss@8.4.31): /@csstools/postcss-color-function@1.1.0(postcss@8.4.31):
......
...@@ -38,12 +38,12 @@ describe('next/font/google fetch error', () => { ...@@ -38,12 +38,12 @@ describe('next/font/google fetch error', () => {
const ascentOverride = await browser.eval( const ascentOverride = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Inter_Fallback")).ascentOverride' 'Array.from(document.fonts.values()).find(font => font.family.includes("Inter_Fallback")).ascentOverride'
) )
expect(ascentOverride).toBe('90.2%') expect(ascentOverride).toBe('90%')
const descentOverride = await browser.eval( const descentOverride = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Inter_Fallback")).descentOverride' 'Array.from(document.fonts.values()).find(font => font.family.includes("Inter_Fallback")).descentOverride'
) )
expect(descentOverride).toBe('22.48%') expect(descentOverride).toBe('22.43%')
const lineGapOverride = await browser.eval( const lineGapOverride = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Inter_Fallback")).lineGapOverride' 'Array.from(document.fonts.values()).find(font => font.family.includes("Inter_Fallback")).lineGapOverride'
...@@ -53,7 +53,7 @@ describe('next/font/google fetch error', () => { ...@@ -53,7 +53,7 @@ describe('next/font/google fetch error', () => {
const sizeAdjust = await browser.eval( const sizeAdjust = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Inter_Fallback")).sizeAdjust' 'Array.from(document.fonts.values()).find(font => font.family.includes("Inter_Fallback")).sizeAdjust'
) )
expect(sizeAdjust).toBe('107.4%') expect(sizeAdjust).toBe('107.64%')
expect(next.cliOutput.slice(outputIndex)).toInclude( expect(next.cliOutput.slice(outputIndex)).toInclude(
'Failed to download `Inter` from Google Fonts. Using fallback font instead.' 'Failed to download `Inter` from Google Fonts. Using fallback font instead.'
......
...@@ -608,12 +608,12 @@ describe('next/font', () => { ...@@ -608,12 +608,12 @@ describe('next/font', () => {
const ascentOverride = await browser.eval( const ascentOverride = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Indie_Flower_Fallback")).ascentOverride' 'Array.from(document.fonts.values()).find(font => font.family.includes("Indie_Flower_Fallback")).ascentOverride'
) )
expect(ascentOverride).toBe('101.1%') expect(ascentOverride).toBe('108.04%')
const descentOverride = await browser.eval( const descentOverride = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Indie_Flower_Fallback")).descentOverride' 'Array.from(document.fonts.values()).find(font => font.family.includes("Indie_Flower_Fallback")).descentOverride'
) )
expect(descentOverride).toBe('50.85%') expect(descentOverride).toBe('54.35%')
const lineGapOverride = await browser.eval( const lineGapOverride = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Indie_Flower_Fallback")).lineGapOverride' 'Array.from(document.fonts.values()).find(font => font.family.includes("Indie_Flower_Fallback")).lineGapOverride'
...@@ -623,7 +623,7 @@ describe('next/font', () => { ...@@ -623,7 +623,7 @@ describe('next/font', () => {
const sizeAdjust = await browser.eval( const sizeAdjust = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Indie_Flower_Fallback")).sizeAdjust' 'Array.from(document.fonts.values()).find(font => font.family.includes("Indie_Flower_Fallback")).sizeAdjust'
) )
expect(sizeAdjust).toBe('96.02%') expect(sizeAdjust).toBe('89.85%')
}) })
test('Fraunces', async () => { test('Fraunces', async () => {
...@@ -632,12 +632,12 @@ describe('next/font', () => { ...@@ -632,12 +632,12 @@ describe('next/font', () => {
const ascentOverride = await browser.eval( const ascentOverride = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Fraunces_Fallback")).ascentOverride' 'Array.from(document.fonts.values()).find(font => font.family.includes("Fraunces_Fallback")).ascentOverride'
) )
expect(ascentOverride).toBe('84.29%') expect(ascentOverride).toBe('82.85%')
const descentOverride = await browser.eval( const descentOverride = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Fraunces_Fallback")).descentOverride' 'Array.from(document.fonts.values()).find(font => font.family.includes("Fraunces_Fallback")).descentOverride'
) )
expect(descentOverride).toBe('21.98%') expect(descentOverride).toBe('21.6%')
const lineGapOverride = await browser.eval( const lineGapOverride = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Fraunces_Fallback")).lineGapOverride' 'Array.from(document.fonts.values()).find(font => font.family.includes("Fraunces_Fallback")).lineGapOverride'
...@@ -647,7 +647,7 @@ describe('next/font', () => { ...@@ -647,7 +647,7 @@ describe('next/font', () => {
const sizeAdjust = await browser.eval( const sizeAdjust = await browser.eval(
'Array.from(document.fonts.values()).find(font => font.family.includes("Fraunces_Fallback")).sizeAdjust' 'Array.from(document.fonts.values()).find(font => font.family.includes("Fraunces_Fallback")).sizeAdjust'
) )
expect(sizeAdjust).toBe('116.03%') expect(sizeAdjust).toBe('118.05%')
}) })
}) })
}) })
......
...@@ -330,14 +330,14 @@ describe('Font Optimization', () => { ...@@ -330,14 +330,14 @@ describe('Font Optimization', () => {
) )
expect(inlineStyle.length).toBe(1) expect(inlineStyle.length).toBe(1)
expect(inlineStyle.html()).toContain( expect(inlineStyle.html()).toContain(
'@font-face{font-family:"Roboto Fallback";ascent-override:92.67%;descent-override:24.39%;line-gap-override:0.00%;size-adjust:100.11%;src:local("Arial")}' '@font-face{font-family:"Roboto Fallback";ascent-override:91.92%;descent-override:24.19%;line-gap-override:0.00%;size-adjust:100.92%;src:local("Arial")}'
) )
expect(inlineStyleMultiple.length).toBe(1) expect(inlineStyleMultiple.length).toBe(1)
expect(inlineStyleMultiple.html()).toContain( expect(inlineStyleMultiple.html()).toContain(
'@font-face{font-family:"Libre Baskerville Fallback";ascent-override:75.76%;descent-override:21.09%;line-gap-override:0.00%;size-adjust:128.03%;src:local("Times New Roman")}' '@font-face{font-family:"Libre Baskerville Fallback";ascent-override:75.41%;descent-override:20.99%;line-gap-override:0.00%;size-adjust:128.63%;src:local("Times New Roman")}'
) )
expect(inlineStyleMultiple.html()).toContain( expect(inlineStyleMultiple.html()).toContain(
'@font-face{font-family:"Open Sans Fallback";ascent-override:101.18%;descent-override:27.73%;line-gap-override:0.00%;size-adjust:105.64%;src:local("Arial")}' '@font-face{font-family:"Open Sans Fallback";ascent-override:100.49%;descent-override:27.55%;line-gap-override:0.00%;size-adjust:106.36%;src:local("Arial")}'
) )
}) })
} }
......
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