Skip to content

Commit 4331ba6

Browse files
piehpieh
committed
test: add comma cases
1 parent 2c999c5 commit 4331ba6

File tree

10 files changed

+34
-39
lines changed

10 files changed

+34
-39
lines changed

‎playwright.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export default defineConfig({
2525
extraHTTPHeaders: {
2626
/* Add debug logging for netlify cache headers */
2727
'x-nf-debug-logging': '1',
28+
'x-next-debug-logging': '1',
2829
},
2930
},
3031
timeout: 10 * 60 * 1000,

‎src/run/handlers/cache.cts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export class NetlifyCacheHandler implements CacheHandlerForMultipleVersions {
139139
cacheValue.kind === 'APP_ROUTE'
140140
) {
141141
if (cacheValue.headers?.[NEXT_CACHE_TAGS_HEADER]) {
142-
const cacheTags = (cacheValue.headers[NEXT_CACHE_TAGS_HEADER] as string).split(',')
142+
const cacheTags = (cacheValue.headers[NEXT_CACHE_TAGS_HEADER] as string).split(/,|%2c/gi)
143143
requestContext.responseCacheTags = cacheTags
144144
} else if (
145145
(cacheValue.kind === 'PAGE' || cacheValue.kind === 'PAGES') &&
@@ -347,7 +347,7 @@ export class NetlifyCacheHandler implements CacheHandlerForMultipleVersions {
347347
const tag = `_N_T_${key === '/index' ? '/' : encodeURI(key)}`
348348
getLogger().debug(`Purging CDN cache for: [${tag}]`)
349349
requestContext.trackBackgroundWork(
350-
purgeCache({ tags: [tag] }).catch((error) => {
350+
purgeCache({ tags: tag.split(/,|%2c/gi) }).catch((error) => {
351351
// TODO: add reporting here
352352
getLogger()
353353
.withError(error)
@@ -375,7 +375,9 @@ export class NetlifyCacheHandler implements CacheHandlerForMultipleVersions {
375375
private async doRevalidateTag(tagOrTags: string | string[], ...args: any) {
376376
getLogger().withFields({ tagOrTags, args }).debug('NetlifyCacheHandler.revalidateTag')
377377

378-
const tags = Array.isArray(tagOrTags) ? tagOrTags : [tagOrTags]
378+
const tags = (Array.isArray(tagOrTags) ? tagOrTags : [tagOrTags]).flatMap((tag) =>
379+
tag.split(/,|%2c/gi),
380+
)
379381

380382
const data: TagManifest = {
381383
revalidatedAt: Date.now(),
@@ -422,7 +424,8 @@ export class NetlifyCacheHandler implements CacheHandlerForMultipleVersions {
422424
cacheEntry.value?.kind === 'ROUTE' ||
423425
cacheEntry.value?.kind === 'APP_ROUTE'
424426
) {
425-
cacheTags = (cacheEntry.value.headers?.[NEXT_CACHE_TAGS_HEADER] as string)?.split(',') || []
427+
cacheTags =
428+
(cacheEntry.value.headers?.[NEXT_CACHE_TAGS_HEADER] as string)?.split(/,|%2c/gi) || []
426429
} else {
427430
return false
428431
}

‎tests/e2e/on-demand-app.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ test.describe('app router on-demand revalidation', () => {
4848
{
4949
label: 'revalidatePath (prerendered page with dynamic path) - non-ASCII variant',
5050
prerendered: true,
51-
pagePath: '/product/事前レンダリング',
52-
revalidateApiPath: `/api/on-demand-revalidate/path?path=/product/事前レンダリング`,
53-
expectedH1Content: 'Product 事前レンダリング',
51+
pagePath: '/product/事前レンダリング,test',
52+
revalidateApiPath: `/api/on-demand-revalidate/path?path=/product/事前レンダリング,test`,
53+
expectedH1Content: 'Product 事前レンダリング,test',
5454
},
5555
{
5656
label: 'revalidatePath (not prerendered page with dynamic path) - non-ASCII variant',
5757
prerendered: false,
58-
pagePath: '/product/事前レンダリングされていない',
59-
revalidateApiPath: `/api/on-demand-revalidate/path?path=/product/事前レンダリングされていない`,
60-
expectedH1Content: 'Product 事前レンダリングされていない',
58+
pagePath: '/product/事前レンダリングされていない,test',
59+
revalidateApiPath: `/api/on-demand-revalidate/path?path=/product/事前レンダリングされていない,test`,
60+
expectedH1Content: 'Product 事前レンダリングされていない,test',
6161
},
6262
]) {
6363
test(label, async ({ page, pollUntilHeadersMatch, serverComponents }) => {

‎tests/e2e/page-router.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@ test.describe('Simple Page Router (no basePath, no i18n)', () => {
8484
label:
8585
'prerendered page with dynamic path and awaited res.revalidate() - non-ASCII variant',
8686
prerendered: true,
87-
pagePath: '/products/事前レンダリング',
87+
pagePath: '/products/事前レンダリング,test',
8888
revalidateApiBasePath: '/api/revalidate',
89-
expectedH1Content: 'Product 事前レンダリング',
89+
expectedH1Content: 'Product 事前レンダリング,test',
9090
},
9191
{
9292
label:
9393
'not prerendered page with dynamic path and awaited res.revalidate() - non-ASCII variant',
9494
prerendered: false,
95-
pagePath: '/products/事前レンダリングされていない',
95+
pagePath: '/products/事前レンダリングされていない,test',
9696
revalidateApiBasePath: '/api/revalidate',
97-
expectedH1Content: 'Product 事前レンダリングされていない',
97+
expectedH1Content: 'Product 事前レンダリングされていない,test',
9898
},
9999
]) {
100100
test(label, async ({ page, pollUntilHeadersMatch, pageRouter }) => {
@@ -479,17 +479,17 @@ test.describe('Page Router with basePath and i18n', () => {
479479
label:
480480
'prerendered page with dynamic path and awaited res.revalidate() - non-ASCII variant',
481481
prerendered: true,
482-
pagePath: '/products/事前レンダリング',
482+
pagePath: '/products/事前レンダリング,test',
483483
revalidateApiBasePath: '/api/revalidate',
484-
expectedH1Content: 'Product 事前レンダリング',
484+
expectedH1Content: 'Product 事前レンダリング,test',
485485
},
486486
{
487487
label:
488488
'not prerendered page with dynamic path and awaited res.revalidate() - non-ASCII variant',
489489
prerendered: false,
490-
pagePath: '/products/事前レンダリングされていない',
490+
pagePath: '/products/事前レンダリングされていない,test',
491491
revalidateApiBasePath: '/api/revalidate',
492-
expectedH1Content: 'Product 事前レンダリングされていない',
492+
expectedH1Content: 'Product 事前レンダリングされていない,test',
493493
},
494494
]) {
495495
test.describe(label, () => {

‎tests/fixtures/page-router-base-path-i18n/pages/products/[slug].js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ export const getStaticPaths = ({ locales }) => {
2828
},
2929
{
3030
params: {
31-
// Japanese prerendered (non-ascii)
32-
slug: '事前レンダリング',
31+
// Japanese prerendered (non-ascii) and comma
32+
slug: '事前レンダリング,test',
3333
},
3434
},
3535
].flatMap((pathDescription) => locales.map((locale) => ({ ...pathDescription, locale }))),

‎tests/fixtures/page-router/pages/products/[slug].js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export const getStaticPaths = () => {
3232
},
3333
{
3434
params: {
35-
// Japanese prerendered (non-ascii)
36-
slug: '事前レンダリング',
35+
// Japanese prerendered (non-ascii) and comma
36+
slug: '事前レンダリング,test',
3737
},
3838
},
3939
],

‎tests/fixtures/server-components/app/api/on-demand-revalidate/path/route.ts‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ import { revalidatePath } from 'next/cache'
33

44
export async function GET(request: NextRequest) {
55
const url = new URL(request.url)
6-
let pathToRevalidate = url.searchParams.get('path')
7-
8-
if (pathToRevalidate) {
9-
pathToRevalidate = encodeURI(pathToRevalidate)
10-
} else {
11-
pathToRevalidate = '/static-fetch/[id]/page'
12-
}
6+
const pathToRevalidate = url.searchParams.get('path') ?? '/static-fetch/[id]/page'
137

148
revalidatePath(pathToRevalidate)
15-
return NextResponse.json({
16-
revalidated: true,
17-
now: new Date().toISOString(),
18-
})
9+
return NextResponse.json({ revalidated: true, now: new Date().toISOString() })
1910
}
2011

2112
export const dynamic = 'force-dynamic'

‎tests/fixtures/server-components/app/product/[slug]/page.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const Product = ({ params }) => (
22
<div>
3-
<h1>Product {decodeURI(params.slug)}</h1>
3+
<h1>Product {decodeURIComponent(params.slug)}</h1>
44
<p>
55
This page uses generateStaticParams() to prerender a Product
66
<span data-testid="date-now">{new Date().toISOString()}</span>
@@ -11,8 +11,8 @@ const Product = ({ params }) => (
1111
export async function generateStaticParams() {
1212
return [
1313
{
14-
// Japanese prerendered (non-ascii)
15-
slug: '事前レンダリング',
14+
// Japanese prerendered (non-ascii) and comma
15+
slug: '事前レンダリング,test',
1616
},
1717
]
1818
}

‎tests/integration/cache-handler.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('page router', () => {
4646
// the real key is much longer and ends in a hash, but we only assert on the first 50 chars to make it easier
4747
'/products/an-incredibly-long-product-',
4848
'/products/prerendered',
49-
'/products/事前レンダリング',
49+
'/products/事前レンダリング,te',
5050
'/static/revalidate-automatic',
5151
'/static/revalidate-manual',
5252
'/static/revalidate-slow',
@@ -360,7 +360,7 @@ describe('plugin', () => {
360360
'/api/static/first',
361361
'/api/static/second',
362362
'/index',
363-
'/product/事前レンダリング',
363+
'/product/事前レンダリング,test',
364364
'/revalidate-fetch',
365365
'/static-fetch-1',
366366
'/static-fetch-2',

‎tests/integration/static.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test<FixtureTestContext>('requesting a non existing page route that needs to be
3737
expect(entries.map(({ key }) => decodeBlobKey(key.substring(0, 50))).sort()).toEqual([
3838
'/products/an-incredibly-long-product-',
3939
'/products/prerendered',
40-
'/products/事前レンダリング',
40+
'/products/事前レンダリング,te',
4141
'/static/revalidate-automatic',
4242
'/static/revalidate-manual',
4343
'/static/revalidate-slow',

0 commit comments

Comments
 (0)