Skip to content

Commit f210710

Browse files
committed
ensure cache key is cased consistently
1 parent e8e5f8a commit f210710

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

packages/next/src/client/components/router-reducer/create-router-cache-key.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ export function createRouterCacheKey(
44
segment: Segment,
55
withoutSearchParameters: boolean = false
66
) {
7-
return Array.isArray(segment)
7+
const cacheKey = Array.isArray(segment)
88
? `${segment[0]}|${segment[1]}|${segment[2]}`
99
: withoutSearchParameters && segment.startsWith('__PAGE__')
1010
? '__PAGE__'
1111
: segment
12+
13+
return cacheKey?.toUpperCase()
1214
}

packages/next/src/export/routes/app-page.ts

+1-10
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export async function generatePrefetchRsc(
2929
path: string,
3030
res: MockedResponse,
3131
pathname: string,
32-
query: NextParsedUrlQuery,
3332
htmlFilepath: string,
3433
renderOpts: RenderOpts
3534
) {
@@ -41,13 +40,7 @@ export async function generatePrefetchRsc(
4140
renderOpts.isPrefetch = true
4241
delete renderOpts.isRevalidate
4342

44-
const prefetchRenderResult = await render(
45-
req,
46-
res,
47-
pathname,
48-
query,
49-
renderOpts
50-
)
43+
const prefetchRenderResult = await render(req, res, pathname, {}, renderOpts)
5144

5245
prefetchRenderResult.pipe(res)
5346
await res.hasStreamed
@@ -87,7 +80,6 @@ export async function exportAppPage(
8780
path,
8881
res,
8982
pathname,
90-
query,
9183
htmlFilepath,
9284
renderOpts
9385
)
@@ -113,7 +105,6 @@ export async function exportAppPage(
113105
path,
114106
res,
115107
pathname,
116-
query,
117108
htmlFilepath,
118109
renderOpts
119110
)

0 commit comments

Comments
 (0)