Skip to content

Commit

Permalink
fix a deprecated method in react integration using SSR: renderToStati…
Browse files Browse the repository at this point in the history
…cNodeStream (#10893)

* deprecated method renderToStaticNodeStream

* Create twelve-bulldogs-raise.md

---------

Co-authored-by: Bjorn Lu <[email protected]>
  • Loading branch information
Angrigo and bluwy authored Apr 30, 2024
1 parent 36bb3b6 commit fd7a9ed
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 33 deletions.
5 changes: 5 additions & 0 deletions .changeset/twelve-bulldogs-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/react": patch
---

Removes using deprecated `ReactDOMServer.renderToStaticNodeStream` API
36 changes: 3 additions & 33 deletions packages/integrations/react/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,10 @@ async function renderToStaticMarkup(Component, props, { default: children, ...sl
identifierPrefix: prefix,
};
let html;
if (metadata?.hydrate) {
if ('renderToReadableStream' in ReactDOM) {
html = await renderToReadableStreamAsync(vnode, renderOptions);
} else {
html = await renderToPipeableStreamAsync(vnode, renderOptions);
}
if ('renderToReadableStream' in ReactDOM) {
html = await renderToReadableStreamAsync(vnode, renderOptions);
} else {
if ('renderToReadableStream' in ReactDOM) {
html = await renderToReadableStreamAsync(vnode, renderOptions);
} else {
html = await renderToStaticNodeStreamAsync(vnode, renderOptions);
}
html = await renderToPipeableStreamAsync(vnode, renderOptions);
}
return { html, attrs };
}
Expand Down Expand Up @@ -150,28 +142,6 @@ async function renderToPipeableStreamAsync(vnode, options) {
});
}

async function renderToStaticNodeStreamAsync(vnode, options) {
const Writable = await getNodeWritable();
let html = '';
return new Promise((resolve, reject) => {
let stream = ReactDOM.renderToStaticNodeStream(vnode, options);
stream.on('error', (err) => {
reject(err);
});
stream.pipe(
new Writable({
write(chunk, _encoding, callback) {
html += chunk.toString('utf-8');
callback();
},
destroy() {
resolve(html);
},
})
);
});
}

/**
* Use a while loop instead of "for await" due to cloudflare and Vercel Edge issues
* See https://github.com/facebook/react/issues/24169
Expand Down

0 comments on commit fd7a9ed

Please sign in to comment.