Ship partial-prerendering APIs to Canary

fixtures/flight/server/region.js

@@ -133,7 +133,7 @@ async function renderApp(res, returnValue, formState, noCache, debugChannel) {
 }
 
 async function prerenderApp(res, returnValue, formState, noCache) {
-  const {unstable_prerenderToNodeStream: prerenderToNodeStream} = await import(
+  const {prerenderToNodeStream} = await import(
     'react-server-dom-webpack/static'
   );
   // const m = require('../src/App.js');

packages/react-dom/npm/server.browser.js

@@ -13,6 +13,4 @@ exports.version = l.version;
 exports.renderToString = l.renderToString;
 exports.renderToStaticMarkup = l.renderToStaticMarkup;
 exports.renderToReadableStream = s.renderToReadableStream;
-if (s.resume) {
-  exports.resume = s.resume;
-}
+exports.resume = s.resume;

packages/react-dom/npm/server.bun.js

@@ -12,8 +12,6 @@ if (process.env.NODE_ENV === 'production') {
 
 exports.version = b.version;
 exports.renderToReadableStream = b.renderToReadableStream;
-if (b.resume) {
-  exports.resume = b.resume;
-}
+exports.resume = b.resume;
 exports.renderToString = l.renderToString;
 exports.renderToStaticMarkup = l.renderToStaticMarkup;

packages/react-dom/npm/server.edge.js

@@ -14,6 +14,4 @@ exports.version = b.version;
 exports.renderToReadableStream = b.renderToReadableStream;
 exports.renderToString = l.renderToString;
 exports.renderToStaticMarkup = l.renderToStaticMarkup;
-if (b.resume) {
-  exports.resume = b.resume;
-}
+exports.resume = b.resume;

packages/react-dom/npm/server.node.js

@@ -14,9 +14,5 @@ exports.renderToString = l.renderToString;
 exports.renderToStaticMarkup = l.renderToStaticMarkup;
 exports.renderToPipeableStream = s.renderToPipeableStream;
 exports.renderToReadableStream = s.renderToReadableStream;
-if (s.resumeToPipeableStream) {
-  exports.resumeToPipeableStream = s.resumeToPipeableStream;
-}
-if (s.resume) {
-  exports.resume = s.resume;
-}
+exports.resumeToPipeableStream = s.resumeToPipeableStream;
+exports.resume = s.resume;

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

@@ -416,7 +416,11 @@ describe('ReactDOMFizzStatic', () => {
       return <div>aborted</div>;
     }
 
+    const errors = [];
     const pendingResult = ReactDOMFizzStatic.prerenderToNodeStream(<App />, {
+      onError: error => {
+        errors.push(error);
+      },
       signal: controller.signal,
     });
     pendingResult.catch(() => {});
@@ -430,6 +434,7 @@ describe('ReactDOMFizzStatic', () => {
       result.prelude.pipe(writable);
     });
     expect(getVisibleChildren(container)).toEqual(undefined);
+    expect(errors).toEqual([]);
   });
 
   // @gate enablePostpone
@@ -447,13 +452,18 @@ describe('ReactDOMFizzStatic', () => {
       return <div>aborted</div>;
     }
 
+    const errors = [];
     const result = await ReactDOMFizzStatic.prerenderToNodeStream(<App />, {
+      onError: error => {
+        errors.push(error);
+      },
       signal: controller.signal,
     });
     await act(async () => {
       result.prelude.pipe(writable);
     });
     expect(getVisibleChildren(container)).toEqual(undefined);
+    expect(errors).toEqual([]);
   });
 
   // @gate enableHalt

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

@@ -40,9 +40,7 @@ describe('ReactDOMFizzStaticFloat', () => {
     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);

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

@@ -18,9 +18,7 @@ describe('ReactDOMFizzStaticNode', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    if (__EXPERIMENTAL__) {
-      ReactDOMFizzStatic = require('react-dom/static');
-    }
+    ReactDOMFizzStatic = require('react-dom/static');
     Suspense = React.Suspense;
   });
 
@@ -58,7 +56,7 @@ describe('ReactDOMFizzStaticNode', () => {
     }
   }
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('should call prerenderToNodeStream', async () => {
     const result = await ReactDOMFizzStatic.prerenderToNodeStream(
       <div>hello world</div>,
@@ -67,14 +65,14 @@ describe('ReactDOMFizzStaticNode', () => {
     expect(prelude).toMatchInlineSnapshot(`"<div>hello world</div>"`);
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('should suppport web streams', async () => {
     const result = await ReactDOMFizzStatic.prerender(<div>hello world</div>);
     const prelude = await readContentWeb(result.prelude);
     expect(prelude).toMatchInlineSnapshot(`"<div>hello world</div>"`);
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('should emit DOCTYPE at the root of the document', async () => {
     const result = await ReactDOMFizzStatic.prerenderToNodeStream(
       <html>
@@ -93,7 +91,7 @@ describe('ReactDOMFizzStaticNode', () => {
     }
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('should emit bootstrap script src at the end', async () => {
     const result = await ReactDOMFizzStatic.prerenderToNodeStream(
       <div>hello world</div>,
@@ -109,7 +107,7 @@ describe('ReactDOMFizzStaticNode', () => {
     );
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('emits all HTML as one unit', async () => {
     let hasLoaded = false;
     let resolve;
@@ -139,7 +137,7 @@ describe('ReactDOMFizzStaticNode', () => {
     expect(prelude).toMatchInlineSnapshot(`"<div><!--$-->Done<!--/$--></div>"`);
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('should reject the promise when an error is thrown at the root', async () => {
     const reportedErrors = [];
     let caughtError = null;
@@ -161,7 +159,7 @@ describe('ReactDOMFizzStaticNode', () => {
     expect(reportedErrors).toEqual([theError]);
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('should reject the promise when an error is thrown inside a fallback', async () => {
     const reportedErrors = [];
     let caughtError = null;
@@ -185,7 +183,7 @@ describe('ReactDOMFizzStaticNode', () => {
     expect(reportedErrors).toEqual([theError]);
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('should not error the stream when an error is thrown inside suspense boundary', async () => {
     const reportedErrors = [];
     const result = await ReactDOMFizzStatic.prerenderToNodeStream(
@@ -206,7 +204,7 @@ describe('ReactDOMFizzStaticNode', () => {
     expect(reportedErrors).toEqual([theError]);
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('should be able to complete by aborting even if the promise never resolves', async () => {
     const errors = [];
     const controller = new AbortController();
@@ -236,7 +234,7 @@ describe('ReactDOMFizzStaticNode', () => {
     expect(errors).toEqual(['This operation was aborted']);
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   // @gate !enableHalt
   it('should reject if aborting before the shell is complete and enableHalt is disabled', async () => {
     const errors = [];
@@ -302,7 +300,7 @@ describe('ReactDOMFizzStaticNode', () => {
     expect(content).toBe('');
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('should be able to abort before something suspends', async () => {
     const errors = [];
     const controller = new AbortController();
@@ -343,7 +341,7 @@ describe('ReactDOMFizzStaticNode', () => {
     }
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   // @gate !enableHalt
   it('should reject if passing an already aborted signal and enableHalt is disabled', async () => {
     const errors = [];
@@ -414,7 +412,7 @@ describe('ReactDOMFizzStaticNode', () => {
     expect(content).toBe('');
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('supports custom abort reasons with a string', async () => {
     const promise = new Promise(r => {});
     function Wait() {
@@ -456,7 +454,7 @@ describe('ReactDOMFizzStaticNode', () => {
     expect(errors).toEqual(['foobar', 'foobar']);
   });
 
-  // @gate experimental
+  // @gate enableHalt || enablePostpone
   it('supports custom abort reasons with an Error', async () => {
     const promise = new Promise(r => {});
     function Wait() {

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

@@ -7,5 +7,9 @@
  * @flow
  */
 
-export {renderToReadableStream, version} from './ReactDOMFizzServerBrowser.js';
-export {prerender} from './ReactDOMFizzStaticBrowser.js';
+export {
+  renderToReadableStream,
+  resume,
+  version,
+} from './ReactDOMFizzServerBrowser.js';
+export {prerender, resumeAndPrerender} from './ReactDOMFizzStaticBrowser.js';

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

@@ -7,5 +7,9 @@
  * @flow
  */
 
-export {renderToReadableStream, version} from './ReactDOMFizzServerEdge.js';
-export {prerender} from './ReactDOMFizzStaticEdge.js';
+export {
+  renderToReadableStream,
+  resume,
+  version,
+} from './ReactDOMFizzServerEdge.js';
+export {prerender, resumeAndPrerender} from './ReactDOMFizzStaticEdge.js';

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

@@ -10,6 +10,13 @@
 export {
   renderToPipeableStream,
   renderToReadableStream,
+  resume,
+  resumeToPipeableStream,
   version,
 } from './ReactDOMFizzServerNode.js';
-export {prerenderToNodeStream, prerender} from './ReactDOMFizzStaticNode.js';
+export {
+  prerenderToNodeStream,
+  prerender,
+  resumeAndPrerender,
+  resumeAndPrerenderToNodeStream,
+} from './ReactDOMFizzStaticNode.js';

packages/react-reconciler/src/__tests__/ReactHooks-test.internal.js

@@ -1589,17 +1589,15 @@ describe('ReactHooks', () => {
       useStateHelper,
     ];
 
-    if (__EXPERIMENTAL__) {
-      const useTransitionHelper = () => React.useTransition();
-      const useDeferredValueHelper = () =>
-        React.useDeferredValue(0, {timeoutMs: 1000});
+    const useTransitionHelper = () => React.useTransition();
+    const useDeferredValueHelper = () =>
+      React.useDeferredValue(0, {timeoutMs: 1000});
 
-      orderedHooks.push(useTransitionHelper);
-      orderedHooks.push(useDeferredValueHelper);
+    orderedHooks.push(useTransitionHelper);
+    orderedHooks.push(useDeferredValueHelper);
 
-      hooksInList.push(useTransitionHelper);
-      hooksInList.push(useDeferredValueHelper);
-    }
+    hooksInList.push(useTransitionHelper);
+    hooksInList.push(useDeferredValueHelper);
 
     const formatHookNamesToMatchErrorMessage = (hookNameA, hookNameB) => {
       return `use${hookNameA}${' '.repeat(24 - hookNameA.length)}${

packages/react-server-dom-esm/npm/static.node.js

@@ -7,6 +7,4 @@ if (process.env.NODE_ENV === 'production') {
   s = require('./cjs/react-server-dom-esm-server.node.development.js');
 }
 
-if (s.unstable_prerenderToNodeStream) {
-  exports.unstable_prerenderToNodeStream = s.unstable_prerenderToNodeStream;
-}
+exports.prerenderToNodeStream = s.prerenderToNodeStream;

packages/react-server-dom-esm/src/server/react-flight-dom-server.node.js

@@ -9,7 +9,7 @@
 
 export {
   renderToPipeableStream,
-  prerenderToNodeStream as unstable_prerenderToNodeStream,
+  prerenderToNodeStream,
   decodeReplyFromBusboy,
   decodeReply,
   decodeAction,

packages/react-server-dom-esm/static.node.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export {unstable_prerenderToNodeStream} from './src/server/react-flight-dom-server.node';
+export {prerenderToNodeStream} from './src/server/react-flight-dom-server.node';

packages/react-server-dom-parcel/npm/static.browser.js

@@ -7,6 +7,4 @@ if (process.env.NODE_ENV === 'production') {
   s = require('./cjs/react-server-dom-parcel-server.browser.development.js');
 }
 
-if (s.unstable_prerender) {
-  exports.unstable_prerender = s.unstable_prerender;
-}
+exports.prerender = s.prerender;

packages/react-server-dom-parcel/npm/static.edge.js

@@ -7,6 +7,4 @@ if (process.env.NODE_ENV === 'production') {
   s = require('./cjs/react-server-dom-parcel-server.edge.development.js');
 }
 
-if (s.unstable_prerender) {
-  exports.unstable_prerender = s.unstable_prerender;
-}
+exports.prerender = s.prerender;

packages/react-server-dom-parcel/npm/static.node.js

@@ -7,9 +7,5 @@ if (process.env.NODE_ENV === 'production') {
   s = require('./cjs/react-server-dom-parcel-server.node.development.js');
 }
 
-if (s.unstable_prerender) {
-  exports.unstable_prerender = s.unstable_prerender;
-}
-if (s.unstable_prerenderToNodeStream) {
-  exports.unstable_prerenderToNodeStream = s.unstable_prerenderToNodeStream;
-}
+exports.prerender = s.prerender;
+exports.prerenderToNodeStream = s.prerenderToNodeStream;

packages/react-server-dom-parcel/src/server/react-flight-dom-server.browser.js

@@ -9,7 +9,7 @@
 
 export {
   renderToReadableStream,
-  prerender as unstable_prerender,
+  prerender,
   decodeReply,
   decodeAction,
   decodeFormState,

packages/react-server-dom-parcel/src/server/react-flight-dom-server.edge.js

@@ -9,7 +9,7 @@
 
 export {
   renderToReadableStream,
-  prerender as unstable_prerender,
+  prerender,
   decodeReply,
   decodeReplyFromAsyncIterable,
   decodeAction,

packages/react-server-dom-parcel/src/server/react-flight-dom-server.node.js

@@ -10,8 +10,8 @@
 export {
   renderToReadableStream,
   renderToPipeableStream,
-  prerender as unstable_prerender,
-  prerenderToNodeStream as unstable_prerenderToNodeStream,
+  prerender,
+  prerenderToNodeStream,
   decodeReply,
   decodeReplyFromBusboy,
   decodeReplyFromAsyncIterable,

packages/react-server-dom-parcel/static.browser.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export {unstable_prerender} from './src/server/react-flight-dom-server.browser';
+export {prerender} from './src/server/react-flight-dom-server.browser';

packages/react-server-dom-parcel/static.edge.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export {unstable_prerender} from './src/server/react-flight-dom-server.edge';
+export {prerender} from './src/server/react-flight-dom-server.edge';

packages/react-server-dom-parcel/static.node.js

@@ -8,6 +8,6 @@
  */
 
 export {
-  unstable_prerender,
-  unstable_prerenderToNodeStream,
+  prerender,
+  prerenderToNodeStream,
 } from './src/server/react-flight-dom-server.node';