fix: request path mismatch in RSC payload that occurred during static export with basePath set. #73912
Conversation
… export with basePath set.
|
Allow CI Workflow Run
Note: this should only be enabled once the PR is ready to go and can only be enabled by a maintainer |
|
@acdlite @unstubbable |
|
Thank you, @yukiyokotani. I came across this PR when hunting down a related bug resulting from the use of diff --git a/packages/next/src/client/components/router-reducer/fetch-server-response.ts b/packages/next/src/client/components/router-reducer/fetch-server-response.ts
index 02545c4ddb..7b25952dec 100644
--- a/packages/next/src/client/components/router-reducer/fetch-server-response.ts
+++ b/packages/next/src/client/components/router-reducer/fetch-server-response.ts
@@ -11,6 +11,8 @@ const { createFromReadableStream } = (
require('react-server-dom-webpack/client')
) as typeof import('react-server-dom-webpack/client')
const basePath = (process.env.__NEXT_ROUTER_BASEPATH as string) || ''
+const skipTrailingSlashRedirect =
+ (process.env.__NEXT_MANUAL_TRAILING_SLASH as boolean) ?? false
import type {
FlightRouterState,
@@ -230,7 +232,7 @@ export function createFetch(
if (process.env.NODE_ENV === 'production') {
if (process.env.__NEXT_CONFIG_OUTPUT === 'export') {
- if (fetchUrl.pathname === basePath) {
+ if (fetchUrl.pathname === basePath || skipTrailingSlashRedirect) {
fetchUrl.pathname += '/index.txt'
} else if (fetchUrl.pathname.endsWith('/')) {
fetchUrl.pathname += 'index.txt' |
…gSlashRedirect enabled in static export
|
@klittlepage Happy New Year! Thank you for finding this issue and pointing out the additional fixes. I was able to reproduce the issue on my end and confirm that the proposed code changes resolve it. I have updated the PR accordingly. |
|
Thank you @yukiyokotani! And Happy New Year to you as well. |
|
@ijjk, is there anything else to do here, or can we get this approved for a CI run? This bug is a show-stopper for static export in some deployment scenarios. |
| @@ -256,7 +259,9 @@ export function createFetch( | |||
|
|
|||
| if (process.env.NODE_ENV === 'production') { | |||
| if (process.env.__NEXT_CONFIG_OUTPUT === 'export') { | |||
| if (fetchUrl.pathname.endsWith('/')) { | |||
| if (fetchUrl.pathname === basePath || skipTrailingSlashRedirect) { | |||
There was a problem hiding this comment.
I'm not sure it's correct to always add if skipTrailingSlashRedirect is configured as this is more specific to where the file would be located which depends on the trailingSlash config https://github.com/vercel/next.js/blob/canary/packages/next/src/export/index.ts#L96
There was a problem hiding this comment.
I thought the file name was correct and the request path was incorrect, but could it actually be the other way around? That is, the request path is correct, and the file name is incorrect? The way to fix this will vary depending on the policy.
There was a problem hiding this comment.
Could we add a test case for this potentially here https://github.com/vercel/next.js/tree/canary/test/integration/app-dir-export/test
Fixing a bug
Before:
After:
