Unverified Commit f2fee3d6 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Fix: change the timing for clearing the inlined data buffer (#35413)

Fix error of `Unexpected server data: missing bootstrap script` when the initial rendering is streaming rsc.

Introduced in #35344, the buffer might still keep flushing after on mount.
Co-authored-by: 's avatarShu Ding <3676859+shuding@users.noreply.github.com>
parent 279f47b9
...@@ -678,9 +678,13 @@ if (process.env.__NEXT_RSC) { ...@@ -678,9 +678,13 @@ if (process.env.__NEXT_RSC) {
} = require('next/dist/compiled/react-server-dom-webpack') } = require('next/dist/compiled/react-server-dom-webpack')
const encoder = new TextEncoder() const encoder = new TextEncoder()
let initialServerDataBuffer: string[] | undefined = undefined let initialServerDataBuffer: string[] | undefined = undefined
let initialServerDataWriter: WritableStreamDefaultWriter | undefined = let initialServerDataWriter: WritableStreamDefaultWriter | undefined =
undefined undefined
let initialServerDataLoaded = false
let initialServerDataFlushed = false
function nextServerDataCallback(seg: [number, string, string]) { function nextServerDataCallback(seg: [number, string, string]) {
if (seg[0] === 0) { if (seg[0] === 0) {
initialServerDataBuffer = [] initialServerDataBuffer = []
...@@ -695,24 +699,45 @@ if (process.env.__NEXT_RSC) { ...@@ -695,24 +699,45 @@ if (process.env.__NEXT_RSC) {
} }
} }
} }
// There might be race conditions between `nextServerDataRegisterWriter` and
// `DOMContentLoaded`. The former will be called when React starts to hydrate
// the root, the latter will be called when the DOM is fully loaded.
// For streaming, the former is called first due to partial hydration.
// For non-streaming, the latter can be called first.
// Hence, we use two variables `initialServerDataLoaded` and
// `initialServerDataFlushed` to make sure the writer will be closed and
// `initialServerDataBuffer` will be cleared in the right time.
function nextServerDataRegisterWriter(writer: WritableStreamDefaultWriter) { function nextServerDataRegisterWriter(writer: WritableStreamDefaultWriter) {
if (initialServerDataBuffer) { if (initialServerDataBuffer) {
initialServerDataBuffer.forEach((val) => { initialServerDataBuffer.forEach((val) => {
writer.write(encoder.encode(val)) writer.write(encoder.encode(val))
}) })
if (initialServerDataLoaded && !initialServerDataFlushed) {
writer.close()
initialServerDataFlushed = true
initialServerDataBuffer = undefined
}
} }
initialServerDataWriter = writer initialServerDataWriter = writer
} }
// When `DOMContentLoaded`, we can close all pending writers to finish hydration. // When `DOMContentLoaded`, we can close all pending writers to finish hydration.
document.addEventListener( const DOMContentLoaded = function () {
'DOMContentLoaded', if (initialServerDataWriter && !initialServerDataFlushed) {
function () { initialServerDataWriter.close()
if (initialServerDataWriter && !initialServerDataWriter.closed) { initialServerDataFlushed = true
initialServerDataWriter.close() initialServerDataBuffer = undefined
} }
}, initialServerDataLoaded = true
false }
) // It's possible that the DOM is already loaded.
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', DOMContentLoaded, false)
} else {
DOMContentLoaded()
}
const nextServerDataLoadingGlobal = ((self as any).__next_s = const nextServerDataLoadingGlobal = ((self as any).__next_s =
(self as any).__next_s || []) (self as any).__next_s || [])
...@@ -771,9 +796,6 @@ if (process.env.__NEXT_RSC) { ...@@ -771,9 +796,6 @@ if (process.env.__NEXT_RSC) {
React.useEffect(() => { React.useEffect(() => {
rscCache.delete(cacheKey) rscCache.delete(cacheKey)
}) })
React.useEffect(() => {
initialServerDataBuffer = undefined
}, [])
const response = useServerResponse(cacheKey, serialized) const response = useServerResponse(cacheKey, serialized)
const root = response.readRoot() const root = response.readRoot()
return root return root
......
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