From c21531151f1578ede3699f3565e55553261bd92f Mon Sep 17 00:00:00 2001
From: alex newman <alexnewmannn@gmail.com>
Date: Fri, 20 Jan 2017 00:14:05 +0000
Subject: [PATCH] Move nextdata into nextScript and make Main return a single
 el (#831)

---
 server/document.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/server/document.js b/server/document.js
index ed970b2e6cecb..42f13b430154c 100644
--- 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>