@@ -1203,6 +1203,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
1203
1203
viteConfig ,
1204
1204
ctx . reactRouterConfig ,
1205
1205
serverBuildDirectory ,
1206
+ ssrViteManifest [ virtual . serverBuild . id ] . file ,
1206
1207
clientBuildDirectory
1207
1208
) ;
1208
1209
}
@@ -1213,6 +1214,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
1213
1214
viteConfig ,
1214
1215
ctx . reactRouterConfig ,
1215
1216
serverBuildDirectory ,
1217
+ ssrViteManifest [ virtual . serverBuild . id ] . file ,
1216
1218
clientBuildDirectory
1217
1219
) ;
1218
1220
}
@@ -1774,13 +1776,10 @@ async function getRouteMetadata(
1774
1776
1775
1777
async function getPrerenderBuildAndHandler (
1776
1778
viteConfig : Vite . ResolvedConfig ,
1777
- reactRouterConfig : ResolvedReactRouterConfig ,
1778
- serverBuildDirectory : string
1779
+ serverBuildDirectory : string ,
1780
+ serverBuildFile : string
1779
1781
) {
1780
- let serverBuildPath = path . join (
1781
- serverBuildDirectory ,
1782
- reactRouterConfig . serverBuildFile
1783
- ) ;
1782
+ let serverBuildPath = path . join ( serverBuildDirectory , serverBuildFile ) ;
1784
1783
let build = await import ( url . pathToFileURL ( serverBuildPath ) . toString ( ) ) ;
1785
1784
let { createRequestHandler : createHandler } = await import ( "react-router" ) ;
1786
1785
return {
@@ -1793,12 +1792,13 @@ async function handleSpaMode(
1793
1792
viteConfig : Vite . ResolvedConfig ,
1794
1793
reactRouterConfig : ResolvedReactRouterConfig ,
1795
1794
serverBuildDirectory : string ,
1795
+ serverBuildFile : string ,
1796
1796
clientBuildDirectory : string
1797
1797
) {
1798
1798
let { handler } = await getPrerenderBuildAndHandler (
1799
1799
viteConfig ,
1800
- reactRouterConfig ,
1801
- serverBuildDirectory
1800
+ serverBuildDirectory ,
1801
+ serverBuildFile
1802
1802
) ;
1803
1803
let request = new Request ( `http://localhost${ reactRouterConfig . basename } ` ) ;
1804
1804
let response = await handler ( request ) ;
@@ -1821,12 +1821,13 @@ async function handlePrerender(
1821
1821
viteConfig : Vite . ResolvedConfig ,
1822
1822
reactRouterConfig : ResolvedReactRouterConfig ,
1823
1823
serverBuildDirectory : string ,
1824
+ serverBuildPath : string ,
1824
1825
clientBuildDirectory : string
1825
1826
) {
1826
1827
let { build, handler } = await getPrerenderBuildAndHandler (
1827
1828
viteConfig ,
1828
- reactRouterConfig ,
1829
- serverBuildDirectory
1829
+ serverBuildDirectory ,
1830
+ serverBuildPath
1830
1831
) ;
1831
1832
1832
1833
let routes = createPrerenderRoutes ( build . routes ) ;
0 commit comments