Move nextdata into nextScript and make Main return a single el (#831)

vercel · Jan 20, 2017 · c215311 · c215311
1 parent 5be9c04
commit c215311
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/server/document.js b/server/document.js
@@ -69,13 +69,8 @@ export class Main extends Component {
   }
 
   render () {
-    const { html, __NEXT_DATA__, staticMarkup } = this.context._documentProps
-    return <div>
-      <div id='__next' dangerouslySetInnerHTML={{ __html: html }} />
-      {staticMarkup ? null : <script dangerouslySetInnerHTML={{
-        __html: `__NEXT_DATA__ = ${htmlescape(__NEXT_DATA__)}; module={};`
-      }} />}
-    </div>
+    const { html } = this.context._documentProps
+    return <div id='__next' dangerouslySetInnerHTML={{ __html: html }} />
   }
 }
 
@@ -89,6 +84,9 @@ export class NextScript extends Component {
     let { buildId } = __NEXT_DATA__
 
     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}/main.js`} /> }
     </div>