\n- }>\n- \n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const stream = await serverAct(() =>\n- ReactDOMServer.renderToReadableStream(),\n- );\n- await readIntoContainer(stream);\n- expect(container.textContent).toEqual('Loading...');\n-\n- assertLog(['Loading...']);\n- \/\/ After hydration, it's updated to the final value\n- await act(() => ReactDOMClient.hydrateRoot(container, ));\n- expect(container.textContent).toEqual('Final');\n- assertLog(['Loading...', 'Final']);\n- },\n- );\n-\n it(\n 'useDeferredValue during hydration has higher priority than remaining ' +\n 'incremental hydration',\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js\nindex b988bd72ca..18cf612444 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js\n@@ -6665,150 +6665,6 @@ describe('ReactDOMFizzServer', () => {\n ]);\n });\n \n- \/\/ @gate enablePostpone\n- it('client renders postponed boundaries without erroring', async () => {\n- function Postponed({isClient}) {\n- if (!isClient) {\n- React.unstable_postpone('testing postpone');\n- }\n- return 'client only';\n- }\n-\n- function App({isClient}) {\n- return (\n-

\n- \n- \n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const errors = [];\n-\n- await act(() => {\n- const {pipe} = renderToPipeableStream(, {\n- onError(error) {\n- errors.push(error.message);\n- },\n- });\n- pipe(writable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(

loading...<\/div>);\n-\n- ReactDOMClient.hydrateRoot(container, , {\n- onRecoverableError(error) {\n- errors.push(error.message);\n- },\n- });\n- await waitForAll([]);\n- \/\/ Postponing should not be logged as a recoverable error since it's intentional.\n- expect(errors).toEqual([]);\n- expect(getVisibleChildren(container)).toEqual(

client only<\/div>);\n- });\n-\n- \/\/ @gate enablePostpone\n- it('errors if trying to postpone outside a Suspense boundary', async () => {\n- function Postponed() {\n- React.unstable_postpone('testing postpone');\n- return 'client only';\n- }\n-\n- function App() {\n- return (\n-

\n- \n- <\/div>\n- );\n- }\n-\n- const errors = [];\n- const fatalErrors = [];\n- const postponed = [];\n- let written = false;\n-\n- const testWritable = new Stream.Writable();\n- testWritable._write = (chunk, encoding, next) => {\n- written = true;\n- };\n-\n- await act(() => {\n- const {pipe} = renderToPipeableStream(, {\n- onPostpone(reason) {\n- postponed.push(reason);\n- },\n- onError(error) {\n- errors.push(error.message);\n- },\n- onShellError(error) {\n- fatalErrors.push(error.message);\n- },\n- });\n- pipe(testWritable);\n- });\n-\n- expect(written).toBe(false);\n- \/\/ Postponing is not logged as an error but as a postponed reason.\n- expect(errors).toEqual([]);\n- expect(postponed).toEqual(['testing postpone']);\n- \/\/ However, it does error the shell.\n- expect(fatalErrors).toEqual(['testing postpone']);\n- });\n-\n- \/\/ @gate enablePostpone\n- it('can postpone in a fallback', async () => {\n- function Postponed({isClient}) {\n- if (!isClient) {\n- React.unstable_postpone('testing postpone');\n- }\n- return 'loading...';\n- }\n-\n- const lazyText = React.lazy(async () => {\n- await 0; \/\/ causes the fallback to start work\n- return {default: 'Hello'};\n- });\n-\n- function App({isClient}) {\n- return (\n-

\n- \n- }>\n- {lazyText}\n- <\/Suspense>\n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const errors = [];\n-\n- await act(() => {\n- const {pipe} = renderToPipeableStream(, {\n- onError(error) {\n- errors.push(error.message);\n- },\n- });\n- pipe(writable);\n- });\n-\n- \/\/ TODO: This should actually be fully resolved because the value could eventually\n- \/\/ resolve on the server even though the fallback couldn't so we should have been\n- \/\/ able to render it.\n- expect(getVisibleChildren(container)).toEqual(

Outer<\/div>);\n-\n- ReactDOMClient.hydrateRoot(container, , {\n- onRecoverableError(error) {\n- errors.push(error.message);\n- },\n- });\n- await waitForAll([]);\n- \/\/ Postponing should not be logged as a recoverable error since it's intentional.\n- expect(errors).toEqual([]);\n- expect(getVisibleChildren(container)).toEqual(

Hello<\/div>);\n- });\n-\n it(\n 'a transition that flows into a dehydrated boundary should not suspend ' +\n 'if the boundary is showing a fallback',\n@@ -6860,37 +6716,63 @@ describe('ReactDOMFizzServer', () => {\n },\n );\n \n- \/\/ @gate enablePostpone\n- it('supports postponing in prerender and resuming later', async () => {\n+ \/\/ @gate enableHalt\n+ it('can resume a prerender that was aborted', async () => {\n+ const promise = new Promise(r => {});\n+\n let prerendering = true;\n- function Postpone() {\n+\n+ function Wait() {\n if (prerendering) {\n- React.unstable_postpone();\n+ return React.use(promise);\n+ } else {\n+ return 'Hello';\n }\n- return 'Hello';\n }\n \n function App() {\n return (\n

\n \n- \n+

\n+ \n+ \n+ \n+ <\/Suspense>\n+ <\/span>\n+ <\/p>\n+

\n+ \n+ \n+ \n+ <\/Suspense>\n+ <\/span>\n+ <\/p>\n <\/Suspense>\n <\/div>\n );\n }\n \n- const prerendered = await ReactDOMFizzStatic.prerenderToNodeStream();\n- expect(prerendered.postponed).not.toBe(null);\n+ const controller = new AbortController();\n+ const signal = controller.signal;\n \n- prerendering = false;\n+ const errors = [];\n+ function onError(error) {\n+ errors.push(error);\n+ }\n+ let pendingPrerender;\n+ await act(() => {\n+ pendingPrerender = ReactDOMFizzStatic.prerenderToNodeStream(, {\n+ signal,\n+ onError,\n+ });\n+ });\n+ controller.abort('boom');\n \n- const resumed = ReactDOMFizzServer.resumeToPipeableStream(\n- ,\n- JSON.parse(JSON.stringify(prerendered.postponed)),\n- );\n+ const prerendered = await pendingPrerender;\n+\n+ expect(errors).toEqual(['boom', 'boom']);\n \n- \/\/ Create a separate stream so it doesn't close the writable. I.e. simple concat.\n const preludeWritable = new Stream.PassThrough();\n preludeWritable.setEncoding('utf8');\n preludeWritable.on('data', chunk => {\n@@ -6901,1378 +6783,45 @@ describe('ReactDOMFizzServer', () => {\n prerendered.prelude.pipe(preludeWritable);\n });\n \n- expect(getVisibleChildren(container)).toEqual(

Loading...<\/div>);\n-\n- await act(() => {\n- resumed.pipe(writable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(

Hello<\/div>);\n- });\n-\n- \/\/ @gate enablePostpone\n- it('client renders a component if it errors during resuming', async () => {\n- let prerendering = true;\n- let ssr = true;\n- function PostponeAndError() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- if (ssr) {\n- throw new Error('server error');\n- }\n- return 'Hello';\n- }\n-\n- function Postpone() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return 'Hello';\n- }\n-\n- const lazyPostponeAndError = React.lazy(async () => {\n- return {default: };\n- });\n-\n- function ReplayError() {\n- if (prerendering) {\n- return ;\n- }\n- if (ssr) {\n- throw new Error('replay error');\n- }\n- return 'Hello';\n- }\n-\n- function App() {\n- return (\n-

\n- \n- \n- <\/Suspense>\n- \n- \n- {lazyPostponeAndError}<\/Suspense>\n- <\/Suspense>\n- \n- \n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const prerenderErrors = [];\n- const prerendered = await ReactDOMFizzStatic.prerenderToNodeStream(\n- ,\n- {\n- onError(x) {\n- prerenderErrors.push(x.message);\n- },\n- },\n+ expect(getVisibleChildren(container)).toEqual(\n+

\n+

\n+ Loading again...<\/span>\n+ <\/p>\n+

\n+ Loading again too...<\/span>\n+ <\/p>\n+ <\/div>,\n );\n- expect(prerendered.postponed).not.toBe(null);\n \n prerendering = false;\n \n- const ssrErrors = [];\n-\n- const resumed = ReactDOMFizzServer.resumeToPipeableStream(\n+ errors.length = 0;\n+ const resumed = await ReactDOMFizzServer.resumeToPipeableStream(\n ,\n JSON.parse(JSON.stringify(prerendered.postponed)),\n {\n- onError(x) {\n- ssrErrors.push(x.message);\n- },\n+ onError,\n },\n );\n \n- \/\/ Create a separate stream so it doesn't close the writable. I.e. simple concat.\n- const preludeWritable = new Stream.PassThrough();\n- preludeWritable.setEncoding('utf8');\n- preludeWritable.on('data', chunk => {\n- writable.write(chunk);\n- });\n-\n- await act(() => {\n- prerendered.prelude.pipe(preludeWritable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Loading1'}\n- {'Loading2'}\n- {'Loading4'}\n- <\/div>,\n- );\n-\n await act(() => {\n resumed.pipe(writable);\n });\n \n- expect(prerenderErrors).toEqual([]);\n-\n- expect(ssrErrors).toEqual(['server error', 'server error', 'replay error']);\n-\n- \/\/ Still loading...\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Loading1'}\n- {'Hello'}\n- {'Loading3'}\n- {'Loading4'}\n- <\/div>,\n- );\n-\n- const recoverableErrors = [];\n-\n- ssr = false;\n-\n- await clientAct(() => {\n- ReactDOMClient.hydrateRoot(container, , {\n- onRecoverableError(x) {\n- recoverableErrors.push(x.message);\n- },\n- });\n- });\n-\n- expect(recoverableErrors).toEqual(\n- __DEV__\n- ? [\n- 'Switched to client rendering because the server rendering errored:\\n\\n' +\n- 'server error',\n- 'Switched to client rendering because the server rendering errored:\\n\\n' +\n- 'replay error',\n- 'Switched to client rendering because the server rendering errored:\\n\\n' +\n- 'server error',\n- ]\n- : [\n- 'The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering.',\n- 'The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering.',\n- 'The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering.',\n- ],\n- );\n+ expect(errors).toEqual([]);\n expect(getVisibleChildren(container)).toEqual(\n

\n- {'Hello'}\n- {'Hello'}\n- {'Hello'}\n- {'Hello'}\n+

\n+ Hello<\/span>\n+ <\/p>\n+

\n+ Hello<\/span>\n+ <\/p>\n <\/div>,\n );\n });\n \n- \/\/ @gate enablePostpone\n- it('client renders a component if we abort before resuming', async () => {\n- let prerendering = true;\n- let ssr = true;\n- const promise = new Promise(() => {});\n- function PostponeAndSuspend() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- if (ssr) {\n- React.use(promise);\n- }\n- return 'Hello';\n- }\n-\n- function Postpone() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return 'Hello';\n- }\n-\n- function DelayedBoundary() {\n- if (!prerendering && ssr) {\n- \/\/ We delay discovery of the boundary so we can abort before finding it.\n- React.use(promise);\n- }\n- return (\n- \n- \n- <\/Suspense>\n- );\n- }\n-\n- function App() {\n- return (\n-

\n- \n- \n- <\/Suspense>\n- \n- \n- <\/Suspense>\n- \n- \n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const prerenderErrors = [];\n- const prerendered = await ReactDOMFizzStatic.prerenderToNodeStream(\n- ,\n- {\n- onError(x) {\n- prerenderErrors.push(x.message);\n- },\n- },\n- );\n- expect(prerendered.postponed).not.toBe(null);\n-\n- prerendering = false;\n-\n- const ssrErrors = [];\n-\n- const resumed = ReactDOMFizzServer.resumeToPipeableStream(\n- ,\n- JSON.parse(JSON.stringify(prerendered.postponed)),\n- {\n- onError(x) {\n- ssrErrors.push(x.message);\n- },\n- },\n- );\n-\n- \/\/ Create a separate stream so it doesn't close the writable. I.e. simple concat.\n- const preludeWritable = new Stream.PassThrough();\n- preludeWritable.setEncoding('utf8');\n- preludeWritable.on('data', chunk => {\n- writable.write(chunk);\n- });\n-\n- await act(() => {\n- prerendered.prelude.pipe(preludeWritable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Loading1'}\n- {'Loading2'}\n- {'Loading3'}\n- <\/div>,\n- );\n-\n- await act(() => {\n- resumed.pipe(writable);\n- });\n-\n- const recoverableErrors = [];\n-\n- ssr = false;\n-\n- await clientAct(() => {\n- ReactDOMClient.hydrateRoot(container, , {\n- onRecoverableError(x) {\n- recoverableErrors.push(x.message);\n- },\n- });\n- });\n-\n- expect(recoverableErrors).toEqual([]);\n- expect(prerenderErrors).toEqual([]);\n- expect(ssrErrors).toEqual([]);\n-\n- \/\/ Still loading...\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Loading1'}\n- {\/*\n- This used to show \"Hello\" in this slot because the boundary was able to be flushed\n- early but we now prevent flushing while pendingRootTasks is not zero. This is how Edge\n- would work anyway because you don't get the stream until the root is unblocked on a resume\n- so Node now aligns with edge bevavior\n- {'Hello'}\n- *\/}\n- {'Loading2'}\n- {'Loading3'}\n- <\/div>,\n- );\n-\n- await clientAct(async () => {\n- await act(() => {\n- resumed.abort(new Error('aborted'));\n- });\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Hello'}\n- {'Hello'}\n- {'Hello'}\n- <\/div>,\n- );\n-\n- expect(prerenderErrors).toEqual([]);\n- expect(ssrErrors).toEqual(['aborted', 'aborted']);\n- expect(recoverableErrors).toEqual(\n- __DEV__\n- ? [\n- 'Switched to client rendering because the server rendering aborted due to:\\n\\n' +\n- 'aborted',\n- 'Switched to client rendering because the server rendering aborted due to:\\n\\n' +\n- 'aborted',\n- ]\n- : [\n- 'The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering.',\n- 'The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering.',\n- ],\n- );\n- });\n-\n- \/\/ @gate enablePostpone\n- it('client renders remaining boundaries below the error in shell', async () => {\n- let prerendering = true;\n- let ssr = true;\n- function Postpone() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return 'Hello';\n- }\n-\n- function ReplayError({children}) {\n- if (!prerendering && ssr) {\n- throw new Error('replay error');\n- }\n- return children;\n- }\n-\n- function App() {\n- return (\n-

\n-

\n- \n- \n- <\/Suspense>\n- \n- \n- \n- <\/Suspense>\n- <\/ReplayError>\n- \n- \n- <\/Suspense>\n- <\/div>\n- \n-

\n- \n- \n- <\/Suspense>\n- <\/div>\n- <\/Suspense>\n- \n- \n- \n- \n- \n- <\/Suspense>\n- <\/ReplayError>\n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const prerenderErrors = [];\n- const prerendered = await ReactDOMFizzStatic.prerenderToNodeStream(\n- ,\n- {\n- onError(x) {\n- prerenderErrors.push(x.message);\n- },\n- },\n- );\n- expect(prerendered.postponed).not.toBe(null);\n-\n- prerendering = false;\n-\n- const ssrErrors = [];\n-\n- const resumed = ReactDOMFizzServer.resumeToPipeableStream(\n- ,\n- JSON.parse(JSON.stringify(prerendered.postponed)),\n- {\n- onError(x) {\n- ssrErrors.push(x.message);\n- },\n- },\n- );\n-\n- \/\/ Create a separate stream so it doesn't close the writable. I.e. simple concat.\n- const preludeWritable = new Stream.PassThrough();\n- preludeWritable.setEncoding('utf8');\n- preludeWritable.on('data', chunk => {\n- writable.write(chunk);\n- });\n-\n- await act(() => {\n- prerendered.prelude.pipe(preludeWritable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- {'Loading1'}\n- {'Loading2'}\n- {'Loading3'}\n- <\/div>\n-

{'Loading4'}<\/div>\n- {'Loading5'}\n- <\/div>,\n- );\n-\n- await act(() => {\n- resumed.pipe(writable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- {'Hello' \/* This was matched and completed before the error *\/}\n- {\n- 'Loading2' \/* This will be client rendered because its parent errored during replay *\/\n- }\n- {\n- 'Hello' \/* This should be renderable since we matched which previous sibling errored *\/\n- }\n- <\/div>\n-

\n- {\n- 'Hello' \/* This should be able to resume because it's in a different parent. *\/\n- }\n- <\/div>\n- {'Hello'}\n- {'Loading6' \/* The parent could resolve even if the child didn't *\/}\n- <\/div>,\n- );\n-\n- const recoverableErrors = [];\n-\n- ssr = false;\n-\n- await clientAct(() => {\n- ReactDOMClient.hydrateRoot(container, , {\n- onRecoverableError(x) {\n- recoverableErrors.push(x.message);\n- },\n- });\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- {'Hello'}\n- {'Hello'}\n- {'Hello'}\n- <\/div>\n-

{'Hello'}<\/div>\n- {'Hello'}\n- {'Hello'}\n- <\/div>,\n- );\n-\n- \/\/ We should've logged once for each boundary that this affected.\n- expect(prerenderErrors).toEqual([]);\n- expect(ssrErrors).toEqual([\n- \/\/ This error triggered in two replay components.\n- 'replay error',\n- 'replay error',\n- ]);\n- expect(recoverableErrors).toEqual(\n- \/\/ It surfaced in two different suspense boundaries.\n- __DEV__\n- ? [\n- 'Switched to client rendering because the server rendering errored:\\n\\n' +\n- 'replay error',\n- 'Switched to client rendering because the server rendering errored:\\n\\n' +\n- 'replay error',\n- ]\n- : [\n- 'The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering.',\n- 'The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering.',\n- ],\n- );\n- });\n-\n- \/\/ @gate enablePostpone\n- it('can client render a boundary after having already postponed', async () => {\n- let prerendering = true;\n- let ssr = true;\n-\n- function Postpone() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return 'Hello';\n- }\n-\n- function ServerError() {\n- if (ssr) {\n- throw new Error('server error');\n- }\n- return 'World';\n- }\n-\n- function App() {\n- return (\n-

\n- \n- \n- \n- <\/Suspense>\n- \n- \n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const prerenderErrors = [];\n- const prerendered = await ReactDOMFizzStatic.prerenderToNodeStream(\n- ,\n- {\n- onError(x) {\n- prerenderErrors.push(x.message);\n- },\n- },\n- );\n- expect(prerendered.postponed).not.toBe(null);\n-\n- prerendering = false;\n-\n- const ssrErrors = [];\n-\n- const resumed = ReactDOMFizzServer.resumeToPipeableStream(\n- ,\n- JSON.parse(JSON.stringify(prerendered.postponed)),\n- {\n- onError(x) {\n- ssrErrors.push(x.message);\n- },\n- },\n- );\n-\n- const windowErrors = [];\n- function globalError(e) {\n- windowErrors.push(e.message);\n- }\n- window.addEventListener('error', globalError);\n-\n- \/\/ Create a separate stream so it doesn't close the writable. I.e. simple concat.\n- const preludeWritable = new Stream.PassThrough();\n- preludeWritable.setEncoding('utf8');\n- preludeWritable.on('data', chunk => {\n- writable.write(chunk);\n- });\n-\n- await act(() => {\n- prerendered.prelude.pipe(preludeWritable);\n- });\n-\n- expect(windowErrors).toEqual([]);\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Loading1'}\n- {'Loading2'}\n- <\/div>,\n- );\n-\n- await act(() => {\n- resumed.pipe(writable);\n- });\n-\n- expect(prerenderErrors).toEqual(['server error']);\n-\n- \/\/ Since this errored, we shouldn't have to replay it.\n- expect(ssrErrors).toEqual([]);\n-\n- expect(windowErrors).toEqual([]);\n-\n- \/\/ Still loading...\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Loading1'}\n- {'Hello'}\n- <\/div>,\n- );\n-\n- const recoverableErrors = [];\n-\n- ssr = false;\n-\n- await clientAct(() => {\n- ReactDOMClient.hydrateRoot(container, , {\n- onRecoverableError(x) {\n- recoverableErrors.push(x.message);\n- },\n- });\n- });\n-\n- expect(recoverableErrors).toEqual(\n- __DEV__\n- ? [\n- 'Switched to client rendering because the server rendering errored:\\n\\n' +\n- 'server error',\n- ]\n- : [\n- 'The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering.',\n- ],\n- );\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Hello'}\n- {'World'}\n- {'Hello'}\n- <\/div>,\n- );\n-\n- expect(windowErrors).toEqual([]);\n-\n- window.removeEventListener('error', globalError);\n- });\n-\n- \/\/ @gate enablePostpone\n- it('can postpone in fallback', async () => {\n- let prerendering = true;\n- function Postpone() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return 'Hello';\n- }\n-\n- let resolve;\n- const promise = new Promise(r => (resolve = r));\n-\n- function PostponeAndDelay() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return React.use(promise);\n- }\n-\n- const Lazy = React.lazy(async () => {\n- await 0;\n- return {default: Postpone};\n- });\n-\n- function App() {\n- return (\n-

\n- \n- }>\n- World\n- <\/Suspense>\n- }>\n- \n- <\/Suspense>\n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const prerendered = await ReactDOMFizzStatic.prerenderToNodeStream();\n- expect(prerendered.postponed).not.toBe(null);\n-\n- prerendering = false;\n-\n- \/\/ Create a separate stream so it doesn't close the writable. I.e. simple concat.\n- const preludeWritable = new Stream.PassThrough();\n- preludeWritable.setEncoding('utf8');\n- preludeWritable.on('data', chunk => {\n- writable.write(chunk);\n- });\n-\n- await act(() => {\n- prerendered.prelude.pipe(preludeWritable);\n- });\n-\n- const resumed = await ReactDOMFizzServer.resumeToPipeableStream(\n- ,\n- JSON.parse(JSON.stringify(prerendered.postponed)),\n- );\n-\n- expect(getVisibleChildren(container)).toEqual(

Outer<\/div>);\n-\n- \/\/ Read what we've completed so far\n- await act(() => {\n- resumed.pipe(writable);\n- });\n-\n- \/\/ Should have now resolved the postponed loading state, but not the promise\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Hello'}\n- {'Hello'}\n- <\/div>,\n- );\n-\n- \/\/ Resolve the final promise\n- await act(() => {\n- resolve('Hi');\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n- {'Hi'}\n- {' World'}\n- {'Hello'}\n- <\/div>,\n- );\n- });\n-\n- \/\/ @gate enablePostpone\n- it('can discover new suspense boundaries in the resume', async () => {\n- let prerendering = true;\n- let resolveA;\n- const promiseA = new Promise(r => (resolveA = r));\n- let resolveB;\n- const promiseB = new Promise(r => (resolveB = r));\n-\n- function WaitA() {\n- return React.use(promiseA);\n- }\n- function WaitB() {\n- return React.use(promiseB);\n- }\n- function Postpone() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return (\n- \n- \n- \n- <\/Suspense>\n- \n- <\/span>\n- );\n- }\n-\n- function App() {\n- return (\n-

\n- \n-

Loading...<\/div>);\n-\n- \/\/ Read what we've completed so far\n- await act(() => {\n- resumed.pipe(writable);\n- });\n-\n- \/\/ Still blocked\n- expect(getVisibleChildren(container)).toEqual(

Loading...<\/div>);\n-\n- \/\/ Resolve the first promise, this unblocks the inner boundary\n- await act(() => {\n- resolveA('Hello');\n- });\n-\n- \/\/ Still blocked\n- expect(getVisibleChildren(container)).toEqual(

Loading...<\/div>);\n-\n- \/\/ Resolve the second promise, this unblocks the outer boundary\n- await act(() => {\n- resolveB('World');\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- \n- {'Hello'}\n- {'World'}\n- <\/span>\n- <\/p>\n- <\/div>,\n- );\n- });\n-\n- \/\/ @gate enablePostpone\n- it('does not call onError when you abort with a postpone instance during prerender', async () => {\n- const promise = new Promise(r => {});\n-\n- function Wait() {\n- return React.use(promise);\n- }\n-\n- function App() {\n- return (\n-

\n- \n-

\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- <\/p>\n-

\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- <\/p>\n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- let postponeInstance;\n- try {\n- React.unstable_postpone('manufactured');\n- } catch (p) {\n- postponeInstance = p;\n- }\n-\n- const controller = new AbortController();\n- const signal = controller.signal;\n-\n- const errors = [];\n- function onError(error) {\n- errors.push(error);\n- }\n- const postpones = [];\n- function onPostpone(reason) {\n- postpones.push(reason);\n- }\n- let pendingPrerender;\n- await act(() => {\n- pendingPrerender = ReactDOMFizzStatic.prerenderToNodeStream(, {\n- signal,\n- onError,\n- onPostpone,\n- });\n- });\n- controller.abort(postponeInstance);\n-\n- const prerendered = await pendingPrerender;\n-\n- expect(errors).toEqual([]);\n- expect(postpones).toEqual(['manufactured', 'manufactured']);\n-\n- await act(() => {\n- prerendered.prelude.pipe(writable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- Loading again...<\/span>\n- <\/p>\n-

\n- Loading again too...<\/span>\n- <\/p>\n- <\/div>,\n- );\n- });\n-\n- \/\/ @gate enableHalt\n- it('can resume a prerender that was aborted', async () => {\n- const promise = new Promise(r => {});\n-\n- let prerendering = true;\n-\n- function Wait() {\n- if (prerendering) {\n- return React.use(promise);\n- } else {\n- return 'Hello';\n- }\n- }\n-\n- function App() {\n- return (\n-

\n- \n-

\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- <\/p>\n-

\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- <\/p>\n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const controller = new AbortController();\n- const signal = controller.signal;\n-\n- const errors = [];\n- function onError(error) {\n- errors.push(error);\n- }\n- let pendingPrerender;\n- await act(() => {\n- pendingPrerender = ReactDOMFizzStatic.prerenderToNodeStream(, {\n- signal,\n- onError,\n- });\n- });\n- controller.abort('boom');\n-\n- const prerendered = await pendingPrerender;\n-\n- expect(errors).toEqual(['boom', 'boom']);\n-\n- const preludeWritable = new Stream.PassThrough();\n- preludeWritable.setEncoding('utf8');\n- preludeWritable.on('data', chunk => {\n- writable.write(chunk);\n- });\n-\n- await act(() => {\n- prerendered.prelude.pipe(preludeWritable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- Loading again...<\/span>\n- <\/p>\n-

\n- Loading again too...<\/span>\n- <\/p>\n- <\/div>,\n- );\n-\n- prerendering = false;\n-\n- errors.length = 0;\n- const resumed = await ReactDOMFizzServer.resumeToPipeableStream(\n- ,\n- JSON.parse(JSON.stringify(prerendered.postponed)),\n- {\n- onError,\n- },\n- );\n-\n- await act(() => {\n- resumed.pipe(writable);\n- });\n-\n- expect(errors).toEqual([]);\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- Hello<\/span>\n- <\/p>\n-

\n- Hello<\/span>\n- <\/p>\n- <\/div>,\n- );\n- });\n-\n- \/\/ @gate enablePostpone\n- it('does not call onError when you abort with a postpone instance during resume', async () => {\n- let prerendering = true;\n- const promise = new Promise(r => {});\n-\n- function Wait() {\n- return React.use(promise);\n- }\n- function Postpone() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return (\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- );\n- }\n-\n- function App() {\n- return (\n-

\n- \n-

\n- \n- <\/p>\n-

Loading...<\/div>);\n-\n- let postponeInstance;\n- try {\n- React.unstable_postpone('manufactured');\n- } catch (p) {\n- postponeInstance = p;\n- }\n-\n- const errors = [];\n- function onError(error) {\n- errors.push(error);\n- }\n- const postpones = [];\n- function onPostpone(reason) {\n- postpones.push(reason);\n- }\n-\n- prerendering = false;\n-\n- const resumed = await ReactDOMFizzServer.resumeToPipeableStream(\n- ,\n- JSON.parse(JSON.stringify(prerendered.postponed)),\n- {\n- onError,\n- onPostpone,\n- },\n- );\n-\n- await act(() => {\n- resumed.pipe(writable);\n- });\n- await act(() => {\n- resumed.abort(postponeInstance);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- Loading again...<\/span>\n- <\/p>\n-

\n- \n-

\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- <\/p>\n-

\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- <\/p>\n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const errors = [];\n- function onError(error) {\n- errors.push(error);\n- }\n- const postpones = [];\n- function onPostpone(reason) {\n- postpones.push(reason);\n- }\n- const result = await renderToPipeableStream(, {onError, onPostpone});\n- await act(() => {\n- result.pipe(writable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- Loading again...<\/span>\n- <\/p>\n-

\n- Loading again...<\/span>\n- <\/p>\n- <\/div>,\n- );\n-\n- let postponeInstance;\n- try {\n- React.unstable_postpone('manufactured');\n- } catch (p) {\n- postponeInstance = p;\n- }\n- await act(() => {\n- result.abort(postponeInstance);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(\n-

\n-

\n- Loading again...<\/span>\n- <\/p>\n-

\n- Loading again...<\/span>\n- <\/p>\n- <\/div>,\n- );\n-\n- expect(errors).toEqual([]);\n- expect(postpones).toEqual(['manufactured', 'manufactured']);\n- });\n-\n- \/\/ @gate enablePostpone\n- it('fatally errors if you abort with a postpone in the shell during resume', async () => {\n- let prerendering = true;\n- const promise = new Promise(r => {});\n-\n- function Wait() {\n- return React.use(promise);\n- }\n- function Postpone() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return (\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- );\n- }\n-\n- function PostponeInShell() {\n- if (prerendering) {\n- React.unstable_postpone();\n- }\n- return in shell<\/span>;\n- }\n-\n- function App() {\n- return (\n-

\n- \n- \n-

\n- \n- <\/p>\n-

\n- \n- <\/p>\n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const prerendered = await ReactDOMFizzStatic.prerenderToNodeStream();\n- expect(prerendered.postponed).not.toBe(null);\n-\n- prerendering = false;\n-\n- \/\/ Create a separate stream so it doesn't close the writable. I.e. simple concat.\n- const preludeWritable = new Stream.PassThrough();\n- preludeWritable.setEncoding('utf8');\n- preludeWritable.on('data', chunk => {\n- writable.write(chunk);\n- });\n-\n- await act(() => {\n- prerendered.prelude.pipe(preludeWritable);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(undefined);\n-\n- let postponeInstance;\n- try {\n- React.unstable_postpone('manufactured');\n- } catch (p) {\n- postponeInstance = p;\n- }\n-\n- const errors = [];\n- function onError(error) {\n- errors.push(error);\n- }\n- const shellErrors = [];\n- function onShellError(error) {\n- shellErrors.push(error);\n- }\n- const postpones = [];\n- function onPostpone(reason) {\n- postpones.push(reason);\n- }\n-\n- prerendering = false;\n-\n- const resumed = ReactDOMFizzServer.resumeToPipeableStream(\n- ,\n- JSON.parse(JSON.stringify(prerendered.postponed)),\n- {\n- onError,\n- onShellError,\n- onPostpone,\n- },\n- );\n- await act(() => {\n- resumed.abort(postponeInstance);\n- });\n- expect(errors).toEqual([\n- new Error(\n- 'The render was aborted with postpone when the shell is incomplete. Reason: manufactured',\n- ),\n- ]);\n- expect(shellErrors).toEqual([\n- new Error(\n- 'The render was aborted with postpone when the shell is incomplete. Reason: manufactured',\n- ),\n- ]);\n- expect(postpones).toEqual([]);\n- });\n-\n- \/\/ @gate enablePostpone\n- it('fatally errors if you abort with a postpone in the shell during render', async () => {\n- const promise = new Promise(r => {});\n-\n- function Wait() {\n- return React.use(promise);\n- }\n-\n- function App() {\n- return (\n-

\n- \n-

\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- <\/p>\n-

\n- \n- \n- \n- <\/Suspense>\n- <\/span>\n- <\/p>\n- <\/Suspense>\n- <\/div>\n- );\n- }\n-\n- const errors = [];\n- function onError(error) {\n- errors.push(error);\n- }\n- const shellErrors = [];\n- function onShellError(error) {\n- shellErrors.push(error);\n- }\n- const postpones = [];\n- function onPostpone(reason) {\n- postpones.push(reason);\n- }\n- const result = renderToPipeableStream(, {\n- onError,\n- onShellError,\n- onPostpone,\n- });\n-\n- let postponeInstance;\n- try {\n- React.unstable_postpone('manufactured');\n- } catch (p) {\n- postponeInstance = p;\n- }\n- await act(() => {\n- result.abort(postponeInstance);\n- });\n-\n- expect(getVisibleChildren(container)).toEqual(undefined);\n-\n- expect(errors).toEqual([\n- new Error(\n- 'The render was aborted with postpone when the shell is incomplete. Reason: manufactured',\n- ),\n- ]);\n- expect(shellErrors).toEqual([\n- new Error(\n- 'The render was aborted with postpone when the shell is incomplete. Reason: manufactured',\n- ),\n- ]);\n- expect(postpones).toEqual([]);\n- });\n-\n it('should NOT warn for using generator functions as components', async () => {\n function* Foo() {\n yield

Hello<\/h1>;\ndiff --git a\/packages\/react-dom\/src\/tests\/ReactDOMFizzServerBrowser-test.js b\/packages\/react-dom\/src\/tests\/ReactDOMFizzServerBrowser-test.js\nindex bc96750d46..27e74750c4 100644\n--- a\/packages\/react-dom\/src\/tests\/ReactDOMFizzServerBrowser-test.js\n+++ b\/packages\/react-dom\/src\/tests\/ReactDOMFizzServerBrowser-test.js\n@@ -551,45 +551,4 @@ describe('ReactDOMFizzServerBrowser', () => {\n `\"
hello world<\/div>

dillon1000/react

Files changed