@@ -157,12 +157,15 @@ test.describe('Simple Page Router (no basePath, no i18n)', () => {
157
157
158
158
const fallbackWasServed =
159
159
useFallback && headers1 [ 'cache-status' ] . includes ( '"Next.js"; fwd=miss' )
160
- expect ( headers1 [ 'netlify-cache-tag' ] ) . toBe (
161
- fallbackWasServed ? undefined : `_n_t_${ encodeURI ( pagePath ) . toLowerCase ( ) } ` ,
162
- )
160
+ if ( ! fallbackWasServed ) {
161
+ expect ( headers1 [ 'netlify-cache-tag' ] ) . toBe ( `_n_t_${ encodeURI ( pagePath ) . toLowerCase ( ) } ` )
162
+ }
163
163
expect ( headers1 [ 'netlify-cdn-cache-control' ] ) . toBe (
164
164
fallbackWasServed
165
- ?undefined
165
+ ?// fallback should not be cached
166
+ nextVersionSatisfies ( '>=15.4.0-canary.95' )
167
+ ?`private, no-cache, no-store, max-age=0, must-revalidate, durable`
168
+ :undefined
166
169
:nextVersionSatisfies ( '>=15.0.0-canary.187' )
167
170
?'s-maxage=31536000, durable'
168
171
:'s-maxage=31536000, stale-while-revalidate=31536000, durable' ,
@@ -722,14 +725,17 @@ test.describe('Page Router with basePath and i18n', () => {
722
725
const fallbackWasServedImplicitLocale =
723
726
useFallback && headers1ImplicitLocale [ 'cache-status' ] . includes ( '"Next.js"; fwd=miss' )
724
727
725
- expect ( headers1ImplicitLocale [ 'netlify-cache-tag' ] ) . toBe (
726
- fallbackWasServedImplicitLocale
727
- ? undefined
728
- : `_n_t_/en ${ encodeURI ( pagePath ) . toLowerCase ( ) } ` ,
729
- )
728
+ if ( ! fallbackWasServedImplicitLocale ) {
729
+ expect ( headers1ImplicitLocale [ 'netlify-cache-tag' ] ) . toBe (
730
+ `_n_t_/en ${ encodeURI ( pagePath ) . toLowerCase ( ) } ` ,
731
+ )
732
+ }
730
733
expect ( headers1ImplicitLocale [ 'netlify-cdn-cache-control' ] ) . toBe (
731
734
fallbackWasServedImplicitLocale
732
- ?undefined
735
+ ?// fallback should not be cached
736
+ nextVersionSatisfies ( '>=15.4.0-canary.95' )
737
+ ?`private, no-cache, no-store, max-age=0, must-revalidate, durable`
738
+ :undefined
733
739
:nextVersionSatisfies ( '>=15.0.0-canary.187' )
734
740
?'s-maxage=31536000, durable'
735
741
:'s-maxage=31536000, stale-while-revalidate=31536000, durable' ,
@@ -1144,12 +1150,17 @@ test.describe('Page Router with basePath and i18n', () => {
1144
1150
1145
1151
const fallbackWasServed =
1146
1152
useFallback && headers1 [ 'cache-status' ] . includes ( '"Next.js"; fwd=miss' )
1147
- expect ( headers1 [ 'netlify-cache-tag' ] ) . toBe (
1148
- fallbackWasServed ?undefined :`_n_t_/de${ encodeURI ( pagePath ) . toLowerCase ( ) } ` ,
1149
- )
1153
+ if ( ! fallbackWasServed ) {
1154
+ expect ( headers1 [ 'netlify-cache-tag' ] ) . toBe (
1155
+ `_n_t_/de${ encodeURI ( pagePath ) . toLowerCase ( ) } ` ,
1156
+ )
1157
+ }
1150
1158
expect ( headers1 [ 'netlify-cdn-cache-control' ] ) . toBe (
1151
1159
fallbackWasServed
1152
- ?undefined
1160
+ ?// fallback should not be cached
1161
+ nextVersionSatisfies ( '>=15.4.0-canary.95' )
1162
+ ?`private, no-cache, no-store, max-age=0, must-revalidate, durable`
1163
+ :undefined
1153
1164
:nextVersionSatisfies ( '>=15.0.0-canary.187' )
1154
1165
?'s-maxage=31536000, durable'
1155
1166
:'s-maxage=31536000, stale-while-revalidate=31536000, durable' ,