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 nextdata into nextScript and make Main return a single el (#831)

Browse source
This commit is contained in:
alex newman 2017-01-20 00:14:05 +00:00 committed by Arunoda Susiripala
parent 5be9c04007
commit c21531151f
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/document.js
View file

@ -69,13 +69,8 @@ export class Main extends Component {
} }
render () { render () {
const { html, __NEXT_DATA__, staticMarkup } = this.context._documentProps const { html } = this.context._documentProps
return <div> return <div id='__next' dangerouslySetInnerHTML={{ __html: html }} />
<div id='__next' dangerouslySetInnerHTML={{ __html: html }} />
{staticMarkup ? null : <script dangerouslySetInnerHTML={{
__html: `__NEXT_DATA__ = ${htmlescape(__NEXT_DATA__)}; module={};`
}} />}
</div>
} }
} }
@ -89,6 +84,9 @@ export class NextScript extends Component {
let { buildId } = __NEXT_DATA__ let { buildId } = __NEXT_DATA__
return <div> return <div>
{staticMarkup ? null : <script dangerouslySetInnerHTML={{
__html: `__NEXT_DATA__ = ${htmlescape(__NEXT_DATA__)}; module={};`
}} />}
{ staticMarkup ? null : <script type='text/javascript' src={`/_next/${buildId}/commons.js`} /> } { staticMarkup ? null : <script type='text/javascript' src={`/_next/${buildId}/commons.js`} /> }
{ staticMarkup ? null : <script type='text/javascript' src={`/_next/${buildId}/main.js`} /> } { staticMarkup ? null : <script type='text/javascript' src={`/_next/${buildId}/main.js`} /> }
</div> </div>