wip

Author: brillout

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

@@ -105,8 +105,8 @@ type OnUncaughtErrorArgs = Parameters<NonNullable<RootOptions['onUncaughtError']
 
 // 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 ErrorInfo = { componentStack?: string }
-function getErrorWithComponentStack(errorOriginal: unknown, errorInfo?: ErrorInfo) {
+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

@@ -3,7 +3,7 @@ export { onRenderHtml }
 
 import React from 'react'
 import { renderToString, renderToStaticMarkup } from 'react-dom/server'
-import { renderToStream } from 'react-streaming/server'
+import { renderToStream, type RenderToStreamOptions } from 'react-streaming/server'
 import { dangerouslySkipEscape, escapeInject } from 'vike/server'
 import type { PageContextServer } from 'vike/types'
 import { VikeReactProviderPageContext } from '../hooks/usePageContext.js'
@@ -80,29 +80,39 @@ async function renderPageToHtml(pageContext: PageContextServer) {
       const pageHtmlString = renderToString(pageContext.page, renderToStringOptions)
       pageContext.pageHtmlString = pageHtmlString
     } else {
-      const pageHtmlStream = await renderToStream(pageContext.page, {
-        webStream: !streamSetting.type
-          ? /* Let react-streaming decide which stream type to use.
-            false
-            */
-            undefined
-          : streamSetting.type === 'web',
-        userAgent:
+      const renderOptions: RenderToStreamOptions = {
+        ...renderToStreamOptions,
+        ...(!streamSetting.type
+          ? {}
+          : {
+              webStream: streamSetting.type === 'web',
+            }),
+        ...((
           pageContext.headers?.['user-agent'] ||
           // TO-DO/eventually: remove old way of acccessing the User Agent header.
           // @ts-ignore
-          pageContext.userAgent,
-        disable:
+          pageContext.userAgent
+        )
+          ? {
+              userAgent:
+                pageContext.headers?.['user-agent'] ||
+                // TO-DO/eventually: remove old way of acccessing the User Agent header.
+                // @ts-ignore
+                pageContext.userAgent,
+            }
+          : {}),
+        ...(
           // +stream.require is true  => default +stream.enable is true
           // +stream.require is false => default +stream.enable is false
           streamSetting.enable === false
-            ? true
+            ? { disable: true }
             : /* Don't override disabling when bot is detected.
               false,
               */
-              undefined,
-        ...renderToStreamOptions,
-      })
+              {}
+        ),
+      }
+      const pageHtmlStream = await renderToStream(pageContext.page, renderOptions)
       pageContext.pageHtmlStream = pageHtmlStream
     }
   }