Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix component frameworks on Vercel Edge #4667

Merged
merged 4 commits into from
Sep 7, 2022
Merged

Fix component frameworks on Vercel Edge #4667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53c6588
fix: use while instead of "for await" in react integration
bholmesdev Sep 7, 2022
7d706d4
fix: cast HTML to string to fix other integrations
bholmesdev Sep 7, 2022
2e4c7f9
docs: add comment on encode(String(html))
bholmesdev Sep 7, 2022
bd8ee55
chore: changeset
bholmesdev Sep 7, 2022
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
6 changes: 6 additions & 0 deletions .changeset/tasty-owls-watch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'astro': patch
'@astrojs/react': patch
---

Fix framework components on Vercel Edge
5 changes: 4 additions & 1 deletion packages/astro/src/runtime/server/render/page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ export async function renderPage(
controller.enqueue(encoder.encode('<!DOCTYPE html>\n'));
}
}
controller.enqueue(encoder.encode(html));
// Convert HTML object to string
// for environments that won't "toString" automatically
// (ex. Cloudflare and Vercel Edge)
controller.enqueue(encoder.encode(String(html)));
i++;
}
controller.close();
Expand Down
27 changes: 20 additions & 7 deletions packages/integrations/react/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,27 @@ async function renderToStaticNodeStreamAsync(vnode) {
});
}

/**
* Use a while loop instead of "for await" due to cloudflare and Vercel Edge issues
* See https://github.com/facebook/react/issues/24169
*/
async function readResult(stream) {
const reader = stream.getReader();
let result = '';
const decoder = new TextDecoder('utf-8')
while (true) {
const { done, value } = await reader.read();
if (done) {
return result;
}
result += decoder.decode(value, { stream: true });
}
}

async function renderToReadableStreamAsync(vnode) {
const decoder = new TextDecoder();
const stream = await ReactDOM.renderToReadableStream(vnode);
let html = '';
for await (const chunk of stream) {
html += decoder.decode(chunk);
}
return html;
return await readResult(
await ReactDOM.renderToReadableStream(vnode),
);
}

export default {
Expand Down