Skip to content

Commit 2c07f43

Browse files
committed
Move react-dom/server reexports to a separate file
1 parent 78f741b commit 2c07f43

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

node_package/src/ReactDOMServer.cts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Depending on react-dom version, proper ESM import can be react-dom/server or react-dom/server.js
2+
// but this always works in this .cts file
3+
export { renderToPipeableStream, renderToString, type PipeableStream } from 'react-dom/server';

node_package/src/handleError.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { renderToString } from './reactApis.cts';
2+
import { renderToString } from './ReactDOMServer.cts';
33
import type { ErrorOptions } from './types/index.ts';
44

55
function handleRenderFunctionIssue(options: ErrorOptions): string {

node_package/src/reactApis.cts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ export const supportsRootApi = reactMajorVersion >= 18;
1010

1111
export const supportsHydrate = supportsRootApi || 'hydrate' in ReactDOM;
1212

13-
// Depending on react-dom version, proper ESM import can be react-dom/server or react-dom/server.js
14-
// but this always works in this .cts file
15-
export { renderToPipeableStream, renderToString, type PipeableStream } from 'react-dom/server';
16-
1713
// TODO: once React dependency is updated to >= 18, we can remove this and just
1814
// import ReactDOM from 'react-dom/client';
1915
let reactDomClient: typeof import('react-dom/client');

node_package/src/serverRenderReactComponent.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import createReactOutput from './createReactOutput.ts';
66
import { isPromise, isServerRenderHash } from './isServerRenderResult.ts';
77
import buildConsoleReplay from './buildConsoleReplay.ts';
88
import handleError from './handleError.ts';
9-
import { renderToString } from './reactApis.cts';
9+
import { renderToString } from './ReactDOMServer.cts';
1010
import { createResultObject, convertToError, validateComponent } from './serverRenderUtils.ts';
1111
import type {
1212
CreateReactOutputResult,

node_package/src/streamServerRenderedReactComponent.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import createReactOutput from './createReactOutput.ts';
66
import { isPromise, isServerRenderHash } from './isServerRenderResult.ts';
77
import buildConsoleReplay from './buildConsoleReplay.ts';
88
import handleError from './handleError.ts';
9-
import { renderToPipeableStream, PipeableStream } from './reactApis.cts';
9+
import { renderToPipeableStream, PipeableStream } from './ReactDOMServer.cts';
1010
import { createResultObject, convertToError, validateComponent } from './serverRenderUtils.ts';
1111
import type { RenderParams, StreamRenderState, StreamableComponentResult } from './types/index.ts';
1212

0 commit comments

Comments
 (0)