moved cacheStream and renderToNodeStream logic out from index.js to modifiedReact file

kodakyellow · kodakyellow · commit 2f41c7dbbfac · 2018-03-19T16:28:01.000-07:00
diff --git a/SSRtest/ModifiedReact.js b/SSRtest/ModifiedReact.js
@@ -2713,7 +2713,7 @@ var ReactMarkupReadableStream = function (_Readable) {
  */
 
 
-function renderToNodeStream(element, cache, streamingStart, memLife=0) {
+function originalRenderToNodeStream(element, cache, streamingStart, memLife=0) {
       return new ReactMarkupReadableStream(
         element,
         false,
@@ -2806,15 +2806,37 @@ class ComponentCache {
   }
 
 }  
-  
+
+function renderToNodeStream(compo, cache, res){
+
+  const htmlStart =
+  '<html><head><title>Page</title></head><body><div id="react-root">';
+
+  const htmlEnd = "</div></body></html>";
+
+  const streamingStart = {
+    sliceStartCount: htmlStart.length, 
+  }
+
+  const cacheStream = createCacheStream(cache, streamingStart);
+    cacheStream.pipe(res);
+    cacheStream.write(htmlStart);
+
+    const stream = originalRenderToNodeStream(compo, cache, streamingStart);
+    stream.pipe(cacheStream, { end: false });
+    stream.on("end", () => {
+      cacheStream.end(htmlEnd);
+    });
+
+}
 // Note: when changing this, also consider https://github.com/facebook/react/issues/11526
 var ReactDOMServerNode = {
   renderToString: renderToString,
   renderToStaticMarkup: renderToStaticMarkup,
   renderToNodeStream: renderToNodeStream,
   renderToStaticNodeStream: renderToStaticNodeStream,
   ComponentCache: ComponentCache,
-  createCacheStream: createCacheStream,
+  // createCacheStream: createCacheStream,
   version: ReactVersion
 };
 
diff --git a/SSRtest/src/server/index.js b/SSRtest/src/server/index.js
@@ -16,31 +16,33 @@ const cache = new ReactCC.ComponentCache();
 
 // Force NodeStream
 
-const htmlStart =
-  '<html><head><title>Page</title></head><body><div id="react-root">';
-const htmlEnd = "</div></body></html>";
+// const htmlStart =
+//   '<html><head><title>Page</title></head><body><div id="react-root">';
+// const htmlEnd = "</div></body></html>";
 
 
-const streamingStart = {
-  sliceStartCount: htmlStart.length, 
-};
+// const streamingStart = {
+//   sliceStartCount: htmlStart.length, 
+// };
 /**
  * @param clientStats Parameter passed by hot server middleware
  */
 export default ({ clientStats }) => async (req, res) => {
   // Need To Come back To If Statement
-  if(false){
-    const cacheStream = ReactCC.createCacheStream(cache, streamingStart);
-    cacheStream.pipe(res);
-    cacheStream.write(htmlStart);
+  if(true){
+    ReactCC.renderToNodeStream(<App/>, cache, res); 
+    // const cacheStream = ReactCC.createCacheStream(cache, streamingStart);
+    // cacheStream.pipe(res);
+    // cacheStream.write(htmlStart);
+
+    // const stream = ReactCC.renderToNodeStream(<App />, cache, streamingStart);
+    // stream.pipe(cacheStream, { end: false });
+    // stream.on("end", () => {
+    //   cacheStream.end(htmlEnd);
+    // });
 
-    const stream = ReactCC.renderToNodeStream(<App />, cache, streamingStart);
-    stream.pipe(cacheStream, { end: false });
-    stream.on("end", () => {
-      cacheStream.end(htmlEnd);
-    });
   }
-  else if (true){
+  else if (false){
     const app = <App />;
     const start_cached = process.hrtime();
     
diff --git a/SSRtest/src/shared/List.js b/SSRtest/src/shared/List.js
@@ -12,7 +12,7 @@ export default class List extends Component {
         let bunchOfProducts = [];
         const templatizedProps = ["name", "description", "price"];
         for (let i=0; i<100; i++) {
-            bunchOfProducts.push(<ProductInfo key={i} name={`Thing ${i}`} description="This product is awesome!" price={i * 10} nonTemplatized="THIS TEXT SHOULD NEVER CHANGE" cache templatized={templatizedProps}/>);
+            bunchOfProducts.push(<ProductInfo key={i} name={`Thing ${i}`} description="This product is awesome!" price={i * 10} nonTemplatized="THIS TEXT SHOULD NEVER CHANGE" cache />);
         }
         return (
             <div>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export default class List extends Component {`
`12`	`12`	`let bunchOfProducts = [];`
`13`	`13`	`const templatizedProps = ["name", "description", "price"];`
`14`	`14`	`for (let i=0; i<100; i++) {`
`15`		- bunchOfProducts.push(<ProductInfo key={i} name={`Thing ${i}`} description="This product is awesome!" price={i * 10} nonTemplatized="THIS TEXT SHOULD NEVER CHANGE" cache templatized={templatizedProps}/>);
	`15`	+ bunchOfProducts.push(<ProductInfo key={i} name={`Thing ${i}`} description="This product is awesome!" price={i * 10} nonTemplatized="THIS TEXT SHOULD NEVER CHANGE" cache />);
`16`	`16`	`}`
`17`	`17`	`return (`
`18`	`18`	`<div>`