Expose prerender() for SSG

facebook · Oct 19, 2024 · 6e896dc · 6e896dc
1 parent 1839e14
commit 6e896dc
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 14 deletions.
diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzStatic-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzStatic-test.js
@@ -212,7 +212,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 +229,7 @@ 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);

diff --git a/packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js b/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);
     }
 

diff --git a/packages/react-dom/src/server/ReactDOMFizzStaticEdge.js b/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);
     }
 

diff --git a/packages/react-dom/src/server/ReactDOMFizzStaticNode.js b/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(

diff --git a/packages/react-dom/src/server/react-dom-server.browser.stable.js b/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';
diff --git a/packages/react-dom/src/server/react-dom-server.edge.stable.js b/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';
diff --git a/packages/react-dom/src/server/react-dom-server.node.stable.js b/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';