{"patch":"diff --git a\/packages\/react-dom\/npm\/server.browser.js b\/packages\/react-dom\/npm\/server.browser.js\nindex 947e981ffd..4627357ca7 100644\n--- a\/packages\/react-dom\/npm\/server.browser.js\n+++ b\/packages\/react-dom\/npm\/server.browser.js\n@@ -12,7 +12,6 @@ if (process.env.NODE_ENV === 'production') {\n exports.version = l.version;\n exports.renderToString = l.renderToString;\n exports.renderToStaticMarkup = l.renderToStaticMarkup;\n-exports.renderToNodeStream = l.renderToNodeStream;\n exports.renderToStaticNodeStream = l.renderToStaticNodeStream;\n exports.renderToReadableStream = s.renderToReadableStream;\n if (s.resume) {\ndiff --git a\/packages\/react-dom\/npm\/server.bun.js b\/packages\/react-dom\/npm\/server.bun.js\nindex adbc56adec..cd45f7d7f1 100644\n--- a\/packages\/react-dom\/npm\/server.bun.js\n+++ b\/packages\/react-dom\/npm\/server.bun.js\n@@ -15,7 +15,6 @@ exports.renderToReadableStream = b.renderToReadableStream;\n if (b.resume) {\n exports.resume = b.resume;\n }\n-exports.renderToNodeStream = b.renderToNodeStream;\n exports.renderToStaticNodeStream = b.renderToStaticNodeStream;\n exports.renderToString = l.renderToString;\n exports.renderToStaticMarkup = l.renderToStaticMarkup;\ndiff --git a\/packages\/react-dom\/npm\/server.edge.js b\/packages\/react-dom\/npm\/server.edge.js\nindex ced0fa7a4e..c71b3ee805 100644\n--- a\/packages\/react-dom\/npm\/server.edge.js\n+++ b\/packages\/react-dom\/npm\/server.edge.js\n@@ -12,7 +12,6 @@ if (process.env.NODE_ENV === 'production') {\n \n exports.version = b.version;\n exports.renderToReadableStream = b.renderToReadableStream;\n-exports.renderToNodeStream = b.renderToNodeStream;\n exports.renderToStaticNodeStream = b.renderToStaticNodeStream;\n exports.renderToString = l.renderToString;\n exports.renderToStaticMarkup = l.renderToStaticMarkup;\ndiff --git a\/packages\/react-dom\/npm\/server.node.js b\/packages\/react-dom\/npm\/server.node.js\nindex 6e48652e41..9aed61fffb 100644\n--- a\/packages\/react-dom\/npm\/server.node.js\n+++ b\/packages\/react-dom\/npm\/server.node.js\n@@ -12,7 +12,6 @@ if (process.env.NODE_ENV === 'production') {\n exports.version = l.version;\n exports.renderToString = l.renderToString;\n exports.renderToStaticMarkup = l.renderToStaticMarkup;\n-exports.renderToNodeStream = l.renderToNodeStream;\n exports.renderToStaticNodeStream = l.renderToStaticNodeStream;\n exports.renderToPipeableStream = s.renderToPipeableStream;\n if (s.resumeToPipeableStream) {\ndiff --git a\/packages\/react-dom\/server.browser.js b\/packages\/react-dom\/server.browser.js\nindex f617e7ec7e..490bc81504 100644\n--- a\/packages\/react-dom\/server.browser.js\n+++ b\/packages\/react-dom\/server.browser.js\n@@ -23,12 +23,6 @@ export function renderToStaticMarkup() {\n arguments,\n );\n }\n-export function renderToNodeStream() {\n- return require('.\/src\/server\/ReactDOMLegacyServerBrowser').renderToNodeStream.apply(\n- this,\n- arguments,\n- );\n-}\n export function renderToStaticNodeStream() {\n return require('.\/src\/server\/ReactDOMLegacyServerBrowser').renderToStaticNodeStream.apply(\n this,\ndiff --git a\/packages\/react-dom\/server.bun.js b\/packages\/react-dom\/server.bun.js\nindex 0776c4a85b..8e868a8621 100644\n--- a\/packages\/react-dom\/server.bun.js\n+++ b\/packages\/react-dom\/server.bun.js\n@@ -18,13 +18,6 @@ export function renderToReadableStream() {\n );\n }\n \n-export function renderToNodeStream() {\n- return require('.\/src\/server\/react-dom-server.bun').renderToNodeStream.apply(\n- this,\n- arguments,\n- );\n-}\n-\n export function renderToStaticNodeStream() {\n return require('.\/src\/server\/react-dom-server.bun').renderToStaticNodeStream.apply(\n this,\ndiff --git a\/packages\/react-dom\/server.edge.js b\/packages\/react-dom\/server.edge.js\nindex a48e6c7e0a..d5a0ce6eb4 100644\n--- a\/packages\/react-dom\/server.edge.js\n+++ b\/packages\/react-dom\/server.edge.js\n@@ -18,13 +18,6 @@ export function renderToReadableStream() {\n );\n }\n \n-export function renderToNodeStream() {\n- return require('.\/src\/server\/react-dom-server.edge').renderToNodeStream.apply(\n- this,\n- arguments,\n- );\n-}\n-\n export function renderToStaticNodeStream() {\n return require('.\/src\/server\/react-dom-server.edge').renderToStaticNodeStream.apply(\n this,\ndiff --git a\/packages\/react-dom\/server.node.js b\/packages\/react-dom\/server.node.js\nindex d0e403eaf8..acdaa234f3 100644\n--- a\/packages\/react-dom\/server.node.js\n+++ b\/packages\/react-dom\/server.node.js\n@@ -23,12 +23,6 @@ export function renderToStaticMarkup() {\n arguments,\n );\n }\n-export function renderToNodeStream() {\n- return require('.\/src\/server\/ReactDOMLegacyServerNode').renderToNodeStream.apply(\n- this,\n- arguments,\n- );\n-}\n export function renderToStaticNodeStream() {\n return require('.\/src\/server\/ReactDOMLegacyServerNode').renderToStaticNodeStream.apply(\n this,\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js\nindex 58af90bce3..df4deff9e2 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js\n@@ -338,24 +338,12 @@ describe('ReactDOMServerIntegration', () => {\n <\/LoggedInUser.Provider>\n );\n \n- let streamAmy;\n- let streamBob;\n- expect(() => {\n- streamAmy = ReactDOMServer.renderToNodeStream(\n- AppWithUser('Amy'),\n- ).setEncoding('utf8');\n- }).toErrorDev(\n- 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.',\n- {withoutStack: true},\n- );\n- expect(() => {\n- streamBob = ReactDOMServer.renderToNodeStream(\n- AppWithUser('Bob'),\n- ).setEncoding('utf8');\n- }).toErrorDev(\n- 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.',\n- {withoutStack: true},\n- );\n+ const streamAmy = ReactDOMServer.renderToStaticNodeStream(\n+ AppWithUser('Amy'),\n+ ).setEncoding('utf8');\n+ const streamBob = ReactDOMServer.renderToStaticNodeStream(\n+ AppWithUser('Bob'),\n+ ).setEncoding('utf8');\n \n \/\/ Testing by filling the buffer using internal _read() with a small\n \/\/ number of bytes to avoid a test case which needs to align to a\n@@ -390,14 +378,9 @@ describe('ReactDOMServerIntegration', () => {\n const streamCount = 34;\n \n for (let i = 0; i < streamCount; i++) {\n- expect(() => {\n- streams[i] = ReactDOMServer.renderToNodeStream(\n- NthRender(i % 2 === 0 ? 'Expected to be recreated' : i),\n- ).setEncoding('utf8');\n- }).toErrorDev(\n- 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.',\n- {withoutStack: true},\n- );\n+ streams[i] = ReactDOMServer.renderToStaticNodeStream(\n+ NthRender(i % 2 === 0 ? 'Expected to be recreated' : i),\n+ ).setEncoding('utf8');\n }\n \n \/\/ Testing by filling the buffer using internal _read() with a small\n@@ -414,14 +397,9 @@ describe('ReactDOMServerIntegration', () => {\n \n \/\/ Recreate those same streams.\n for (let i = 0; i < streamCount; i += 2) {\n- expect(() => {\n- streams[i] = ReactDOMServer.renderToNodeStream(\n- NthRender(i),\n- ).setEncoding('utf8');\n- }).toErrorDev(\n- 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.',\n- {withoutStack: true},\n- );\n+ streams[i] = ReactDOMServer.renderToStaticNodeStream(\n+ NthRender(i),\n+ ).setEncoding('utf8');\n }\n \n \/\/ Read a bit from all streams again.\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js b\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\nindex ec962ef8ba..bd70b81d2a 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\n@@ -578,74 +578,6 @@ describe('ReactDOMServer', () => {\n });\n });\n \n- describe('renderToNodeStream', () => {\n- it('should generate simple markup', () => {\n- const SuccessfulElement = React.createElement(() => );\n- let response;\n- expect(() => {\n- response = ReactDOMServer.renderToNodeStream(SuccessfulElement);\n- }).toErrorDev(\n- 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.',\n- {withoutStack: true},\n- );\n- expect(response.read().toString()).toMatch(new RegExp(''));\n- });\n-\n- it('should handle errors correctly', () => {\n- const FailingElement = React.createElement(() => {\n- throw new Error('An Error');\n- });\n- let response;\n- expect(() => {\n- response = ReactDOMServer.renderToNodeStream(FailingElement);\n- }).toErrorDev(\n- 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.',\n- {withoutStack: true},\n- );\n- return new Promise(resolve => {\n- response.once('error', () => {\n- resolve();\n- });\n- expect(response.read()).toBeNull();\n- });\n- });\n-\n- it('should refer users to new apis when using suspense', async () => {\n- let resolve = null;\n- const promise = new Promise(res => {\n- resolve = () => {\n- resolved = true;\n- res();\n- };\n- });\n- let resolved = false;\n- function Suspender() {\n- if (resolved) {\n- return 'resolved';\n- }\n- throw promise;\n- }\n-\n- let response;\n- expect(() => {\n- response = ReactDOMServer.renderToNodeStream(\n-

\n- \n- \n- <\/React.Suspense>\n- <\/div>,\n- );\n- }).toErrorDev(\n- 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.',\n- {withoutStack: true},\n- );\n- await resolve();\n- expect(response.read().toString()).toEqual(\n- '

resolved<\/div>',\n- );\n- });\n- });\n-\n describe('renderToStaticNodeStream', () => {\n it('should generate simple markup', () => {\n const SuccessfulElement = React.createElement(() => );\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactServerRenderingBrowser-test.js b\/packages\/react-dom\/src\/__tests__\/ReactServerRenderingBrowser-test.js\nindex e99bc4904d..bfcb32f4f8 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactServerRenderingBrowser-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactServerRenderingBrowser-test.js\n@@ -45,17 +45,4 @@ describe('ReactServerRenderingBrowser', () => {\n ReactDOMServer.renderToStaticMarkup(),\n );\n });\n-\n- it('throws meaningfully for server-only APIs', () => {\n- expect(() => ReactDOMServerBrowser.renderToNodeStream(

)).toThrow(\n- 'ReactDOMServer.renderToNodeStream(): The streaming API is not available ' +\n- 'in the browser. Use ReactDOMServer.renderToString() instead.',\n- );\n- expect(() =>\n- ReactDOMServerBrowser.renderToStaticNodeStream(

),\n- ).toThrow(\n- 'ReactDOMServer.renderToStaticNodeStream(): The streaming API is not available ' +\n- 'in the browser. Use ReactDOMServer.renderToStaticMarkup() instead.',\n- );\n- });\n });\ndiff --git a\/packages\/react-dom\/src\/server\/ReactDOMFizzServerBun.js b\/packages\/react-dom\/src\/server\/ReactDOMFizzServerBun.js\nindex ffe29f22ed..bc0206cdc8 100644\n--- a\/packages\/react-dom\/src\/server\/ReactDOMFizzServerBun.js\n+++ b\/packages\/react-dom\/src\/server\/ReactDOMFizzServerBun.js\n@@ -146,13 +146,6 @@ function renderToReadableStream(\n });\n }\n \n-function renderToNodeStream() {\n- throw new Error(\n- 'ReactDOMServer.renderToNodeStream(): The Node Stream API is not available ' +\n- 'in Bun. Use ReactDOMServer.renderToReadableStream() instead.',\n- );\n-}\n-\n function renderToStaticNodeStream() {\n throw new Error(\n 'ReactDOMServer.renderToStaticNodeStream(): The Node Stream API is not available ' +\n@@ -162,7 +155,6 @@ function renderToStaticNodeStream() {\n \n export {\n renderToReadableStream,\n- renderToNodeStream,\n renderToStaticNodeStream,\n ReactVersion as version,\n };\ndiff --git a\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerBrowser.js b\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerBrowser.js\nindex b424bef497..01fdbd8d50 100644\n--- a\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerBrowser.js\n+++ b\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerBrowser.js\n@@ -39,13 +39,6 @@ function renderToStaticMarkup(\n );\n }\n \n-function renderToNodeStream() {\n- throw new Error(\n- 'ReactDOMServer.renderToNodeStream(): The streaming API is not available ' +\n- 'in the browser. Use ReactDOMServer.renderToString() instead.',\n- );\n-}\n-\n function renderToStaticNodeStream() {\n throw new Error(\n 'ReactDOMServer.renderToStaticNodeStream(): The streaming API is not available ' +\n@@ -56,7 +49,6 @@ function renderToStaticNodeStream() {\n export {\n renderToString,\n renderToStaticMarkup,\n- renderToNodeStream,\n renderToStaticNodeStream,\n version,\n };\ndiff --git a\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerNode.js b\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerNode.js\nindex 5c56afb7e0..07765e2b74 100644\n--- a\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerNode.js\n+++ b\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerNode.js\n@@ -10,10 +10,7 @@\n import type {ReactNodeList} from 'shared\/ReactTypes';\n \n import {version, renderToStringImpl} from '.\/ReactDOMLegacyServerImpl';\n-import {\n- renderToNodeStream,\n- renderToStaticNodeStream,\n-} from '.\/ReactDOMLegacyServerNodeStream';\n+import {renderToStaticNodeStream} from '.\/ReactDOMLegacyServerNodeStream';\n \n type ServerOptions = {\n identifierPrefix?: string,\n@@ -46,7 +43,6 @@ function renderToStaticMarkup(\n export {\n renderToString,\n renderToStaticMarkup,\n- renderToNodeStream,\n renderToStaticNodeStream,\n version,\n };\ndiff --git a\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerNodeStream.js b\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerNodeStream.js\nindex 16090d9035..d34c0563a8 100644\n--- a\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerNodeStream.js\n+++ b\/packages\/react-dom\/src\/server\/ReactDOMLegacyServerNodeStream.js\n@@ -59,10 +59,9 @@ function onError() {\n \/\/ Non-fatal errors are ignored.\n }\n \n-function renderToNodeStreamImpl(\n+function renderToStaticNodeStream(\n children: ReactNodeList,\n- options: void | ServerOptions,\n- generateStaticMarkup: boolean,\n+ options?: ServerOptions,\n ): Readable {\n function onAllReady() {\n \/\/ We wait until everything has loaded before starting to write.\n@@ -78,7 +77,7 @@ function renderToNodeStreamImpl(\n const request = createRequest(\n children,\n resumableState,\n- createRenderState(resumableState, generateStaticMarkup),\n+ createRenderState(resumableState, true),\n createRootFormatContext(),\n Infinity,\n onError,\n@@ -92,23 +91,4 @@ function renderToNodeStreamImpl(\n return destination;\n }\n \n-function renderToNodeStream(\n- children: ReactNodeList,\n- options?: ServerOptions,\n-): Readable {\n- if (__DEV__) {\n- console.error(\n- 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.',\n- );\n- }\n- return renderToNodeStreamImpl(children, options, false);\n-}\n-\n-function renderToStaticNodeStream(\n- children: ReactNodeList,\n- options?: ServerOptions,\n-): Readable {\n- return renderToNodeStreamImpl(children, options, true);\n-}\n-\n-export {renderToNodeStream, renderToStaticNodeStream};\n+export {renderToStaticNodeStream};\ndiff --git a\/packages\/react-dom\/src\/server\/react-dom-server.bun.stable.js b\/packages\/react-dom\/src\/server\/react-dom-server.bun.stable.js\nindex b5c1fd02d3..74f933dcfe 100644\n--- a\/packages\/react-dom\/src\/server\/react-dom-server.bun.stable.js\n+++ b\/packages\/react-dom\/src\/server\/react-dom-server.bun.stable.js\n@@ -9,7 +9,6 @@\n \n export {\n renderToReadableStream,\n- renderToNodeStream,\n renderToStaticNodeStream,\n version,\n } from '.\/ReactDOMFizzServerBun.js';\n","parents":["2b036d3f1f016fbe8b121d223d96f09e785b97e1"],"body":"Stacked on #28606 \r\n\r\nrenderToNodeStream has been deprecated since React 18 with a warning\r\nindicating users should upgrade to renderToPipeableStream. This change\r\nremoves renderToNodeStream","files":[{"path":"packages\/react-dom\/npm\/server.browser.js","status":"M"},{"path":"packages\/react-dom\/npm\/server.bun.js","status":"M"},{"path":"packages\/react-dom\/npm\/server.edge.js","status":"M"},{"path":"packages\/react-dom\/npm\/server.node.js","status":"M"},{"path":"packages\/react-dom\/server.browser.js","status":"M"},{"path":"packages\/react-dom\/server.bun.js","status":"M"},{"path":"packages\/react-dom\/server.edge.js","status":"M"},{"path":"packages\/react-dom\/server.node.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactServerRenderingBrowser-test.js","status":"M"},{"path":"packages\/react-dom\/src\/server\/ReactDOMFizzServerBun.js","status":"M"},{"path":"packages\/react-dom\/src\/server\/ReactDOMLegacyServerBrowser.js","status":"M"},{"path":"packages\/react-dom\/src\/server\/ReactDOMLegacyServerNode.js","status":"M"},{"path":"packages\/react-dom\/src\/server\/ReactDOMLegacyServerNodeStream.js","status":"M"},{"path":"packages\/react-dom\/src\/server\/react-dom-server.bun.stable.js","status":"M"}],"commit":{"authorName":"Josh Story","authorEmail":"story@hey.com","subject":"[Fizz][Legacy] Remove renderToNodeStream (#28607)","revision":"8436bcca6287077a5409b3c9180f8af0361b16a5","authoredAt":"2024-03-27T12:02:36-07:00","shortRevision":"8436bcca62"}}

dillon1000/react

Files changed