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

Move __NEXT_DATA__ into an application/json script tag (#5584)

Browse source 
* Move __NEXT_DATA__ into a application/json script tag

As outlined by @dav-is here https://github.com/zeit/next.js/pull/4943

* Set __NEXT_DATA__ for backwards compatability
This commit is contained in:
Tim Neutkens 2018-11-03 19:49:09 +01:00 committed by GitHub
parent 1aa965226e
commit b65c464d60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
packages/next/client/index.js
View file

@ -19,18 +19,19 @@ if (!window.Promise) {
window.Promise = Promise window.Promise = Promise
} }
const data = JSON.parse(document.getElementById('__NEXT_DATA__').textContent)
window.__NEXT_DATA__ = data
const { const {
__NEXT_DATA__: { props,
props, err,
err, page,
page, query,
query, buildId,
buildId, assetPrefix,
assetPrefix, runtimeConfig,
runtimeConfig, dynamicIds
dynamicIds } = data
}
} = window
const prefix = assetPrefix || '' const prefix = assetPrefix || ''

5
packages/next/pages/_document.js
View file

@ -186,8 +186,7 @@ export class NextScript extends Component {
static getInlineScriptSource (documentProps) { static getInlineScriptSource (documentProps) {
const { __NEXT_DATA__ } = documentProps const { __NEXT_DATA__ } = documentProps
const { page } = __NEXT_DATA__ return htmlescape(__NEXT_DATA__)
return `__NEXT_DATA__ = ${htmlescape(__NEXT_DATA__)};`
} }
render () { render () {
@ -197,7 +196,7 @@ export class NextScript extends Component {
return <Fragment> return <Fragment>
{devFiles ? devFiles.map((file) => <script key={file} src={`${assetPrefix}/_next/${file}`} nonce={this.props.nonce} />) : null} {devFiles ? devFiles.map((file) => <script key={file} src={`${assetPrefix}/_next/${file}`} nonce={this.props.nonce} />) : null}
{staticMarkup ? null : <script nonce={this.props.nonce} dangerouslySetInnerHTML={{ {staticMarkup ? null : <script id="__NEXT_DATA__" type="application/json" nonce={this.props.nonce} dangerouslySetInnerHTML={{
__html: NextScript.getInlineScriptSource(this.context._documentProps) __html: NextScript.getInlineScriptSource(this.context._documentProps)
}} />} }} />}
{page !== '/_error' && <script async id={`__NEXT_PAGE__${page}`} src={`${assetPrefix}/_next/static/${buildId}/pages${pagePathname}`} nonce={this.props.nonce} />} {page !== '/_error' && <script async id={`__NEXT_PAGE__${page}`} src={`${assetPrefix}/_next/static/${buildId}/pages${pagePathname}`} nonce={this.props.nonce} />}