Skip to content

Commit

Permalink
@next/font/google unknown font error (#44713)
Browse files Browse the repository at this point in the history
I messed up the unknown font error in
#44594. Restore the original
error.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have a helpful link attached, see
[`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ]
[e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have a helpful link attached, see
[`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm build && pnpm lint`
- [ ] The "examples guidelines" are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
  • Loading branch information
hanneslund authored Jan 9, 2023
1 parent 2d03237 commit cdfc484
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 3 additions & 3 deletions packages/font/src/google/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ export function validateData(

const fontFamily = functionName.replace(/_/g, ' ')
const fontFamilyData = (fontData as any)[fontFamily]
if (!fontFamilyData) {
nextFontError(`Unknown font \`${fontFamily}\``)
}

if (preload && !callSubsets && !config?.subsets) {
nextFontError(
Expand All @@ -63,9 +66,6 @@ export function validateData(
})

const fontWeights = fontFamilyData.weights
if (!fontWeights) {
nextFontError(`Unknown font \`${fontFamily}\``)
}
const fontStyles = fontFamilyData.styles

const weights = !weight
Expand Down
4 changes: 1 addition & 3 deletions test/unit/google-font-loader.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,7 @@ describe('@next/font/google loader', () => {
variableName: 'myFont',
})
).rejects.toThrowErrorMatchingInlineSnapshot(
process.version.startsWith('v14')
? `"Cannot read property 'subsets' of undefined"`
: `"Cannot read properties of undefined (reading 'subsets')"`
`"Unknown font \`Unknown Font\`"`
)
})

Expand Down

0 comments on commit cdfc484

Please sign in to comment.