1c81480168
<!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change --> ### What? Adding support for supporting a custom fontFamily name when using next/font ### Why? By default, next/font hashes the font name when generating css to achieve proper scoping. However, that makes it impossible to use next/font with 3rd party libraries that provide CSS with pre-defined font names. ### How? To solve this, I've added a new argument to the next/font function call – `usedFontFamilyName`. It allows developers to pick the fontFamily name that is going to be used in the CSS output instead of the default one and make it work with vendor CSS files. ``` import { Inter } from "next/font/google"; const inter = Inter({ subsets: ["latin"], fixedFontFamily: "Inter", }); ``` Fixes [#43452](https://github.com/vercel/next.js/discussions/43452) --- Edit: I've changed the implementation to use `disabledFontFamilyHashing` boolean flag which removes the hashing but keeps the original font family name instead of allowing a custom name --------- Co-authored-by: JJ Kasper <jj@jjsweb.site> Co-authored-by: Zack Tanner <1939140+ztanner@users.noreply.github.com>
70 lines
2.2 KiB
TypeScript
70 lines
2.2 KiB
TypeScript
import { createNext, FileRef } from 'e2e-utils'
|
|
import { NextInstance } from 'e2e-utils'
|
|
import { join } from 'path'
|
|
import webdriver from 'next-webdriver'
|
|
|
|
const mockedGoogleFontResponses = require.resolve(
|
|
'./google-font-mocked-responses.js'
|
|
)
|
|
|
|
describe('next/font/google fetch error', () => {
|
|
const isDev = (global as any).isNextDev
|
|
let next: NextInstance
|
|
|
|
if ((global as any).isNextDeploy) {
|
|
it('should skip next deploy for now', () => {})
|
|
return
|
|
}
|
|
|
|
beforeAll(async () => {
|
|
next = await createNext({
|
|
files: {
|
|
pages: new FileRef(join(__dirname, 'google-fetch-error/pages')),
|
|
},
|
|
env: {
|
|
NEXT_FONT_GOOGLE_MOCKED_RESPONSES: mockedGoogleFontResponses,
|
|
},
|
|
skipStart: true,
|
|
})
|
|
})
|
|
afterAll(() => next.destroy())
|
|
|
|
if (isDev) {
|
|
it('should use a fallback font in dev', async () => {
|
|
await next.start()
|
|
const outputIndex = next.cliOutput.length
|
|
const browser = await webdriver(next.url, '/')
|
|
|
|
const ascentOverride = await browser.eval(
|
|
'Array.from(document.fonts.values()).find(font => font.family.includes("Inter Fallback")).ascentOverride'
|
|
)
|
|
expect(ascentOverride).toBe('90.49%')
|
|
|
|
const descentOverride = await browser.eval(
|
|
'Array.from(document.fonts.values()).find(font => font.family.includes("Inter Fallback")).descentOverride'
|
|
)
|
|
expect(descentOverride).toBe('22.56%')
|
|
|
|
const lineGapOverride = await browser.eval(
|
|
'Array.from(document.fonts.values()).find(font => font.family.includes("Inter Fallback")).lineGapOverride'
|
|
)
|
|
expect(lineGapOverride).toBe('0%')
|
|
|
|
const sizeAdjust = await browser.eval(
|
|
'Array.from(document.fonts.values()).find(font => font.family.includes("Inter Fallback")).sizeAdjust'
|
|
)
|
|
expect(sizeAdjust).toBe('107.06%')
|
|
|
|
expect(next.cliOutput.slice(outputIndex)).toInclude(
|
|
'Failed to download `Inter` from Google Fonts. Using fallback font instead.'
|
|
)
|
|
})
|
|
} else {
|
|
it('should error when not in dev', async () => {
|
|
await expect(next.start()).rejects.toThrow('next build failed')
|
|
expect(next.cliOutput).toInclude(
|
|
'Failed to fetch `Inter` from Google Fonts.'
|
|
)
|
|
})
|
|
}
|
|
})
|