Unverified Commit 8f9aed68 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Fixes for inline embedding data in the web runtime (#32471)

* fix missing renderToString

* workaround tee
Co-authored-by: 's avatarkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
parent 0ad4ad6d
...@@ -62,6 +62,7 @@ import { ...@@ -62,6 +62,7 @@ import {
import { DomainLocale } from './config' import { DomainLocale } from './config'
import RenderResult, { NodeWritablePiper } from './render-result' import RenderResult, { NodeWritablePiper } from './render-result'
import isError from '../lib/is-error' import isError from '../lib/is-error'
import { readableStreamTee } from './web/utils'
let Writable: typeof import('stream').Writable let Writable: typeof import('stream').Writable
let Buffer: typeof import('buffer').Buffer let Buffer: typeof import('buffer').Buffer
...@@ -293,7 +294,7 @@ function createRSCHook() { ...@@ -293,7 +294,7 @@ function createRSCHook() {
) => { ) => {
let entry = rscCache.get(id) let entry = rscCache.get(id)
if (!entry) { if (!entry) {
const [renderStream, forwardStream] = req.tee() const [renderStream, forwardStream] = readableStreamTee(req)
entry = createFromReadableStream(renderStream) entry = createFromReadableStream(renderStream)
rscCache.set(id, entry) rscCache.set(id, entry)
...@@ -301,29 +302,20 @@ function createRSCHook() { ...@@ -301,29 +302,20 @@ function createRSCHook() {
start(controller) { start(controller) {
if (bootstrap) { if (bootstrap) {
controller.enqueue( controller.enqueue(
ReactDOMServer.renderToString( `<script>(self.__next_s=self.__next_s||[]).push(${JSON.stringify([
<script 0,
dangerouslySetInnerHTML={{ id,
__html: `(self.__next_s=self.__next_s||[]).push(${JSON.stringify( ])})</script>`
[0, id]
)})`,
}}
/>
)
) )
} }
}, },
transform(chunk, controller) { transform(chunk, controller) {
controller.enqueue( controller.enqueue(
ReactDOMServer.renderToString( `<script>(self.__next_s=self.__next_s||[]).push(${JSON.stringify([
<script 1,
dangerouslySetInnerHTML={{ id,
__html: `(self.__next_s=self.__next_s||[]).push(${JSON.stringify( decoder.decode(chunk),
[1, id, decoder.decode(chunk)] ])})</script>`
)})`,
}}
/>
)
) )
}, },
}) })
......
...@@ -14,6 +14,32 @@ export async function* streamToIterator<T>( ...@@ -14,6 +14,32 @@ export async function* streamToIterator<T>(
reader.releaseLock() reader.releaseLock()
} }
export function readableStreamTee<T = any>(
readable: ReadableStream<T>
): [ReadableStream<T>, ReadableStream<T>] {
const transformStream = new TransformStream()
const transformStream2 = new TransformStream()
const writer = transformStream.writable.getWriter()
const writer2 = transformStream2.writable.getWriter()
const reader = readable.getReader()
function read() {
reader.read().then(({ done, value }) => {
if (done) {
writer.close()
writer2.close()
return
}
writer.write(value)
writer2.write(value)
read()
})
}
read()
return [transformStream.readable, transformStream2.readable]
}
export function notImplemented(name: string, method: string): any { export function notImplemented(name: string, method: string): any {
throw new Error( throw new Error(
`Failed to get the '${method}' property on '${name}': the property is not implemented` `Failed to get the '${method}' property on '${name}': the property is not implemented`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment