Making optimizefonts backward compatible, work with either bool or ob…

…j config
vercel · Sep 15, 2022 · 4d55860 · 4d55860
1 parent cb2837f
commit 4d55860
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts b/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts
@@ -226,7 +226,7 @@ export class FontStylesheetGatheringPlugin {
           for (let promiseIndex in fontDefinitionPromises) {
             let css = await fontDefinitionPromises[promiseIndex]
 
-            if (this.optimizeFonts.experimentalAdjustFallbacks) {
+            if (this.optimizeFonts?.experimentalAdjustFallbacks) {
               css += getFontOverrideCss(fontStylesheets[promiseIndex], css)
             }
 

diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
@@ -420,7 +420,7 @@ export class Head extends Component<HeadProps> {
       )
     })
 
-    if (process.env.NODE_ENV !== 'development' && optimizeFonts.inlineFonts) {
+    if (process.env.NODE_ENV !== 'development' && optimizeFonts?.inlineFonts) {
       cssLinkElements = this.makeStylesheetInert(
         cssLinkElements
       ) as ReactElement[]
@@ -657,7 +657,7 @@ export class Head extends Component<HeadProps> {
 
     if (
       process.env.NODE_ENV !== 'development' &&
-      optimizeFonts.inlineFonts &&
+      optimizeFonts?.inlineFonts &&
       !(process.env.NEXT_RUNTIME !== 'edge' && inAmpMode)
     ) {
       children = this.makeStylesheetInert(children)
@@ -754,7 +754,7 @@ export class Head extends Component<HeadProps> {
         />
 
         {children}
-        {optimizeFonts.inlineFonts && <meta name="next-font-preconnect" />}
+        {optimizeFonts?.inlineFonts && <meta name="next-font-preconnect" />}
 
         {process.env.NEXT_RUNTIME !== 'edge' && inAmpMode && (
           <>

diff --git a/packages/next/shared/lib/html-context.ts b/packages/next/shared/lib/html-context.ts
@@ -1,6 +1,7 @@
 import type { BuildManifest } from '../../server/get-page-files'
 import type { ServerRuntime } from 'next/types'
 import type { NEXT_DATA } from './utils'
+import type { FontConfig } from '../../server/font-utils'
 
 import { createContext } from 'react'
 
@@ -36,7 +37,7 @@ export type HtmlProps = {
   head?: Array<JSX.Element | null>
   crossOrigin?: string
   optimizeCss?: any
-  optimizeFonts?: any
+  optimizeFonts?: FontConfig
   nextScriptWorkers?: boolean
   runtime?: ServerRuntime
   hasConcurrentFeatures?: boolean