Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 1 commit into from
Jun 25, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ||
Expand Down
24 changes: 24 additions & 0 deletions test/integration/font-optimization/fixtures/spread-operator-regression/pages/_document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions test/integration/font-optimization/fixtures/spread-operator-regression/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function Home() {
return <h1>Hello</h1>
}
6 changes: 6 additions & 0 deletions test/integration/font-optimization/test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
})