@@ -94,12 +94,12 @@ function handleRenderingError(e: unknown, options: { componentName: string, thro
9494 } ;
9595}
9696
97- function createResultObject ( html : string | null , consoleReplayScript : string , hasErrors : boolean , error ?: RenderingError ) : RenderResult {
97+ function createResultObject ( html : string | null , consoleReplayScript : string , renderState : RenderState ) : RenderResult {
9898 return {
9999 html,
100100 consoleReplayScript,
101- hasErrors,
102- renderingError : error && { message : error . message , stack : error . stack } ,
101+ hasErrors : renderState . hasErrors ,
102+ renderingError : renderState . error && { message : renderState . error . message , stack : renderState . error . stack } ,
103103 } ;
104104}
105105
@@ -111,10 +111,10 @@ async function createPromiseResult(
111111) : Promise < RenderResult > {
112112 try {
113113 const html = await renderState . result ;
114- return createResultObject ( html , consoleReplayScript , renderState . hasErrors , renderState . error ) ;
114+ return createResultObject ( html , consoleReplayScript , renderState ) ;
115115 } catch ( e : unknown ) {
116116 const errorRenderState = handleRenderingError ( e , { componentName, throwJsErrors } ) ;
117- return createResultObject ( errorRenderState . result , consoleReplayScript , errorRenderState . hasErrors , errorRenderState . error ) ;
117+ return createResultObject ( errorRenderState . result , consoleReplayScript , errorRenderState ) ;
118118 }
119119}
120120
@@ -137,7 +137,7 @@ function createFinalResult(
137137 return createPromiseResult ( { ...renderState , result } , consoleReplayScript , componentName , throwJsErrors ) ;
138138 }
139139
140- return JSON . stringify ( createResultObject ( result , consoleReplayScript , renderState . hasErrors , renderState . error ) ) ;
140+ return JSON . stringify ( createResultObject ( result , consoleReplayScript , renderState ) ) ;
141141}
142142
143143function serverRenderReactComponentInternal ( options : RenderParams ) : null | string | Promise < RenderResult > {
0 commit comments