Skip to content

Commit f34197c

Browse files
gnoffgnoff
authored
Revert "Expose prerender() for SSG in stable (#31298)"
This reverts commit d49123f.
1 parent 603e610 commit f34197c

8 files changed

+39
-49
lines changed

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ describe('ReactDOMFizzStatic', () => {
3232
React = require('react');
3333
ReactDOM = require('react-dom');
3434
ReactDOMClient = require('react-dom/client');
35-
ReactDOMFizzStatic = require('react-dom/static');
35+
if (__EXPERIMENTAL__) {
36+
ReactDOMFizzStatic = require('react-dom/static');
37+
}
3638
Stream = require('stream');
3739
Suspense = React.Suspense;
3840

@@ -210,6 +212,7 @@ describe('ReactDOMFizzStatic', () => {
210212
return readText(text);
211213
}
212214

215+
// @gate experimental
213216
it('should render a fully static document, send it and then hydrate it', async () => {
214217
function App() {
215218
return (
@@ -227,11 +230,7 @@ describe('ReactDOMFizzStatic', () => {
227230

228231
const result = await promise;
229232

230-
expect(result.postponed).toBe(
231-
gate(flags => flags.enableHalt || flags.enablePostpone)
232-
? null
233-
: undefined,
234-
);
233+
expect(result.postponed).toBe(null);
235234

236235
await act(async () => {
237236
result.prelude.pipe(writable);
@@ -245,6 +244,7 @@ describe('ReactDOMFizzStatic', () => {
245244
expect(getVisibleChildren(container)).toEqual(<div>Hello</div>);
246245
});
247246

247+
// @gate experimental
248248
it('should support importMap option', async () => {
249249
const importMap = {
250250
foo: 'path/to/foo.js',
@@ -265,6 +265,7 @@ describe('ReactDOMFizzStatic', () => {
265265
]);
266266
});
267267

268+
// @gate experimental
268269
it('supports onHeaders', async () => {
269270
let headers;
270271
function onHeaders(x) {
@@ -299,7 +300,7 @@ describe('ReactDOMFizzStatic', () => {
299300
expect(getVisibleChildren(container)).toEqual('hello');
300301
});
301302

302-
// @gate enablePostpone
303+
// @gate experimental && enablePostpone
303304
it('includes stylesheet preloads in onHeaders when postponing in the Shell', async () => {
304305
let headers;
305306
function onHeaders(x) {
@@ -335,6 +336,7 @@ describe('ReactDOMFizzStatic', () => {
335336
expect(getVisibleChildren(container)).toEqual(undefined);
336337
});
337338

339+
// @gate experimental
338340
it('will prerender Suspense fallbacks before children', async () => {
339341
const values = [];
340342
function Indirection({children}) {

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ describe('ReactDOMFizzStaticBrowser', () => {
4242
React = require('react');
4343
ReactDOM = require('react-dom');
4444
ReactDOMFizzServer = require('react-dom/server.browser');
45-
ReactDOMFizzStatic = require('react-dom/static.browser');
45+
if (__EXPERIMENTAL__) {
46+
ReactDOMFizzStatic = require('react-dom/static.browser');
47+
}
4648
Suspense = React.Suspense;
4749
container = document.createElement('div');
4850
document.body.appendChild(container);
@@ -129,6 +131,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
129131
await insertNodesAndExecuteScripts(temp, container, null);
130132
}
131133

134+
// @gate experimental
132135
it('should call prerender', async () => {
133136
const result = await serverAct(() =>
134137
ReactDOMFizzStatic.prerender(<div>hello world</div>),
@@ -137,6 +140,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
137140
expect(prelude).toMatchInlineSnapshot(`"<div>hello world</div>"`);
138141
});
139142

143+
// @gate experimental
140144
it('should emit DOCTYPE at the root of the document', async () => {
141145
const result = await serverAct(() =>
142146
ReactDOMFizzStatic.prerender(
@@ -151,6 +155,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
151155
);
152156
});
153157

158+
// @gate experimental
154159
it('should emit bootstrap script src at the end', async () => {
155160
const result = await serverAct(() =>
156161
ReactDOMFizzStatic.prerender(<div>hello world</div>, {
@@ -165,6 +170,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
165170
);
166171
});
167172

173+
// @gate experimental
168174
it('emits all HTML as one unit', async () => {
169175
let hasLoaded = false;
170176
let resolve;
@@ -196,6 +202,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
196202
expect(prelude).toMatchInlineSnapshot(`"<div><!--$-->Done<!--/$--></div>"`);
197203
});
198204

205+
// @gate experimental
199206
it('should reject the promise when an error is thrown at the root', async () => {
200207
const reportedErrors = [];
201208
let caughtError = null;
@@ -219,6 +226,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
219226
expect(reportedErrors).toEqual([theError]);
220227
});
221228

229+
// @gate experimental
222230
it('should reject the promise when an error is thrown inside a fallback', async () => {
223231
const reportedErrors = [];
224232
let caughtError = null;
@@ -244,6 +252,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
244252
expect(reportedErrors).toEqual([theError]);
245253
});
246254

255+
// @gate experimental
247256
it('should not error the stream when an error is thrown inside suspense boundary', async () => {
248257
const reportedErrors = [];
249258
const result = await serverAct(() =>
@@ -266,6 +275,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
266275
expect(reportedErrors).toEqual([theError]);
267276
});
268277

278+
// @gate experimental
269279
it('should be able to complete by aborting even if the promise never resolves', async () => {
270280
const errors = [];
271281
const controller = new AbortController();
@@ -296,6 +306,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
296306
expect(errors).toEqual(['The operation was aborted.']);
297307
});
298308

309+
// @gate experimental
299310
// @gate !enableHalt
300311
it('should reject if aborting before the shell is complete and enableHalt is disabled', async () => {
301312
const errors = [];
@@ -365,6 +376,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
365376
expect(content).toBe('');
366377
});
367378

379+
// @gate experimental
368380
it('should be able to abort before something suspends', async () => {
369381
const errors = [];
370382
const controller = new AbortController();
@@ -407,6 +419,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
407419
}
408420
});
409421

422+
// @gate experimental
410423
// @gate !enableHalt
411424
it('should reject if passing an already aborted signal and enableHalt is disabled', async () => {
412425
const errors = [];
@@ -480,6 +493,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
480493
expect(content).toBe('');
481494
});
482495

496+
// @gate experimental
483497
it('supports custom abort reasons with a string', async () => {
484498
const promise = new Promise(r => {});
485499
function Wait() {
@@ -522,6 +536,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
522536
expect(errors).toEqual(['foobar', 'foobar']);
523537
});
524538

539+
// @gate experimental
525540
it('supports custom abort reasons with an Error', async () => {
526541
const promise = new Promise(r => {});
527542
function Wait() {
@@ -1595,6 +1610,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
15951610
);
15961611
});
15971612

1613+
// @gate experimental
15981614
it('logs an error if onHeaders throws but continues the prerender', async () => {
15991615
const errors = [];
16001616
function onError(error) {
@@ -1611,11 +1627,7 @@ describe('ReactDOMFizzStaticBrowser', () => {
16111627
onError,
16121628
}),
16131629
);
1614-
expect(prerendered.postponed).toBe(
1615-
gate(flags => flags.enableHalt || flags.enablePostpone)
1616-
? null
1617-
: undefined,
1618-
);
1630+
expect(prerendered.postponed).toBe(null);
16191631
expect(errors).toEqual(['bad onHeaders']);
16201632

16211633
await readIntoContainer(prerendered.prelude);

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ import {
3838
createRootFormatContext,
3939
} from 'react-dom-bindings/src/server/ReactFizzConfigDOM';
4040

41-
import {enablePostpone, enableHalt} from 'shared/ReactFeatureFlags';
42-
4341
import {ensureCorrectIsomorphicReactVersion} from '../shared/ensureCorrectIsomorphicReactVersion';
4442
ensureCorrectIsomorphicReactVersion();
4543

@@ -87,15 +85,10 @@ function prerender(
8785
{highWaterMark: 0},
8886
);
8987

90-
const result: StaticResult =
91-
enablePostpone || enableHalt
92-
? {
93-
postponed: getPostponedState(request),
94-
prelude: stream,
95-
}
96-
: ({
97-
prelude: stream,
98-
}: any);
88+
const result = {
89+
postponed: getPostponedState(request),
90+
prelude: stream,
91+
};
9992
resolve(result);
10093
}
10194

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ import {
3838
createRootFormatContext,
3939
} from 'react-dom-bindings/src/server/ReactFizzConfigDOM';
4040

41-
import {enablePostpone, enableHalt} from 'shared/ReactFeatureFlags';
42-
4341
import {ensureCorrectIsomorphicReactVersion} from '../shared/ensureCorrectIsomorphicReactVersion';
4442
ensureCorrectIsomorphicReactVersion();
4543

@@ -87,15 +85,10 @@ function prerender(
8785
{highWaterMark: 0},
8886
);
8987

90-
const result: StaticResult =
91-
enablePostpone || enableHalt
92-
? {
93-
postponed: getPostponedState(request),
94-
prelude: stream,
95-
}
96-
: ({
97-
prelude: stream,
98-
}: any);
88+
const result = {
89+
postponed: getPostponedState(request),
90+
prelude: stream,
91+
};
9992
resolve(result);
10093
}
10194

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ import {
3939
createRootFormatContext,
4040
} from 'react-dom-bindings/src/server/ReactFizzConfigDOM';
4141

42-
import {enablePostpone, enableHalt} from 'shared/ReactFeatureFlags';
43-
4442
import {ensureCorrectIsomorphicReactVersion} from '../shared/ensureCorrectIsomorphicReactVersion';
4543
ensureCorrectIsomorphicReactVersion();
4644

@@ -96,15 +94,10 @@ function prerenderToNodeStream(
9694
});
9795
const writable = createFakeWritable(readable);
9896

99-
const result: StaticResult =
100-
enablePostpone || enableHalt
101-
? {
102-
postponed: getPostponedState(request),
103-
prelude: readable,
104-
}
105-
: ({
106-
prelude: readable,
107-
}: any);
97+
const result = {
98+
postponed: getPostponedState(request),
99+
prelude: readable,
100+
};
108101
resolve(result);
109102
}
110103
const resumableState = createResumableState(

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@
88
*/
99

1010
export {renderToReadableStream, version} from './ReactDOMFizzServerBrowser.js';
11-
export {prerender} from './ReactDOMFizzStaticBrowser.js';

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@
88
*/
99

1010
export {renderToReadableStream, version} from './ReactDOMFizzServerEdge.js';
11-
export {prerender} from './ReactDOMFizzStaticEdge.js';

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@
88
*/
99

1010
export {renderToPipeableStream, version} from './ReactDOMFizzServerNode.js';
11-
export {prerenderToNodeStream} from './ReactDOMFizzStaticNode.js';

0 commit comments

Comments
 (0)