Expose prerender() for SSG

Author: sebmarkbage

packages/react-dom/src/__tests__/ReactDOMFizzStatic-test.js

@@ -32,9 +32,7 @@ describe('ReactDOMFizzStatic', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMClient = require('react-dom/client');
-    if (__EXPERIMENTAL__) {
-      ReactDOMFizzStatic = require('react-dom/static');
-    }
+    ReactDOMFizzStatic = require('react-dom/static');
     Stream = require('stream');
     Suspense = React.Suspense;
 
@@ -212,7 +210,6 @@ describe('ReactDOMFizzStatic', () => {
     return readText(text);
   }
 
-  // @gate experimental
   it('should render a fully static document, send it and then hydrate it', async () => {
     function App() {
       return (
@@ -230,7 +227,11 @@ describe('ReactDOMFizzStatic', () => {
 
     const result = await promise;
 
-    expect(result.postponed).toBe(null);
+    expect(result.postponed).toBe(
+      gate(flags => flags.enableHalt || flags.enablePostpone)
+        ? null
+        : undefined,
+    );
 
     await act(async () => {
       result.prelude.pipe(writable);

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

@@ -42,9 +42,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMFizzServer = require('react-dom/server.browser');
-    if (__EXPERIMENTAL__) {
-      ReactDOMFizzStatic = require('react-dom/static.browser');
-    }
+    ReactDOMFizzStatic = require('react-dom/static.browser');
     Suspense = React.Suspense;
     container = document.createElement('div');
     document.body.appendChild(container);
@@ -1610,7 +1608,6 @@ describe('ReactDOMFizzStaticBrowser', () => {
     );
   });
 
-  // @gate experimental
   it('logs an error if onHeaders throws but continues the prerender', async () => {
     const errors = [];
     function onError(error) {
@@ -1627,7 +1624,11 @@ describe('ReactDOMFizzStaticBrowser', () => {
         onError,
       }),
     );
-    expect(prerendered.postponed).toBe(null);
+    expect(prerendered.postponed).toBe(
+      gate(flags => flags.enableHalt || flags.enablePostpone)
+        ? null
+        : undefined,
+    );
     expect(errors).toEqual(['bad onHeaders']);
 
     await readIntoContainer(prerendered.prelude);

packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js

@@ -38,6 +38,8 @@ import {
   createRootFormatContext,
 } from 'react-dom-bindings/src/server/ReactFizzConfigDOM';
 
+import {enablePostpone, enableHalt} from 'shared/ReactFeatureFlags';
+
 import {ensureCorrectIsomorphicReactVersion} from '../shared/ensureCorrectIsomorphicReactVersion';
 ensureCorrectIsomorphicReactVersion();
 
@@ -85,10 +87,15 @@ function prerender(
         {highWaterMark: 0},
       );
 
-      const result = {
-        postponed: getPostponedState(request),
-        prelude: stream,
-      };
+      const result: StaticResult =
+        enablePostpone || enableHalt
+          ? {
+              postponed: getPostponedState(request),
+              prelude: stream,
+            }
+          : ({
+              prelude: stream,
+            }: any);
       resolve(result);
     }
 

packages/react-dom/src/server/ReactDOMFizzStaticEdge.js

@@ -38,6 +38,8 @@ import {
   createRootFormatContext,
 } from 'react-dom-bindings/src/server/ReactFizzConfigDOM';
 
+import {enablePostpone, enableHalt} from 'shared/ReactFeatureFlags';
+
 import {ensureCorrectIsomorphicReactVersion} from '../shared/ensureCorrectIsomorphicReactVersion';
 ensureCorrectIsomorphicReactVersion();
 
@@ -85,10 +87,15 @@ function prerender(
         {highWaterMark: 0},
       );
 
-      const result = {
-        postponed: getPostponedState(request),
-        prelude: stream,
-      };
+      const result: StaticResult =
+        enablePostpone || enableHalt
+          ? {
+              postponed: getPostponedState(request),
+              prelude: stream,
+            }
+          : ({
+              prelude: stream,
+            }: any);
       resolve(result);
     }
 

packages/react-dom/src/server/ReactDOMFizzStaticNode.js

@@ -39,6 +39,8 @@ import {
   createRootFormatContext,
 } from 'react-dom-bindings/src/server/ReactFizzConfigDOM';
 
+import {enablePostpone, enableHalt} from 'shared/ReactFeatureFlags';
+
 import {ensureCorrectIsomorphicReactVersion} from '../shared/ensureCorrectIsomorphicReactVersion';
 ensureCorrectIsomorphicReactVersion();
 
@@ -94,10 +96,15 @@ function prerenderToNodeStream(
       });
       const writable = createFakeWritable(readable);
 
-      const result = {
-        postponed: getPostponedState(request),
-        prelude: readable,
-      };
+      const result: StaticResult =
+        enablePostpone || enableHalt
+          ? {
+              postponed: getPostponedState(request),
+              prelude: readable,
+            }
+          : ({
+              prelude: readable,
+            }: any);
       resolve(result);
     }
     const resumableState = createResumableState(

packages/react-dom/src/server/react-dom-server.browser.stable.js

@@ -8,3 +8,4 @@
  */
 
 export {renderToReadableStream, version} from './ReactDOMFizzServerBrowser.js';
+export {prerender} from './ReactDOMFizzStaticBrowser.js';

packages/react-dom/src/server/react-dom-server.edge.stable.js

@@ -8,3 +8,4 @@
  */
 
 export {renderToReadableStream, version} from './ReactDOMFizzServerEdge.js';
+export {prerender} from './ReactDOMFizzStaticEdge.js';

packages/react-dom/src/server/react-dom-server.node.stable.js

@@ -8,3 +8,4 @@
  */
 
 export {renderToPipeableStream, version} from './ReactDOMFizzServerNode.js';
+export {prerenderToNodeStream} from './ReactDOMFizzStaticNode.js';