Avoid non-null assertion on `setReactDebugChannel`

parent 06765ee2
...@@ -2188,20 +2188,20 @@ async function renderToStream( ...@@ -2188,20 +2188,20 @@ async function renderToStream(
return payload return payload
} }
const setDebugChannelForClientRender = ( const setDebugChannelForClientRender =
debugChannel: DebugChannelPair setReactDebugChannel &&
) => { ((debugChannel: DebugChannelPair) => {
const [readableSsr, readableBrowser] = const [readableSsr, readableBrowser] =
debugChannel.clientSide.readable.tee() debugChannel.clientSide.readable.tee()
reactDebugStream = readableSsr reactDebugStream = readableSsr
setReactDebugChannel!( setReactDebugChannel(
{ readable: readableBrowser }, { readable: readableBrowser },
htmlRequestId, htmlRequestId,
requestId requestId
) )
} })
const environmentName = () => const environmentName = () =>
requestStore.prerenderPhase === true ? 'Prerender' : 'Server' requestStore.prerenderPhase === true ? 'Prerender' : 'Server'
...@@ -2228,8 +2228,8 @@ async function renderToStream( ...@@ -2228,8 +2228,8 @@ async function renderToStream(
const initialRenderReactController = new AbortController() const initialRenderReactController = new AbortController()
const intialRenderDebugChannel = const initialRenderDebugChannel =
setReactDebugChannel && createDebugChannel() setDebugChannelForClientRender && createDebugChannel()
const initialRscPayload = await getPayload() const initialRscPayload = await getPayload()
const maybeInitialServerStream = await workUnitAsyncStorage.run( const maybeInitialServerStream = await workUnitAsyncStorage.run(
...@@ -2246,7 +2246,7 @@ async function renderToStream( ...@@ -2246,7 +2246,7 @@ async function renderToStream(
onError: serverComponentsErrorHandler, onError: serverComponentsErrorHandler,
environmentName, environmentName,
filterStackFrame, filterStackFrame,
debugChannel: intialRenderDebugChannel?.serverSide, debugChannel: initialRenderDebugChannel?.serverSide,
signal: initialRenderReactController.signal, signal: initialRenderReactController.signal,
} }
) )
...@@ -2277,8 +2277,8 @@ async function renderToStream( ...@@ -2277,8 +2277,8 @@ async function renderToStream(
// No cache misses. We can use the stream as is. // No cache misses. We can use the stream as is.
// We're using this render, so we should pass its debug channel to the client render. // We're using this render, so we should pass its debug channel to the client render.
if (intialRenderDebugChannel) { if (initialRenderDebugChannel) {
setDebugChannelForClientRender(intialRenderDebugChannel) setDebugChannelForClientRender(initialRenderDebugChannel)
} }
reactServerResult = new ReactServerResult(maybeInitialServerStream) reactServerResult = new ReactServerResult(maybeInitialServerStream)
...@@ -2311,7 +2311,7 @@ async function renderToStream( ...@@ -2311,7 +2311,7 @@ async function renderToStream(
// The initial render already wrote to its debug channel. We're not using it, // The initial render already wrote to its debug channel. We're not using it,
// so we need to create a new one. // so we need to create a new one.
const finalRenderDebugChannel = const finalRenderDebugChannel =
setReactDebugChannel && createDebugChannel() setDebugChannelForClientRender && createDebugChannel()
// We know that we won't discard this render, so we can set the debug channel up immediately. // We know that we won't discard this render, so we can set the debug channel up immediately.
if (finalRenderDebugChannel) { if (finalRenderDebugChannel) {
setDebugChannelForClientRender(finalRenderDebugChannel) setDebugChannelForClientRender(finalRenderDebugChannel)
......
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