fix: update cache handler to accommodate changes in next@canary

src/build/content/prerendered.ts

@@ -45,8 +45,11 @@
  */
 const routeToFilePath = (path: string) => (path === '/' ? '/index' : path)
 
-const buildPagesCacheValue = async (path: string): Promise<NetlifyCachedPageValue> => ({
-  kind: 'PAGE',
+const buildPagesCacheValue = async (
+  path: string,
+  shouldUseEnumKind: boolean,
+): Promise<NetlifyCachedPageValue> => ({
+  kind: shouldUseEnumKind ? 'PAGES' : 'PAGE',
   html: await readFile(`${path}.html`, 'utf-8'),
   pageData: JSON.parse(await readFile(`${path}.json`, 'utf-8')),
   headers: undefined,
@@ -96,8 +99,9 @@
 const buildRouteCacheValue = async (
   path: string,
   initialRevalidateSeconds: number | false,
+  shouldUseEnumKind: boolean,
 ): Promise<NetlifyCachedRouteValue> => ({
-  kind: 'ROUTE',
+  kind: shouldUseEnumKind ? 'APP_ROUTE' : 'ROUTE',
   body: await readFile(`${path}.body`, 'base64'),
   ...JSON.parse(await readFile(`${path}.meta`, 'utf-8')),
   revalidate: initialRevalidateSeconds,
@@ -133,6 +137,12 @@
           })
         : false
 
+      const shouldUseEnumKind = ctx.nextVersion
+        ? satisfies(ctx.nextVersion, '>=15.0.0-canary.114 <15.0.0-d || >15.0.0-rc.0', {
+            includePrerelease: true,
+          })
+        : false
+
       await Promise.all(
         Object.entries(manifest.routes).map(
           ([route, meta]): Promise<void> =>
@@ -152,7 +162,10 @@
                     // if pages router returns 'notFound: true', build won't produce html and json files
                     return
                   }
-                  value = await buildPagesCacheValue(join(ctx.publishDir, 'server/pages', key))
+                  value = await buildPagesCacheValue(
+                    join(ctx.publishDir, 'server/pages', key),
+                    shouldUseEnumKind,
+                  )
                   break
                 case meta.dataRoute?.endsWith('.rsc'):
                   value = await buildAppCacheValue(
@@ -164,14 +177,15 @@
                   value = await buildRouteCacheValue(
                     join(ctx.publishDir, 'server/app', key),
                     meta.initialRevalidateSeconds,
+                    shouldUseEnumKind,
                   )
                   break
                 default:
                   throw new Error(`Unrecognized content: ${route}`)
               }
 
               // Netlify Forms are not support and require a workaround
-              if (value.kind === 'PAGE' || value.kind === 'APP_PAGE') {
+              if (value.kind === 'PAGE' || value.kind === 'PAGES' || value.kind === 'APP_PAGE') {
                 verifyNetlifyForms(ctx, value.html)
               }
 

src/run/handlers/cache.cts

@@ -132,13 +132,18 @@
 
     if (
       cacheValue.kind === 'PAGE' ||
+      cacheValue.kind === 'PAGES' ||
       cacheValue.kind === 'APP_PAGE' ||
-      cacheValue.kind === 'ROUTE'
+      cacheValue.kind === 'ROUTE' ||
+      cacheValue.kind === 'APP_ROUTE'
     ) {
       if (cacheValue.headers?.[NEXT_CACHE_TAGS_HEADER]) {
         const cacheTags = (cacheValue.headers[NEXT_CACHE_TAGS_HEADER] as string).split(',')
         requestContext.responseCacheTags = cacheTags
-      } else if (cacheValue.kind === 'PAGE' && typeof cacheValue.pageData === 'object') {
+      } else if (
+        (cacheValue.kind === 'PAGE' || cacheValue.kind === 'PAGES') &&
+        typeof cacheValue.pageData === 'object'
+      ) {
         // pages router doesn't have cache tags headers in PAGE cache value
         // so we need to generate appropriate cache tags for it
         const cacheTags = [`_N_T_${key === '/index' ? '/' : key}`]
@@ -186,6 +191,7 @@
   }
 
   async get(...args: Parameters<CacheHandler['get']>): ReturnType<CacheHandler['get']> {
+    debugger
     return this.tracer.withActiveSpan('get cache key', async (span) => {
       const [key, ctx = {}] = args
       getLogger().debug(`[NetlifyCacheHandler.get]: ${key}`)
@@ -224,8 +230,9 @@
             value: blob.value,
           }
 
-        case 'ROUTE': {
-          span.addEvent('ROUTE', { lastModified: blob.lastModified, status: blob.value.status })
+        case 'ROUTE':
+        case 'APP_ROUTE': {
+          span.addEvent('APP_ROUTE', { lastModified: blob.lastModified, status: blob.value.status })
 
           const valueWithoutRevalidate = this.captureRouteRevalidateAndRemoveFromObject(blob.value)
 
@@ -237,12 +244,13 @@
             },
           }
         }
-        case 'PAGE': {
+        case 'PAGE':
+        case 'PAGES': {
           span.addEvent('PAGE', { lastModified: blob.lastModified })
 
           const { revalidate, ...restOfPageValue } = blob.value
 
           await this.injectEntryToPrerenderManifest(key, revalidate)
 
           return {
             lastModified: blob.lastModified,
@@ -275,15 +283,15 @@
     data: Parameters<IncrementalCache['set']>[1],
     context: Parameters<IncrementalCache['set']>[2],
   ): NetlifyIncrementalCacheValue | null {
-    if (data?.kind === 'ROUTE') {
+    if (data?.kind === 'ROUTE' || data?.kind === 'APP_ROUTE') {
       return {
         ...data,
         revalidate: context.revalidate,
         body: data.body.toString('base64'),
       }
     }
 
-    if (data?.kind === 'PAGE') {
+    if (data?.kind === 'PAGE' || data?.kind === 'PAGES') {
       return {
         ...data,
         revalidate: context.revalidate,
@@ -321,7 +329,7 @@
         value,
       })
 
-      if (data?.kind === 'PAGE') {
+      if (data?.kind === 'PAGE' || data?.kind === 'PAGES') {
         const requestContext = getRequestContext()
         if (requestContext?.didPagesRouterOnDemandRevalidate) {
           const tag = `_N_T_${key === '/index' ? '/' : key}`
@@ -397,8 +405,10 @@
       cacheTags = [...tags, ...softTags]
     } else if (
       cacheEntry.value?.kind === 'PAGE' ||
+      cacheEntry.value?.kind === 'PAGES' ||
       cacheEntry.value?.kind === 'APP_PAGE' ||
-      cacheEntry.value?.kind === 'ROUTE'
+      cacheEntry.value?.kind === 'ROUTE' ||
+      cacheEntry.value?.kind === 'APP_ROUTE'
     ) {
       cacheTags = (cacheEntry.value.headers?.[NEXT_CACHE_TAGS_HEADER] as string)?.split(',') || []
     } else {

src/run/handlers/request-context.cts

@@ -4,6 +4,9 @@ import { LogLevel, systemLogger } from '@netlify/functions/internal'
 
 import type { NetlifyCachedRouteValue } from '../../shared/cache-types.cjs'
 
+// hacks?
+process.env.NODE_ENV = 'production'
+
 type SystemLogger = typeof systemLogger
 
 export type RequestContext = {

src/shared/cache-types.cts

@@ -28,7 +28,7 @@ export type NetlifyCachedAppPageValue = Omit<IncrementalCachedAppPageValue, 'rsc
   revalidate?: Parameters<IncrementalCache['set']>[2]['revalidate']
 }
 
-type CachedPageValue = Extract<IncrementalCacheValue, { kind: 'PAGE' }>
+type CachedPageValue = Extract<IncrementalCacheValue, { kind: 'PAGES' }>
 
 export type NetlifyCachedPageValue = CachedPageValue & {
   revalidate?: Parameters<IncrementalCache['set']>[2]['revalidate']

tests/prepare.mjs

@@ -44,14 +44,17 @@ const promises = fixtures.map((fixture) =>
       })
     }
 
-    // npm is the default
-    let cmd = `npm install --no-audit --progress=false --prefer-offline --legacy-peer-deps`
+    let cmd = ``
     const { packageManager } = JSON.parse(await readFile(join(cwd, 'package.json'), 'utf8'))
     if (packageManager?.startsWith('pnpm')) {
       // We disable frozen-lockfile because we may have changed the version of Next.js
       cmd = `pnpm install --frozen-lockfile=false ${
         process.env.DEBUG || NEXT_VERSION !== 'latest' ? '' : '--reporter silent'
       }`
+    } else {
+      // npm is the default
+      cmd = `npm install --no-audit --progress=false --prefer-offline --legacy-peer-deps`
+      await rm(join(cwd, 'package-lock.json'), { force: true })
     }
 
     const addPrefix = new Transform({

tests/utils/fixture.ts

@@ -89,6 +89,7 @@ export const createFixture = async (fixture: string, ctx: FixtureTestContext) =>
   ) {
     // @ts-ignore fetch doesn't have _nextOriginalFetch property in types
     globalThis.fetch = globalThis._nextOriginalFetch || globalThis.fetch._nextOriginalFetch
+    delete globalThis[Symbol.for('next-patch')]
   }
 
   ctx.cwd = await mkdtemp(join(tmpdir(), 'netlify-next-runtime-'))

tests/utils/next-version-helpers.mjs

@@ -4,12 +4,11 @@ import { readFile, writeFile } from 'node:fs/promises'
 
 import fg from 'fast-glob'
 import { gte, satisfies, valid } from 'semver'
+import { execaCommand } from 'execa'
 
 const FUTURE_NEXT_PATCH_VERSION = '14.999.0'
 
 const NEXT_VERSION_REQUIRES_REACT_19 = '14.3.0-canary.45'
-// TODO: Update this when React 19 is released
-const REACT_19_VERSION = '19.0.0-rc.0'
 const REACT_18_VERSION = '18.2.0'
 
 /**
@@ -97,8 +96,17 @@ export async function setNextVersionInFixture(
           return
         }
         packageJson.dependencies.next = version
+
+        const { stdout } = await execaCommand(
+          `npm info next@${resolvedVersion} peerDependencies --json`,
+          { cwd },
+        )
+
+        const nextPeerDependencies = JSON.parse(stdout)
+
         if (updateReact && nextVersionRequiresReact19(checkVersion)) {
-          const reactVersion = operation === 'update' ? REACT_19_VERSION : REACT_18_VERSION
+          const reactVersion =
+            operation === 'update' ? nextPeerDependencies['react'] : REACT_18_VERSION
           packageJson.dependencies.react = reactVersion
           packageJson.dependencies['react-dom'] = reactVersion
         }