terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Refactor head keys (#5326)

Browse source 
We don't need to `React.cloneElement`, twice.
This commit is contained in:
Henrik Wenz 2018-09-29 06:52:36 +02:00 committed by Tim Neutkens
parent df41997d50
commit b065dafa52
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/head.js
View file

@ -15,7 +15,9 @@ class Head extends React.Component {
const NEXT_HEAD_IDENTIFIER = 'next-head' const NEXT_HEAD_IDENTIFIER = 'next-head'
export function defaultHead (className = NEXT_HEAD_IDENTIFIER) { export function defaultHead (className = NEXT_HEAD_IDENTIFIER) {
return [<meta charSet='utf-8' className={className} />] return [
<meta key='charSet' charSet='utf-8' className={className} />
]
} }
function reduceComponents (components) { function reduceComponents (components) {
@ -33,9 +35,10 @@ function reduceComponents (components) {
.filter(Boolean) .filter(Boolean)
.filter(unique()) .filter(unique())
.reverse() .reverse()
.map((c) => { .map((c, i) => {
const className = (c.props && c.props.className ? c.props.className + ' ' : '') + NEXT_HEAD_IDENTIFIER const className = (c.props && c.props.className ? c.props.className + ' ' : '') + NEXT_HEAD_IDENTIFIER
return React.cloneElement(c, { className }) const key = c.key || i
return React.cloneElement(c, { key, className })
}) })
} }

2
server/document.js
View file

@ -116,7 +116,7 @@ export class Head extends Component {
} }
return <head {...this.props}> return <head {...this.props}>
{(head || []).map((h, i) => React.cloneElement(h, { key: h.key || i }))} {head}
{page !== '/_error' && <link rel='preload' href={`${assetPrefix}/_next/static/${buildId}/pages${pagePathname}`} as='script' nonce={this.props.nonce} />} {page !== '/_error' && <link rel='preload' href={`${assetPrefix}/_next/static/${buildId}/pages${pagePathname}`} as='script' nonce={this.props.nonce} />}
<link rel='preload' href={`${assetPrefix}/_next/static/${buildId}/pages/_app.js`} as='script' nonce={this.props.nonce} /> <link rel='preload' href={`${assetPrefix}/_next/static/${buildId}/pages/_app.js`} as='script' nonce={this.props.nonce} />
<link rel='preload' href={`${assetPrefix}/_next/static/${buildId}/pages/_error.js`} as='script' nonce={this.props.nonce} /> <link rel='preload' href={`${assetPrefix}/_next/static/${buildId}/pages/_error.js`} as='script' nonce={this.props.nonce} />