Skip to content

[Flight] rename prerender to unstable_prerender and include in stable channel #31724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2024
Merged

[Flight] rename prerender to unstable_prerender and include in stable channel #31724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fixtures/flight/server/region.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ async function renderApp(res, returnValue, formState) {
}

async function prerenderApp(res, returnValue, formState) {
const {prerenderToNodeStream} = await import(
const {unstable_prerenderToNodeStream: prerenderToNodeStream} = await import(
'react-server-dom-webpack/static'
);
// const m = require('../src/App.js');
Expand Down
4 changes: 2 additions & 2 deletions packages/react-server-dom-esm/npm/static.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-esm-server.node.development.js');
}

if (s.prerenderToNodeStream) {
exports.prerenderToNodeStream = s.prerenderToNodeStream;
if (s.unstable_prerenderToNodeStream) {
exports.unstable_prerenderToNodeStream = s.unstable_prerenderToNodeStream;
}
2 changes: 1 addition & 1 deletion packages/react-server-dom-esm/src/server/react-flight-dom-server.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToPipeableStream,
prerenderToNodeStream,
prerenderToNodeStream as unstable_prerenderToNodeStream,
decodeReplyFromBusboy,
decodeReply,
decodeAction,
Expand Down
1 change: 1 addition & 0 deletions packages/react-server-dom-esm/src/server/react-flight-dom-server.node.stable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

export {
renderToPipeableStream,
prerenderToNodeStream as unstable_prerenderToNodeStream,
decodeReplyFromBusboy,
decodeReply,
decodeAction,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server-dom-esm/static.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export {prerenderToNodeStream} from './src/server/react-flight-dom-server.node';
export {unstable_prerenderToNodeStream} from './src/server/react-flight-dom-server.node';
4 changes: 2 additions & 2 deletions packages/react-server-dom-turbopack/npm/static.browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-turbopack-server.browser.development.js');
}

if (s.prerender) {
exports.prerender = s.prerender;
if (s.unstable_prerender) {
exports.unstable_prerender = s.unstable_prerender;
}
4 changes: 2 additions & 2 deletions packages/react-server-dom-turbopack/npm/static.edge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-turbopack-server.edge.development.js');
}

if (s.prerender) {
exports.prerender = s.prerender;
if (s.unstable_prerender) {
exports.unstable_prerender = s.unstable_prerender;
}
4 changes: 2 additions & 2 deletions packages/react-server-dom-turbopack/npm/static.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-turbopack-server.node.development.js');
}

if (s.prerenderToNodeStream) {
exports.prerenderToNodeStream = s.prerenderToNodeStream;
if (s.unstable_prerenderToNodeStream) {
exports.unstable_prerenderToNodeStream = s.unstable_prerenderToNodeStream;
}
2 changes: 1 addition & 1 deletion packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToReadableStream,
prerender,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down
1 change: 1 addition & 0 deletions packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.stable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

export {
renderToReadableStream,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToReadableStream,
prerender,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down
1 change: 1 addition & 0 deletions packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.stable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

export {
renderToReadableStream,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToPipeableStream,
prerenderToNodeStream,
prerenderToNodeStream as unstable_prerenderToNodeStream,
decodeReplyFromBusboy,
decodeReply,
decodeAction,
Expand Down
1 change: 1 addition & 0 deletions packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.stable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

export {
renderToPipeableStream,
prerenderToNodeStream as unstable_prerenderToNodeStream,
decodeReplyFromBusboy,
decodeReply,
decodeAction,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server-dom-turbopack/static.browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export {prerender} from './src/server/react-flight-dom-server.browser';
export {unstable_prerender} from './src/server/react-flight-dom-server.browser';
2 changes: 1 addition & 1 deletion packages/react-server-dom-turbopack/static.edge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export {prerender} from './src/server/react-flight-dom-server.edge';
export {unstable_prerender} from './src/server/react-flight-dom-server.edge';
2 changes: 1 addition & 1 deletion packages/react-server-dom-turbopack/static.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export {prerenderToNodeStream} from './src/server/react-flight-dom-server.node';
export {unstable_prerenderToNodeStream} from './src/server/react-flight-dom-server.node';
4 changes: 2 additions & 2 deletions packages/react-server-dom-webpack/npm/static.browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-webpack-server.browser.development.js');
}

if (s.prerender) {
exports.prerender = s.prerender;
if (s.unstable_prerender) {
exports.unstable_prerender = s.unstable_prerender;
}
4 changes: 2 additions & 2 deletions packages/react-server-dom-webpack/npm/static.edge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-webpack-server.edge.development.js');
}

if (s.prerender) {
exports.prerender = s.prerender;
if (s.unstable_prerender) {
exports.unstable_prerender = s.unstable_prerender;
}
4 changes: 2 additions & 2 deletions packages/react-server-dom-webpack/npm/static.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-webpack-server.node.development.js');
}

if (s.prerenderToNodeStream) {
exports.prerenderToNodeStream = s.prerenderToNodeStream;
if (s.unstable_prerenderToNodeStream) {
exports.unstable_prerenderToNodeStream = s.unstable_prerenderToNodeStream;
}
4 changes: 2 additions & 2 deletions packages/react-server-dom-webpack/npm/static.node.unbundled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-webpack-server.node.unbundled.development.js');
}

if (s.prerenderToNodeStream) {
exports.prerenderToNodeStream = s.prerenderToNodeStream;
if (s.unstable_prerenderToNodeStream) {
exports.unstable_prerenderToNodeStream = s.unstable_prerenderToNodeStream;
}
70 changes: 37 additions & 33 deletions packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2787,10 +2787,11 @@ describe('ReactFlightDOM', () => {
const {pendingResult} = await serverAct(async () => {
// destructure trick to avoid the act scope from awaiting the returned value
return {
pendingResult: ReactServerDOMStaticServer.prerenderToNodeStream(
<App />,
webpackMap,
),
pendingResult:
ReactServerDOMStaticServer.unstable_prerenderToNodeStream(
<App />,
webpackMap,
),
};
});

Expand Down Expand Up @@ -2853,16 +2854,17 @@ describe('ReactFlightDOM', () => {
const {pendingResult} = await serverAct(async () => {
// destructure trick to avoid the act scope from awaiting the returned value
return {
pendingResult: ReactServerDOMStaticServer.prerenderToNodeStream(
<App />,
webpackMap,
{
signal: controller.signal,
onError(err) {
errors.push(err);
pendingResult:
ReactServerDOMStaticServer.unstable_prerenderToNodeStream(
<App />,
webpackMap,
{
signal: controller.signal,
onError(err) {
errors.push(err);
},
},
},
),
),
};
});

Expand Down Expand Up @@ -2934,18 +2936,19 @@ describe('ReactFlightDOM', () => {
const controller = new AbortController();
const {pendingResult} = await serverAct(() => {
return {
pendingResult: ReactServerDOMStaticServer.prerenderToNodeStream(
{
multiShotIterable,
},
{},
{
onError(x) {
errors.push(x);
pendingResult:
ReactServerDOMStaticServer.unstable_prerenderToNodeStream(
{
multiShotIterable,
},
signal: controller.signal,
},
),
{},
{
onError(x) {
errors.push(x);
},
signal: controller.signal,
},
),
};
});

Expand Down Expand Up @@ -3017,16 +3020,17 @@ describe('ReactFlightDOM', () => {
const errors = [];
const {pendingResult} = await serverAct(() => {
return {
pendingResult: ReactServerDOMStaticServer.prerenderToNodeStream(
<App />,
{},
{
onError(x) {
errors.push(x);
pendingResult:
ReactServerDOMStaticServer.unstable_prerenderToNodeStream(
<App />,
{},
{
onError(x) {
errors.push(x);
},
signal: controller.signal,
},
signal: controller.signal,
},
),
),
};
});

Expand Down
4 changes: 2 additions & 2 deletions packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,7 +2490,7 @@ describe('ReactFlightDOMBrowser', () => {
const {pendingResult} = await serverAct(async () => {
// destructure trick to avoid the act scope from awaiting the returned value
return {
pendingResult: ReactServerDOMStaticServer.prerender(
pendingResult: ReactServerDOMStaticServer.unstable_prerender(
<App />,
webpackMap,
),
Expand Down Expand Up @@ -2543,7 +2543,7 @@ describe('ReactFlightDOMBrowser', () => {
const {pendingResult} = await serverAct(async () => {
// destructure trick to avoid the act scope from awaiting the returned value
return {
pendingResult: ReactServerDOMStaticServer.prerender(
pendingResult: ReactServerDOMStaticServer.unstable_prerender(
<App />,
webpackMap,
{
Expand Down
4 changes: 2 additions & 2 deletions packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@ describe('ReactFlightDOMEdge', () => {
const {pendingResult} = await serverAct(async () => {
// destructure trick to avoid the act scope from awaiting the returned value
return {
pendingResult: ReactServerDOMStaticServer.prerender(
pendingResult: ReactServerDOMStaticServer.unstable_prerender(
<App />,
webpackMap,
),
Expand Down Expand Up @@ -1192,7 +1192,7 @@ describe('ReactFlightDOMEdge', () => {
const {pendingResult} = await serverAct(async () => {
// destructure trick to avoid the act scope from awaiting the returned value
return {
pendingResult: ReactServerDOMStaticServer.prerender(
pendingResult: ReactServerDOMStaticServer.unstable_prerender(
<App />,
webpackMap,
{
Expand Down
28 changes: 15 additions & 13 deletions packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,10 +411,11 @@ describe('ReactFlightDOMNode', () => {
const {pendingResult} = await serverAct(async () => {
// destructure trick to avoid the act scope from awaiting the returned value
return {
pendingResult: ReactServerDOMStaticServer.prerenderToNodeStream(
<App />,
webpackMap,
),
pendingResult:
ReactServerDOMStaticServer.unstable_prerenderToNodeStream(
<App />,
webpackMap,
),
};
});

Expand Down Expand Up @@ -469,16 +470,17 @@ describe('ReactFlightDOMNode', () => {
const {pendingResult} = await serverAct(async () => {
// destructure trick to avoid the act scope from awaiting the returned value
return {
pendingResult: ReactServerDOMStaticServer.prerenderToNodeStream(
<App />,
webpackMap,
{
signal: controller.signal,
onError(err) {
errors.push(err);
pendingResult:
ReactServerDOMStaticServer.unstable_prerenderToNodeStream(
<App />,
webpackMap,
{
signal: controller.signal,
onError(err) {
errors.push(err);
},
},
},
),
),
};
});

Expand Down
2 changes: 1 addition & 1 deletion packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToReadableStream,
prerender,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down
1 change: 1 addition & 0 deletions packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.stable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

export {
renderToReadableStream,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToReadableStream,
prerender,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down
1 change: 1 addition & 0 deletions packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.stable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

export {
renderToReadableStream,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToPipeableStream,
prerenderToNodeStream,
prerenderToNodeStream as unstable_prerenderToNodeStream,
decodeReplyFromBusboy,
decodeReply,
decodeAction,
Expand Down
Loading
Loading