Unverified Commit 526ab5ea authored by Wyatt Johnson's avatar Wyatt Johnson Committed by GitHub

feat: add fallback root params support for prefetch segment data routes (#82282)

### What?

Add support for generating prefetch segment data routes for pages with
fallback root parameters.

### Why?

When routes have fallback root parameters but no segment paths, the
prefetch system wasn't generating the necessary rewrite rules. This
caused client-side navigation to fail for these routes because the
`/_tree` requests couldn't be properly rewritten to the prefetch RSC
route.

### How?

- Add `hasFallbackRootParams` flag and `prefetchSegmentDataRoutes` to
`ManifestRoute` type
- Generate inverse prefetch segment data routes for `/_tree` path when
routes have fallback root params
- Set flag to simplify route regex matching for these routes

Related Pull Request: https://github.com/vercel/vercel/pull/13653
parent b1f80c13
...@@ -191,6 +191,7 @@ import { InvariantError } from '../shared/lib/invariant-error' ...@@ -191,6 +191,7 @@ import { InvariantError } from '../shared/lib/invariant-error'
import { HTML_LIMITED_BOT_UA_RE_STRING } from '../shared/lib/router/utils/is-bot' import { HTML_LIMITED_BOT_UA_RE_STRING } from '../shared/lib/router/utils/is-bot'
import type { UseCacheTrackerKey } from './webpack/plugins/telemetry-plugin/use-cache-tracker-utils' import type { UseCacheTrackerKey } from './webpack/plugins/telemetry-plugin/use-cache-tracker-utils'
import { import {
buildInversePrefetchSegmentDataRoute,
buildPrefetchSegmentDataRoute, buildPrefetchSegmentDataRoute,
type PrefetchSegmentDataRoute, type PrefetchSegmentDataRoute,
} from '../server/lib/router-utils/build-prefetch-segment-data-route' } from '../server/lib/router-utils/build-prefetch-segment-data-route'
...@@ -401,6 +402,18 @@ export type ManifestRoute = ManifestBuiltRoute & { ...@@ -401,6 +402,18 @@ export type ManifestRoute = ManifestBuiltRoute & {
page: string page: string
namedRegex?: string namedRegex?: string
routeKeys?: { [key: string]: string } routeKeys?: { [key: string]: string }
/**
* If true, this indicates that the route has fallback root params. This is
* used to simplify the route regex for matching.
*/
hasFallbackRootParams?: boolean
/**
* The prefetch segment data routes for this route. This is used to rewrite
* the prefetch segment data routes (or the inverse) to the correct
* destination.
*/
prefetchSegmentDataRoutes?: PrefetchSegmentDataRoute[] prefetchSegmentDataRoutes?: PrefetchSegmentDataRoute[]
/** /**
...@@ -3172,7 +3185,12 @@ export default async function build( ...@@ -3172,7 +3185,12 @@ export default async function build(
} }
} }
if (!isAppRouteHandler && metadata?.segmentPaths) { if (
!isAppRouteHandler &&
(metadata?.segmentPaths ||
(route.fallbackRootParams &&
route.fallbackRootParams.length > 0))
) {
// If PPR isn't enabled, then we might not find the dynamic // If PPR isn't enabled, then we might not find the dynamic
// route by pathname. If that's the case, we need to find the // route by pathname. If that's the case, we need to find the
// route by page. // route by page.
...@@ -3185,7 +3203,7 @@ export default async function build( ...@@ -3185,7 +3203,7 @@ export default async function build(
} }
} }
if (metadata.segmentPaths) { if (metadata?.segmentPaths) {
const pageSegmentPath = metadata.segmentPaths.find((item) => const pageSegmentPath = metadata.segmentPaths.find((item) =>
item.endsWith('__PAGE__') item.endsWith('__PAGE__')
) )
...@@ -3216,6 +3234,27 @@ export default async function build( ...@@ -3216,6 +3234,27 @@ export default async function build(
builtSegmentDataRoute builtSegmentDataRoute
) )
} }
// If the route has fallback root params, and we don't have
// any segment paths, we need to write the inverse prefetch
// segment data route so that it can first rewrite the /_tree
// request to the prefetch RSC route. We also need to set the
// `hasFallbackRootParams` flag so that we can simplify the
// route regex for matching.
else if (
route.fallbackRootParams &&
route.fallbackRootParams.length > 0
) {
dynamicRoute.hasFallbackRootParams = true
dynamicRoute.prefetchSegmentDataRoutes = [
buildInversePrefetchSegmentDataRoute(
dynamicRoute.page,
// We use the special segment path of `/_tree` because it's
// the first one sent by the client router so it's the only
// one we need to rewrite to the regular prefetch RSC route.
'/_tree'
),
]
}
} }
pageInfos.set(route.pathname, { pageInfos.set(route.pathname, {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment