minor refactor

Author: brillout

packages/vike-react/src/integration/onRenderClient.tsx

@@ -102,10 +102,10 @@ function onUncaughtErrorGlobal(
 }
 type OnUncaughtError = RootOptions['onUncaughtError']
 type OnUncaughtErrorArgs = Parameters<NonNullable<RootOptions['onUncaughtError']>>
+type OnUncaughtErrorInfo = OnUncaughtErrorArgs[1]
 
 // Inject componentStack to the error's stack trace
 // - Server counterpart: https://github.com/brillout/react-streaming/blob/e0a6210957e65dad2c92877ad075ebac4713d8fa/src/server/renderToStream/common.ts#L93
-type OnUncaughtErrorInfo = OnUncaughtErrorArgs[1]
 function getErrorWithComponentStack(errorOriginal: unknown, errorInfo?: OnUncaughtErrorInfo) {
   if (!errorInfo?.componentStack || !isObject(errorOriginal)) return errorOriginal
   const errorStackLines = String(errorOriginal.stack).split('\n')

packages/vike-react/src/integration/onRenderHtml.tsx

@@ -86,16 +86,15 @@ async function renderPageToHtml(pageContext: PageContextServer) {
         // @ts-ignore
         pageContext.userAgent
       // Properties are set conditionally (instead of being assigned `undefined`) to satisfy `exactOptionalPropertyTypes`.
-      const renderOptions: RenderToStreamOptions = {}
+      const options: RenderToStreamOptions = {}
       // When streamSetting.type is null: let react-streaming decide the stream type
-      if (streamSetting.type) renderOptions.webStream = streamSetting.type === 'web'
-      if (userAgent) renderOptions.userAgent = userAgent
+      if (streamSetting.type) options.webStream = streamSetting.type === 'web'
+      if (userAgent) options.userAgent = userAgent
       // +stream.require is true  => default +stream.enable is true
       // +stream.require is false => default +stream.enable is false
       // Don't override disabling when a bot is detected.
-      if (streamSetting.enable === false) renderOptions.disable = true
-      Object.assign(renderOptions, renderToStreamOptions)
-      const pageHtmlStream = await renderToStream(pageContext.page, renderOptions)
+      if (streamSetting.enable === false) options.disable = true
+      const pageHtmlStream = await renderToStream(pageContext.page, { ...options, ...renderToStreamOptions })
       pageContext.pageHtmlStream = pageHtmlStream
     }
   }