Unverified Commit bd9ad97c authored by Hannes Bornö's avatar Hannes Bornö Committed by GitHub

Fix next/font/google config not being used (#46484)

Make sure both `@next/font/google` and `next/font/google` works when setting subsets in `next.config.js`.

Fixes NEXT-668

## 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)
parent 36664910
...@@ -188,7 +188,9 @@ export const css = curry(async function css( ...@@ -188,7 +188,9 @@ export const css = curry(async function css(
) )
const googleLoaderOptions = const googleLoaderOptions =
ctx.experimental?.fontLoaders?.find( ctx.experimental?.fontLoaders?.find(
(loaderConfig) => loaderConfig.loader === '@next/font/google' (loaderConfig) =>
loaderConfig.loader === '@next/font/google' ||
loaderConfig.loader === 'next/font/google'
)?.options ?? {} )?.options ?? {}
const fontLoaders: Array<[string | RegExp, string, any?]> = [ const fontLoaders: Array<[string | RegExp, string, any?]> = [
[ [
......
...@@ -2,7 +2,7 @@ module.exports = { ...@@ -2,7 +2,7 @@ module.exports = {
experimental: { experimental: {
fontLoaders: [ fontLoaders: [
{ {
loader: '@next/font/google', loader: 'next/font/google',
options: { subsets: ['latin'] }, options: { subsets: ['latin'] },
}, },
], ],
......
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