diff --git a/packages/react-dom/npm/server.browser.js b/packages/react-dom/npm/server.browser.js index 947e981ffd6..4627357ca74 100644 --- a/packages/react-dom/npm/server.browser.js +++ b/packages/react-dom/npm/server.browser.js @@ -12,7 +12,6 @@ if (process.env.NODE_ENV === 'production') { exports.version = l.version; exports.renderToString = l.renderToString; exports.renderToStaticMarkup = l.renderToStaticMarkup; -exports.renderToNodeStream = l.renderToNodeStream; exports.renderToStaticNodeStream = l.renderToStaticNodeStream; exports.renderToReadableStream = s.renderToReadableStream; if (s.resume) { diff --git a/packages/react-dom/npm/server.bun.js b/packages/react-dom/npm/server.bun.js index adbc56adec0..cd45f7d7f1f 100644 --- a/packages/react-dom/npm/server.bun.js +++ b/packages/react-dom/npm/server.bun.js @@ -15,7 +15,6 @@ exports.renderToReadableStream = b.renderToReadableStream; if (b.resume) { exports.resume = b.resume; } -exports.renderToNodeStream = b.renderToNodeStream; exports.renderToStaticNodeStream = b.renderToStaticNodeStream; exports.renderToString = l.renderToString; exports.renderToStaticMarkup = l.renderToStaticMarkup; diff --git a/packages/react-dom/npm/server.edge.js b/packages/react-dom/npm/server.edge.js index ced0fa7a4e5..c71b3ee8059 100644 --- a/packages/react-dom/npm/server.edge.js +++ b/packages/react-dom/npm/server.edge.js @@ -12,7 +12,6 @@ if (process.env.NODE_ENV === 'production') { exports.version = b.version; exports.renderToReadableStream = b.renderToReadableStream; -exports.renderToNodeStream = b.renderToNodeStream; exports.renderToStaticNodeStream = b.renderToStaticNodeStream; exports.renderToString = l.renderToString; exports.renderToStaticMarkup = l.renderToStaticMarkup; diff --git a/packages/react-dom/npm/server.node.js b/packages/react-dom/npm/server.node.js index 6e48652e410..9aed61fffb3 100644 --- a/packages/react-dom/npm/server.node.js +++ b/packages/react-dom/npm/server.node.js @@ -12,7 +12,6 @@ if (process.env.NODE_ENV === 'production') { exports.version = l.version; exports.renderToString = l.renderToString; exports.renderToStaticMarkup = l.renderToStaticMarkup; -exports.renderToNodeStream = l.renderToNodeStream; exports.renderToStaticNodeStream = l.renderToStaticNodeStream; exports.renderToPipeableStream = s.renderToPipeableStream; if (s.resumeToPipeableStream) { diff --git a/packages/react-dom/server.browser.js b/packages/react-dom/server.browser.js index f617e7ec7e3..490bc815040 100644 --- a/packages/react-dom/server.browser.js +++ b/packages/react-dom/server.browser.js @@ -23,12 +23,6 @@ export function renderToStaticMarkup() { arguments, ); } -export function renderToNodeStream() { - return require('./src/server/ReactDOMLegacyServerBrowser').renderToNodeStream.apply( - this, - arguments, - ); -} export function renderToStaticNodeStream() { return require('./src/server/ReactDOMLegacyServerBrowser').renderToStaticNodeStream.apply( this, diff --git a/packages/react-dom/server.bun.js b/packages/react-dom/server.bun.js index 0776c4a85b0..8e868a86215 100644 --- a/packages/react-dom/server.bun.js +++ b/packages/react-dom/server.bun.js @@ -18,13 +18,6 @@ export function renderToReadableStream() { ); } -export function renderToNodeStream() { - return require('./src/server/react-dom-server.bun').renderToNodeStream.apply( - this, - arguments, - ); -} - export function renderToStaticNodeStream() { return require('./src/server/react-dom-server.bun').renderToStaticNodeStream.apply( this, diff --git a/packages/react-dom/server.edge.js b/packages/react-dom/server.edge.js index a48e6c7e0a4..d5a0ce6eb46 100644 --- a/packages/react-dom/server.edge.js +++ b/packages/react-dom/server.edge.js @@ -18,13 +18,6 @@ export function renderToReadableStream() { ); } -export function renderToNodeStream() { - return require('./src/server/react-dom-server.edge').renderToNodeStream.apply( - this, - arguments, - ); -} - export function renderToStaticNodeStream() { return require('./src/server/react-dom-server.edge').renderToStaticNodeStream.apply( this, diff --git a/packages/react-dom/server.node.js b/packages/react-dom/server.node.js index d0e403eaf89..acdaa234f3c 100644 --- a/packages/react-dom/server.node.js +++ b/packages/react-dom/server.node.js @@ -23,12 +23,6 @@ export function renderToStaticMarkup() { arguments, ); } -export function renderToNodeStream() { - return require('./src/server/ReactDOMLegacyServerNode').renderToNodeStream.apply( - this, - arguments, - ); -} export function renderToStaticNodeStream() { return require('./src/server/ReactDOMLegacyServerNode').renderToStaticNodeStream.apply( this, diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js index 58af90bce30..df4deff9e23 100644 --- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js @@ -338,24 +338,12 @@ describe('ReactDOMServerIntegration', () => { ); - let streamAmy; - let streamBob; - expect(() => { - streamAmy = ReactDOMServer.renderToNodeStream( - AppWithUser('Amy'), - ).setEncoding('utf8'); - }).toErrorDev( - 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.', - {withoutStack: true}, - ); - expect(() => { - streamBob = ReactDOMServer.renderToNodeStream( - AppWithUser('Bob'), - ).setEncoding('utf8'); - }).toErrorDev( - 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.', - {withoutStack: true}, - ); + const streamAmy = ReactDOMServer.renderToStaticNodeStream( + AppWithUser('Amy'), + ).setEncoding('utf8'); + const streamBob = ReactDOMServer.renderToStaticNodeStream( + AppWithUser('Bob'), + ).setEncoding('utf8'); // Testing by filling the buffer using internal _read() with a small // number of bytes to avoid a test case which needs to align to a @@ -390,14 +378,9 @@ describe('ReactDOMServerIntegration', () => { const streamCount = 34; for (let i = 0; i < streamCount; i++) { - expect(() => { - streams[i] = ReactDOMServer.renderToNodeStream( - NthRender(i % 2 === 0 ? 'Expected to be recreated' : i), - ).setEncoding('utf8'); - }).toErrorDev( - 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.', - {withoutStack: true}, - ); + streams[i] = ReactDOMServer.renderToStaticNodeStream( + NthRender(i % 2 === 0 ? 'Expected to be recreated' : i), + ).setEncoding('utf8'); } // Testing by filling the buffer using internal _read() with a small @@ -414,14 +397,9 @@ describe('ReactDOMServerIntegration', () => { // Recreate those same streams. for (let i = 0; i < streamCount; i += 2) { - expect(() => { - streams[i] = ReactDOMServer.renderToNodeStream( - NthRender(i), - ).setEncoding('utf8'); - }).toErrorDev( - 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.', - {withoutStack: true}, - ); + streams[i] = ReactDOMServer.renderToStaticNodeStream( + NthRender(i), + ).setEncoding('utf8'); } // Read a bit from all streams again. diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js index ec962ef8ba5..bd70b81d2a9 100644 --- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js +++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js @@ -578,74 +578,6 @@ describe('ReactDOMServer', () => { }); }); - describe('renderToNodeStream', () => { - it('should generate simple markup', () => { - const SuccessfulElement = React.createElement(() => ); - let response; - expect(() => { - response = ReactDOMServer.renderToNodeStream(SuccessfulElement); - }).toErrorDev( - 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.', - {withoutStack: true}, - ); - expect(response.read().toString()).toMatch(new RegExp('')); - }); - - it('should handle errors correctly', () => { - const FailingElement = React.createElement(() => { - throw new Error('An Error'); - }); - let response; - expect(() => { - response = ReactDOMServer.renderToNodeStream(FailingElement); - }).toErrorDev( - 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.', - {withoutStack: true}, - ); - return new Promise(resolve => { - response.once('error', () => { - resolve(); - }); - expect(response.read()).toBeNull(); - }); - }); - - it('should refer users to new apis when using suspense', async () => { - let resolve = null; - const promise = new Promise(res => { - resolve = () => { - resolved = true; - res(); - }; - }); - let resolved = false; - function Suspender() { - if (resolved) { - return 'resolved'; - } - throw promise; - } - - let response; - expect(() => { - response = ReactDOMServer.renderToNodeStream( -
- - - -
, - ); - }).toErrorDev( - 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.', - {withoutStack: true}, - ); - await resolve(); - expect(response.read().toString()).toEqual( - '
resolved
', - ); - }); - }); - describe('renderToStaticNodeStream', () => { it('should generate simple markup', () => { const SuccessfulElement = React.createElement(() => ); diff --git a/packages/react-dom/src/__tests__/ReactServerRenderingBrowser-test.js b/packages/react-dom/src/__tests__/ReactServerRenderingBrowser-test.js index e99bc4904d1..bfcb32f4f82 100644 --- a/packages/react-dom/src/__tests__/ReactServerRenderingBrowser-test.js +++ b/packages/react-dom/src/__tests__/ReactServerRenderingBrowser-test.js @@ -45,17 +45,4 @@ describe('ReactServerRenderingBrowser', () => { ReactDOMServer.renderToStaticMarkup(), ); }); - - it('throws meaningfully for server-only APIs', () => { - expect(() => ReactDOMServerBrowser.renderToNodeStream(
)).toThrow( - 'ReactDOMServer.renderToNodeStream(): The streaming API is not available ' + - 'in the browser. Use ReactDOMServer.renderToString() instead.', - ); - expect(() => - ReactDOMServerBrowser.renderToStaticNodeStream(
), - ).toThrow( - 'ReactDOMServer.renderToStaticNodeStream(): The streaming API is not available ' + - 'in the browser. Use ReactDOMServer.renderToStaticMarkup() instead.', - ); - }); }); diff --git a/packages/react-dom/src/server/ReactDOMFizzServerBun.js b/packages/react-dom/src/server/ReactDOMFizzServerBun.js index ffe29f22ed7..bc0206cdc80 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerBun.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerBun.js @@ -146,13 +146,6 @@ function renderToReadableStream( }); } -function renderToNodeStream() { - throw new Error( - 'ReactDOMServer.renderToNodeStream(): The Node Stream API is not available ' + - 'in Bun. Use ReactDOMServer.renderToReadableStream() instead.', - ); -} - function renderToStaticNodeStream() { throw new Error( 'ReactDOMServer.renderToStaticNodeStream(): The Node Stream API is not available ' + @@ -162,7 +155,6 @@ function renderToStaticNodeStream() { export { renderToReadableStream, - renderToNodeStream, renderToStaticNodeStream, ReactVersion as version, }; diff --git a/packages/react-dom/src/server/ReactDOMLegacyServerBrowser.js b/packages/react-dom/src/server/ReactDOMLegacyServerBrowser.js index b424bef497b..01fdbd8d50b 100644 --- a/packages/react-dom/src/server/ReactDOMLegacyServerBrowser.js +++ b/packages/react-dom/src/server/ReactDOMLegacyServerBrowser.js @@ -39,13 +39,6 @@ function renderToStaticMarkup( ); } -function renderToNodeStream() { - throw new Error( - 'ReactDOMServer.renderToNodeStream(): The streaming API is not available ' + - 'in the browser. Use ReactDOMServer.renderToString() instead.', - ); -} - function renderToStaticNodeStream() { throw new Error( 'ReactDOMServer.renderToStaticNodeStream(): The streaming API is not available ' + @@ -56,7 +49,6 @@ function renderToStaticNodeStream() { export { renderToString, renderToStaticMarkup, - renderToNodeStream, renderToStaticNodeStream, version, }; diff --git a/packages/react-dom/src/server/ReactDOMLegacyServerNode.js b/packages/react-dom/src/server/ReactDOMLegacyServerNode.js index 5c56afb7e03..07765e2b743 100644 --- a/packages/react-dom/src/server/ReactDOMLegacyServerNode.js +++ b/packages/react-dom/src/server/ReactDOMLegacyServerNode.js @@ -10,10 +10,7 @@ import type {ReactNodeList} from 'shared/ReactTypes'; import {version, renderToStringImpl} from './ReactDOMLegacyServerImpl'; -import { - renderToNodeStream, - renderToStaticNodeStream, -} from './ReactDOMLegacyServerNodeStream'; +import {renderToStaticNodeStream} from './ReactDOMLegacyServerNodeStream'; type ServerOptions = { identifierPrefix?: string, @@ -46,7 +43,6 @@ function renderToStaticMarkup( export { renderToString, renderToStaticMarkup, - renderToNodeStream, renderToStaticNodeStream, version, }; diff --git a/packages/react-dom/src/server/ReactDOMLegacyServerNodeStream.js b/packages/react-dom/src/server/ReactDOMLegacyServerNodeStream.js index 16090d90356..d34c0563a81 100644 --- a/packages/react-dom/src/server/ReactDOMLegacyServerNodeStream.js +++ b/packages/react-dom/src/server/ReactDOMLegacyServerNodeStream.js @@ -59,10 +59,9 @@ function onError() { // Non-fatal errors are ignored. } -function renderToNodeStreamImpl( +function renderToStaticNodeStream( children: ReactNodeList, - options: void | ServerOptions, - generateStaticMarkup: boolean, + options?: ServerOptions, ): Readable { function onAllReady() { // We wait until everything has loaded before starting to write. @@ -78,7 +77,7 @@ function renderToNodeStreamImpl( const request = createRequest( children, resumableState, - createRenderState(resumableState, generateStaticMarkup), + createRenderState(resumableState, true), createRootFormatContext(), Infinity, onError, @@ -92,23 +91,4 @@ function renderToNodeStreamImpl( return destination; } -function renderToNodeStream( - children: ReactNodeList, - options?: ServerOptions, -): Readable { - if (__DEV__) { - console.error( - 'renderToNodeStream is deprecated. Use renderToPipeableStream instead.', - ); - } - return renderToNodeStreamImpl(children, options, false); -} - -function renderToStaticNodeStream( - children: ReactNodeList, - options?: ServerOptions, -): Readable { - return renderToNodeStreamImpl(children, options, true); -} - -export {renderToNodeStream, renderToStaticNodeStream}; +export {renderToStaticNodeStream}; diff --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 index b5c1fd02d36..74f933dcfeb 100644 --- a/packages/react-dom/src/server/react-dom-server.bun.stable.js +++ b/packages/react-dom/src/server/react-dom-server.bun.stable.js @@ -9,7 +9,6 @@ export { renderToReadableStream, - renderToNodeStream, renderToStaticNodeStream, version, } from './ReactDOMFizzServerBun.js';