fix: handle $&quot in defaultRenderHandler correctly (#5871)

Dubzer · web-flow · commit 27d626f42c71 · 2025-11-18T23:53:06.000+01:00
diff --git a/packages/react-router/src/ssr/renderRouterToString.tsx b/packages/react-router/src/ssr/renderRouterToString.tsx
@@ -17,7 +17,7 @@ export const renderRouterToString = async ({
     const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
       (htmls) => htmls.join(''),
     )
-    html = html.replace(`</body>`, `${injectedHtml}</body>`)
+    html = html.replace(`</body>`, () => `${injectedHtml}</body>`)
     return new Response(`<!DOCTYPE html>${html}`, {
       status: router.state.statusCode,
       headers: responseHeaders,
diff --git a/packages/solid-router/src/ssr/renderRouterToString.tsx b/packages/solid-router/src/ssr/renderRouterToString.tsx
@@ -29,7 +29,7 @@ export const renderRouterToString = async ({
     const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
       (htmls) => htmls.join(''),
     )
-    html = html.replace(`</body>`, `${injectedHtml}</body>`)
+    html = html.replace(`</body>`, () => `${injectedHtml}</body>`)
     return new Response(`<!DOCTYPE html>${html}`, {
       status: router.state.statusCode,
       headers: responseHeaders,

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export const renderRouterToString = async ({`
`17`	`17`	`const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(`
`18`	`18`	`(htmls) => htmls.join(''),`
`19`	`19`	`)`
`20`		- html = html.replace(`</body>`, `${injectedHtml}</body>`)
	`20`	+ html = html.replace(`</body>`, () => `${injectedHtml}</body>`)
`21`	`21`	return new Response(`<!DOCTYPE html>${html}`, {
`22`	`22`	`status: router.state.statusCode,`
`23`	`23`	`headers: responseHeaders,`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export const renderRouterToString = async ({`
`29`	`29`	`const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(`
`30`	`30`	`(htmls) => htmls.join(''),`
`31`	`31`	`)`
`32`		- html = html.replace(`</body>`, `${injectedHtml}</body>`)
	`32`	+ html = html.replace(`</body>`, () => `${injectedHtml}</body>`)
`33`	`33`	return new Response(`<!DOCTYPE html>${html}`, {
`34`	`34`	`status: router.state.statusCode,`
`35`	`35`	`headers: responseHeaders,`