diff --git a/packages/next/server/config.ts b/packages/next/server/config.ts index c852c647bfe0b9b..6da832ea2c33711 100644 --- a/packages/next/server/config.ts +++ b/packages/next/server/config.ts @@ -90,8 +90,6 @@ export function setHttpClientAndAgentOptions(config: NextConfig) { } async function setFontLoaderDefaults(config: NextConfigComplete, dir: string) { - if (config.experimental?.fontLoaders) return - // Add @next/font loaders by default if they're installed const hasNextFontDependency = ( await getDependencies({ @@ -114,14 +112,14 @@ async function setFontLoaderDefaults(config: NextConfigComplete, dir: string) { } if ( !config.experimental.fontLoaders.find( - ({ loader }: any) => loader === '@next/font/goggle' + ({ loader }: any) => loader === googleFontLoader.loader ) ) { config.experimental.fontLoaders.push(googleFontLoader) } if ( !config.experimental.fontLoaders.find( - ({ loader }: any) => loader === '@next/font/local' + ({ loader }: any) => loader === localFontLoader.loader ) ) { config.experimental.fontLoaders.push(localFontLoader) diff --git a/test/e2e/app-dir/next-font/next.config.js b/test/e2e/app-dir/next-font/next.config.js index cfa3ac3d7aa94b3..4b1e602f550ca55 100644 --- a/test/e2e/app-dir/next-font/next.config.js +++ b/test/e2e/app-dir/next-font/next.config.js @@ -1,5 +1,6 @@ module.exports = { experimental: { appDir: true, + fontLoaders: [], }, } diff --git a/test/e2e/next-font/basepath/next.config.js b/test/e2e/next-font/basepath/next.config.js index 21d892f2cd5a37c..1be9432475a2c83 100644 --- a/test/e2e/next-font/basepath/next.config.js +++ b/test/e2e/next-font/basepath/next.config.js @@ -3,8 +3,7 @@ module.exports = { experimental: { fontLoaders: [ { - loader: '@next/font/google', - options: { subsets: ['latin'] }, + loader: '@next/font/local', }, ], }, diff --git a/test/e2e/next-font/basepath/pages/index.js b/test/e2e/next-font/basepath/pages/index.js index 02056b6f303d313..3d0967e56b323de 100644 --- a/test/e2e/next-font/basepath/pages/index.js +++ b/test/e2e/next-font/basepath/pages/index.js @@ -1,5 +1,5 @@ import { Open_Sans } from '@next/font/google' -const openSans = Open_Sans() +const openSans = Open_Sans({ subsets: ['latin'] }) export default function Inter() { return

Hello world

diff --git a/test/e2e/next-font/with-font-declarations-file/next.config.js b/test/e2e/next-font/with-font-declarations-file/next.config.js index 6a94ea94ad86409..3f4a776b7f40985 100644 --- a/test/e2e/next-font/with-font-declarations-file/next.config.js +++ b/test/e2e/next-font/with-font-declarations-file/next.config.js @@ -5,9 +5,6 @@ module.exports = { loader: '@next/font/google', options: { subsets: ['latin'] }, }, - { - loader: '@next/font/local', - }, ], }, }