diff --git a/packages/next/build/webpack/loaders/next-font-loader/postcss-font-loader.ts b/packages/next/build/webpack/loaders/next-font-loader/postcss-font-loader.ts index 577fc98d4b17d6f..03c53fcf7e4eb4b 100644 --- a/packages/next/build/webpack/loaders/next-font-loader/postcss-font-loader.ts +++ b/packages/next/build/webpack/loaders/next-font-loader/postcss-font-loader.ts @@ -115,8 +115,8 @@ const postcssFontLoaderPlugn = ({ const isRange = (value: string) => value.trim().includes(' ') const formattedFontFamilies = [ formatFamily(fontFamily), - ...fallbackFonts, ...(adjustFontFallbackFamily ? [adjustFontFallbackFamily] : []), + ...fallbackFonts, ].join(', ') // Add class with family, weight and style const classRule = new postcss.Rule({ selector: '.className' }) diff --git a/test/e2e/next-font/app/pages/with-fallback.js b/test/e2e/next-font/app/pages/with-fallback.js index e944fb3807dc770..8a5e258266c5279 100644 --- a/test/e2e/next-font/app/pages/with-fallback.js +++ b/test/e2e/next-font/app/pages/with-fallback.js @@ -2,6 +2,7 @@ import { Open_Sans } from '@next/font/google' const openSans = Open_Sans({ fallback: ['system-ui', 'Arial'], variable: '--open-sans', + adjustFontFallback: false, }) export default function WithFonts() { diff --git a/test/e2e/next-font/index.test.ts b/test/e2e/next-font/index.test.ts index 2298bcb1334491d..746a0d938d61d4b 100644 --- a/test/e2e/next-font/index.test.ts +++ b/test/e2e/next-font/index.test.ts @@ -108,7 +108,7 @@ describe('@next/font/google', () => { className: expect.stringMatching(/__className_.{6}/), style: { fontFamily: expect.stringMatching( - /^'__myFont1_.{6}', system-ui, '__myFont1_Fallback_.{6}'$/ + /^'__myFont1_.{6}', '__myFont1_Fallback_.{6}', system-ui$/ ), fontStyle: 'italic', fontWeight: 100, @@ -275,27 +275,21 @@ describe('@next/font/google', () => { await browser.eval( 'getComputedStyle(document.querySelector("#with-fallback-fonts-classname")).fontFamily' ) - ).toMatch( - /^__Open_Sans_.{6}, system-ui, Arial, __Open_Sans_Fallback_.{6}$/ - ) + ).toMatch(/^__Open_Sans_.{6}, system-ui, Arial$/) // .style expect( await browser.eval( 'getComputedStyle(document.querySelector("#with-fallback-fonts-style")).fontFamily' ) - ).toMatch( - /^__Open_Sans_.{6}, system-ui, Arial, __Open_Sans_Fallback_.{6}$/ - ) + ).toMatch(/^__Open_Sans_.{6}, system-ui, Arial$/) // .variable expect( await browser.eval( 'getComputedStyle(document.querySelector("#with-fallback-fonts-variable")).fontFamily' ) - ).toMatch( - /^__Open_Sans_.{6}, system-ui, Arial, __Open_Sans_Fallback_.{6}$/ - ) + ).toMatch(/^__Open_Sans_.{6}, system-ui, Arial$/) }) })