File tree Expand file tree Collapse file tree 2 files changed +14
-2
lines changed
packages/react-router/lib/server-runtime Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change 401
401
- zeromask1337
402
402
- zheng-chuang
403
403
- zxTomw
404
+ - skrhlm
Original file line number Diff line number Diff line change @@ -166,6 +166,16 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
166
166
normalizedPath = normalizedPath . slice ( 0 , - 1 ) ;
167
167
}
168
168
169
+ let pathForPrerenderCheck = stripBasename (
170
+ normalizedPath ,
171
+ normalizedBasename
172
+ ) ;
173
+
174
+ // handle root path
175
+ if ( pathForPrerenderCheck === "/" ) {
176
+ pathForPrerenderCheck = "" ;
177
+ }
178
+
169
179
let isSpaMode =
170
180
getBuildTimeHeader ( request , "X-React-Router-SPA-Mode" ) === "yes" ;
171
181
@@ -178,8 +188,9 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
178
188
// ssr:false and no prerender config indicates "SPA Mode"
179
189
isSpaMode = true ;
180
190
} else if (
181
- ! _build . prerender . includes ( normalizedPath ) &&
182
- ! _build . prerender . includes ( normalizedPath + "/" )
191
+ pathForPrerenderCheck !== null &&
192
+ ! _build . prerender . includes ( pathForPrerenderCheck ) &&
193
+ ! _build . prerender . includes ( pathForPrerenderCheck + "/" )
183
194
) {
184
195
if ( url . pathname . endsWith ( ".data" ) ) {
185
196
// 404 on non-pre-rendered `.data` requests
You can’t perform that action at this time.
0 commit comments