Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions packages/render/src/browser/render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import { readStream } from '../shared/read-stream.browser';

export const render = async (node: React.ReactNode, options?: Options) => {
const suspendedElement = <Suspense>{node}</Suspense>;
const reactDOMServer = await import('react-dom/server.browser').then(
// This is beacuse react-dom/server is CJS
(m) => m.default,
);
const reactDOMServer = await import('react-dom/server').then((m) => {
if ('default' in m) {
return m.default;
}
return m;
});

const html = await new Promise<string>((resolve, reject) => {
reactDOMServer
Expand Down
9 changes: 7 additions & 2 deletions packages/render/src/edge/render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ export const render = async (
) => {
const suspendedElement = <Suspense>{element}</Suspense>;
const reactDOMServer = await importReactDom().then(
// This is because react-dom/server is CJS
(m) => m.default,
(m) => {
if ('default' in m) {
return m.default;
}

return m;
},
);

const html = await new Promise<string>((resolve, reject) => {
Expand Down
10 changes: 6 additions & 4 deletions packages/render/src/node/render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ import { readStream } from './read-stream';

export const render = async (node: React.ReactNode, options?: Options) => {
const suspendedElement = <Suspense>{node}</Suspense>;
const reactDOMServer = await import('react-dom/server').then(
// This is beacuse react-dom/server is CJS
(m) => m.default,
);
const reactDOMServer = await import('react-dom/server').then((m) => {
if ('default' in m) {
return m.default;
}
return m;
});

let html!: string;
if (
Expand Down
Loading