Merge pull request #45 from daviddt/patch-1

mejincodes · web-flow · commit f4f1a273cea7 · 2018-08-01T10:29:21.000-07:00
Remove static markup from NodeStreamRenderer
diff --git a/src/server/ReactDOMNodeStreamRenderer.js b/src/server/ReactDOMNodeStreamRenderer.js
@@ -99,12 +99,7 @@ function originalRenderToNodeStream(element, cache, streamingStart, memLife=0) {
   return new ReactMarkupReadableStream(element, false, cache, streamingStart, memLife);
 }
 
-export function renderToNodeStream(element, cache, res) {
-
-  const htmlStart =
-  '<html><head><title>Page</title></head><body><div id="react-root">';
-
-  const htmlEnd = '</div></body></html>';
+export function renderToNodeStream(element, cache, res, htmlStart, htmlEnd, memLife) {
 
   const streamingStart = {
     sliceStartCount: htmlStart.length, 
@@ -114,7 +109,7 @@ export function renderToNodeStream(element, cache, res) {
     cacheStream.pipe(res);
     cacheStream.write(htmlStart);
 
-    const stream = originalRenderToNodeStream(element, cache, streamingStart);
+    const stream = originalRenderToNodeStream(element, cache, streamingStart, memLife);
     stream.pipe(cacheStream, { end: false });
     stream.on("end", () => {
       cacheStream.end(htmlEnd);
@@ -131,11 +126,7 @@ function originalRenderToStaticNodeStream(element, cache, streamingStart, memLif
   return new ReactMarkupReadableStream(element, true, cache, streamingStart, memLife);
 }
 
-export function renderToStaticNodeStream(element, cache, res) {
-  const htmlStart =
-  '<html><head><title>Page</title></head><body><div id="react-root">';
-
-  const htmlEnd = '</div></body></html>';
+export function renderToStaticNodeStream(element, cache, res, htmlStart, htmlEnd, memLife) {
 
   const streamingStart = {
     sliceStartCount: htmlStart.length, 
@@ -145,7 +136,7 @@ export function renderToStaticNodeStream(element, cache, res) {
     cacheStream.pipe(res);
     cacheStream.write(htmlStart);
 
-    const stream = originalRenderToStaticNodeStream(element, cache, streamingStart);
+    const stream = originalRenderToStaticNodeStream(element, cache, streamingStart, memLife);
     stream.pipe(cacheStream, { end: false });
     stream.on("end", () => {
       cacheStream.end(htmlEnd);
