Wire up generateStaticMarkup to static API entry points

facebook · Jun 14, 2021 · b24fbf8 · b24fbf8
1 parent 38cdc26
commit b24fbf8
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 7 deletions.
diff --git a/packages/react-dom/src/server/ReactDOMLegacyServerBrowser.js b/packages/react-dom/src/server/ReactDOMLegacyServerBrowser.js
@@ -32,9 +32,10 @@ function onError() {
   // Non-fatal errors are ignored.
 }
 
-function renderToString(
+function renderToStringImpl(
   children: ReactNodeList,
-  options?: ServerOptions,
+  options: void | ServerOptions,
+  generateStaticMarkup: boolean,
 ): string {
   let didFatal = false;
   let fatalError = null;
@@ -59,7 +60,10 @@ function renderToString(
   const request = createRequest(
     children,
     destination,
-    createResponseState(false, options ? options.identifierPrefix : undefined),
+    createResponseState(
+      generateStaticMarkup,
+      options ? options.identifierPrefix : undefined,
+    ),
     createRootFormatContext(undefined),
     Infinity,
     onError,
@@ -84,6 +88,20 @@ function renderToString(
   return result;
 }
 
+function renderToString(
+  children: ReactNodeList,
+  options?: ServerOptions,
+): string {
+  return renderToStringImpl(children, options, false);
+}
+
+function renderToStaticMarkup(
+  children: ReactNodeList,
+  options?: ServerOptions,
+): string {
+  return renderToStringImpl(children, options, true);
+}
+
 function renderToNodeStream() {
   invariant(
     false,
@@ -102,7 +120,7 @@ function renderToStaticNodeStream() {
 
 export {
   renderToString,
-  renderToString as renderToStaticMarkup,
+  renderToStaticMarkup,
   renderToNodeStream,
   renderToStaticNodeStream,
   ReactVersion as version,

diff --git a/packages/react-dom/src/server/ReactDOMLegacyServerNode.js b/packages/react-dom/src/server/ReactDOMLegacyServerNode.js
@@ -63,9 +63,10 @@ function onError() {
   // Non-fatal errors are ignored.
 }
 
-function renderToNodeStream(
+function renderToNodeStreamImpl(
   children: ReactNodeList,
-  options?: ServerOptions,
+  options: void | ServerOptions,
+  generateStaticMarkup: boolean,
 ): Readable {
   function onCompleteAll() {
     // We wait until everything has loaded before starting to write.
@@ -89,10 +90,24 @@ function renderToNodeStream(
   return destination;
 }
 
+function renderToNodeStream(
+  children: ReactNodeList,
+  options?: ServerOptions,
+): Readable {
+  return renderToNodeStreamImpl(children, options, false);
+}
+
+function renderToStaticNodeStream(
+  children: ReactNodeList,
+  options?: ServerOptions,
+): Readable {
+  return renderToNodeStreamImpl(children, options, true);
+}
+
 export {
   renderToString,
   renderToStaticMarkup,
   renderToNodeStream,
-  renderToNodeStream as renderToStaticNodeStream,
+  renderToStaticNodeStream,
   version,
 };