Add check for ObjectExpression when iterating on <link> tags for font optimization

timneutkens · timneutkens · commit b384ceaeb1e3 · 2021-06-25T15:32:50.000+02:00
Fixes #26547
diff --git a/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts b/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts
@@ -89,19 +89,27 @@ export class FontStylesheetGatheringPlugin {
             }
 
             // node.arguments[0] is the name of the tag and [1] are the props.
-            const propsNode = node.arguments[1] as namedTypes.ObjectExpression
+            const arg1 = node.arguments[1]
+
+            const propsNode =
+              arg1.type === 'ObjectExpression'
+                ? (arg1 as namedTypes.ObjectExpression)
+                : undefined
             const props: { [key: string]: string } = {}
-            propsNode.properties.forEach((prop) => {
-              if (prop.type !== 'Property') {
-                return
-              }
-              if (
-                prop.key.type === 'Identifier' &&
-                prop.value.type === 'Literal'
-              ) {
-                props[prop.key.name] = prop.value.value as string
-              }
-            })
+            if (propsNode) {
+              propsNode.properties.forEach((prop) => {
+                if (prop.type !== 'Property') {
+                  return
+                }
+                if (
+                  prop.key.type === 'Identifier' &&
+                  prop.value.type === 'Literal'
+                ) {
+                  props[prop.key.name] = prop.value.value as string
+                }
+              })
+            }
+
             if (
               !props.rel ||
               props.rel !== 'stylesheet' ||
diff --git a/test/integration/font-optimization/fixtures/spread-operator-regression/pages/_document.js b/test/integration/font-optimization/fixtures/spread-operator-regression/pages/_document.js
@@ -0,0 +1,24 @@
+import Document, { Html, Head, Main, NextScript } from 'next/document'
+
+class MyDocument extends Document {
+  static async getInitialProps(ctx) {
+    const initialProps = await Document.getInitialProps(ctx)
+    return { ...initialProps }
+  }
+
+  render() {
+    const things = { className: 'test' }
+    return (
+      <Html>
+        <Head />
+        <link {...things} />
+        <body>
+          <Main />
+          <NextScript />
+        </body>
+      </Html>
+    )
+  }
+}
+
+export default MyDocument
diff --git a/test/integration/font-optimization/fixtures/spread-operator-regression/pages/index.js b/test/integration/font-optimization/fixtures/spread-operator-regression/pages/index.js
@@ -0,0 +1,3 @@
+export default function Home() {
+  return <h1>Hello</h1>
+}
diff --git a/test/integration/font-optimization/test/index.test.js b/test/integration/font-optimization/test/index.test.js
@@ -328,4 +328,10 @@ describe('Font Optimization', () => {
       })
     }
   )
+
+  test('Spread operator regression on <link>', async () => {
+    const appDir = join(fixturesDir, 'spread-operator-regression')
+    const { code } = await nextBuild(appDir)
+    expect(code).toBe(0)
+  })
 })

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default function Home() {`
	`2`	`+ return <h1>Hello</h1>`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -328,4 +328,10 @@ describe('Font Optimization', () => {`
`328`	`328`	`})`
`329`	`329`	`}`
`330`	`330`	`)`
	`331`	`+`
	`332`	`+ test('Spread operator regression on <link>', async () => {`
	`333`	`+ const appDir = join(fixturesDir, 'spread-operator-regression')`
	`334`	`+ const { code } = await nextBuild(appDir)`
	`335`	`+ expect(code).toBe(0)`
	`336`	`+ })`
`331`	`337`	`})`