Skip to content

Commit 199943e

Browse files
committed
Wire up generateStaticMarkup to static API entry points
1 parent f52b8d6 commit 199943e

File tree

2 files changed

+40
-7
lines changed

2 files changed

+40
-7
lines changed

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

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ function onError() {
3232
// Non-fatal errors are ignored.
3333
}
3434

35-
function renderToString(
35+
function renderToStringImpl(
3636
children: ReactNodeList,
37-
options?: ServerOptions,
37+
options: void | ServerOptions,
38+
generateStaticMarkup: boolean,
3839
): string {
3940
let didFatal = false;
4041
let fatalError = null;
@@ -59,7 +60,10 @@ function renderToString(
5960
const request = createRequest(
6061
children,
6162
destination,
62-
createResponseState(false, options ? options.identifierPrefix : undefined),
63+
createResponseState(
64+
generateStaticMarkup,
65+
options ? options.identifierPrefix : undefined,
66+
),
6367
createRootFormatContext(undefined),
6468
Infinity,
6569
onError,
@@ -84,6 +88,20 @@ function renderToString(
8488
return result;
8589
}
8690

91+
function renderToString(
92+
children: ReactNodeList,
93+
options?: ServerOptions,
94+
): string {
95+
return renderToStringImpl(children, options, false);
96+
}
97+
98+
function renderToStaticMarkup(
99+
children: ReactNodeList,
100+
options?: ServerOptions,
101+
): string {
102+
return renderToStringImpl(children, options, true);
103+
}
104+
87105
function renderToNodeStream() {
88106
invariant(
89107
false,
@@ -102,7 +120,7 @@ function renderToStaticNodeStream() {
102120

103121
export {
104122
renderToString,
105-
renderToString as renderToStaticMarkup,
123+
renderToStaticMarkup,
106124
renderToNodeStream,
107125
renderToStaticNodeStream,
108126
ReactVersion as version,

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ function onError() {
6363
// Non-fatal errors are ignored.
6464
}
6565

66-
function renderToNodeStream(
66+
function renderToNodeStreamImpl(
6767
children: ReactNodeList,
68-
options?: ServerOptions,
68+
options: void | ServerOptions,
69+
generateStaticMarkup: boolean,
6970
): Readable {
7071
function onCompleteAll() {
7172
// We wait until everything has loaded before starting to write.
@@ -89,10 +90,24 @@ function renderToNodeStream(
8990
return destination;
9091
}
9192

93+
function renderToNodeStream(
94+
children: ReactNodeList,
95+
options?: ServerOptions,
96+
): Readable {
97+
return renderToNodeStreamImpl(children, options, false);
98+
}
99+
100+
function renderToStaticNodeStream(
101+
children: ReactNodeList,
102+
options?: ServerOptions,
103+
): Readable {
104+
return renderToNodeStreamImpl(children, options, true);
105+
}
106+
92107
export {
93108
renderToString,
94109
renderToStaticMarkup,
95110
renderToNodeStream,
96-
renderToNodeStream as renderToStaticNodeStream,
111+
renderToStaticNodeStream,
97112
version,
98113
};

0 commit comments

Comments
 (0)