Skip to content

Fix: prendering with basename and ssr:false renders 404s for dynamic routes #13791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix: prendering with basename and ssr:false renders 404s for dynamic routes #13791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contributors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,3 +401,4 @@
- zeromask1337
- zheng-chuang
- zxTomw
- skrhlm
15 changes: 13 additions & 2 deletions packages/react-router/lib/server-runtime/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,16 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
normalizedPath = normalizedPath.slice(0, -1);
}

let pathForPrerenderCheck = stripBasename(
normalizedPath,
normalizedBasename
);

// handle root path
if (pathForPrerenderCheck === "/") {
pathForPrerenderCheck = "";
}

let isSpaMode =
getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";

Expand All @@ -178,8 +188,9 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
// ssr:false and no prerender config indicates "SPA Mode"
isSpaMode = true;
} else if (
!_build.prerender.includes(normalizedPath) &&
!_build.prerender.includes(normalizedPath + "/")
pathForPrerenderCheck !== null &&
!_build.prerender.includes(pathForPrerenderCheck) &&
!_build.prerender.includes(pathForPrerenderCheck + "/")
) {
if (url.pathname.endsWith(".data")) {
// 404 on non-pre-rendered `.data` requests
Expand Down