fix: tell router that rendering finished when rendering to string

schiller-manuel · schiller-manuel · commit 0f5c6b6e4c76 · 2025-09-20T01:16:58.000+02:00
fixes #5155
diff --git a/packages/react-router/src/ssr/renderRouterToString.tsx b/packages/react-router/src/ssr/renderRouterToString.tsx
@@ -13,6 +13,7 @@ export const renderRouterToString = async ({
 }) => {
   try {
     let html = ReactDOMServer.renderToString(children)
+    router.serverSsr!.setRenderFinished()
     const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
       (htmls) => htmls.join(''),
     )
diff --git a/packages/solid-router/src/ssr/renderRouterToString.tsx b/packages/solid-router/src/ssr/renderRouterToString.tsx
@@ -13,6 +13,7 @@ export const renderRouterToString = async ({
 }) => {
   try {
     let html = Solid.renderToString(children)
+    router.serverSsr!.setRenderFinished()
     const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
       (htmls) => htmls.join(''),
     )

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ export const renderRouterToString = async ({`
`13`	`13`	`}) => {`
`14`	`14`	`try {`
`15`	`15`	`let html = ReactDOMServer.renderToString(children)`
	`16`	`+ router.serverSsr!.setRenderFinished()`
`16`	`17`	`const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(`
`17`	`18`	`(htmls) => htmls.join(''),`
`18`	`19`	`)`