Skip to content

fix: stream props #21

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

Merged
dunglas merged 1 commit into from
Nov 30, 2020
Merged

fix: stream props #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- '11'
- '14'

cache:
directories:
Expand All @@ -19,5 +19,5 @@ deploy:
api_key: $NPM_AUTH_TOKEN
on:
tags: true
node_js: '11'
node_js: '14'
skip_cleanup: true
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"devDependencies": {
"@types/express": "^4.16.1",
"@types/jest": "^24.0.0",
"@types/node": "^10.12.21",
"@types/node": "^14.14.10",
"@types/react": "^16.8.2",
"@types/react-dom": "^16.8.0",
"@types/react-test-renderer": "^16.8.0",
Expand Down
8 changes: 4 additions & 4 deletions src/server.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import crypto from "crypto";
import { Request, Response } from "express";
import React from "react";
import { renderToNodeStream } from "react-dom/server";
import { Transform } from "stream";
import { Readable, Transform } from "stream";

export const path = process.env.REACT_ESI_PATH || "/_fragment";
const secret =
Expand Down Expand Up @@ -156,9 +156,9 @@ export async function serveFragment(
const encodedProps = JSON.stringify(childProps).replace(/</g, "\\u003c");

// Remove the <script> class from the DOM to prevent breaking the React reconciliation algorithm
res.write(
`<script>window.__REACT_ESI__ = window.__REACT_ESI__ || {}; window.__REACT_ESI__['${fragmentID}'] = ${encodedProps};document.currentScript.remove();</script>`
);
const script = "<script>window.__REACT_ESI__ = window.__REACT_ESI__ || {}; window.__REACT_ESI__['" + fragmentID + "'] = " + encodedProps + ";document.currentScript.remove();</script>";
const scriptStream = Readable.from(script)
scriptStream.pipe(res, { end: false });

// Wrap the content in a div having the data-reactroot attribute, to be removed
const stream = renderToNodeStream(
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,10 +454,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==

"@types/node@^10.12.21":
version "10.17.24"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.24.tgz#c57511e3a19c4b5e9692bb2995c40a3a52167944"
integrity sha512-5SCfvCxV74kzR3uWgTYiGxrd69TbT1I6+cMx1A5kEly/IVveJBimtAMlXiEyVFn5DvUFewQWxOOiJhlxeQwxgA==
"@types/node@^14.14.10":
version "14.14.10"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785"
integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==

"@types/prop-types@*":
version "15.7.3"
Expand Down