Update revalidate handling for app

packages/next/cache.d.ts

@@ -0,0 +1,3 @@
+export { unstable_cache } from 'next/dist/server/web/spec-extension/unstable-cache'
+export { unstable_revalidatePath } from 'next/dist/server/web/spec-extension/unstable-revalidate-path'
+export { unstable_revalidateTag } from 'next/dist/server/web/spec-extension/unstable-revalidate-tag'

packages/next/cache.js

@@ -0,0 +1,19 @@
+const cacheExports = {
+  unstable_cache: require('next/dist/server/web/spec-extension/unstable-cache')
+    .unstable_cache,
+  unstable_revalidateTag:
+    require('next/dist/server/web/spec-extension/unstable-revalidate-tag')
+      .unstable_revalidateTag,
+  unstable_revalidatePath:
+    require('next/dist/server/web/spec-extension/unstable-revalidate-path')
+      .unstable_revalidatePath,
+}
+
+// https://nodejs.org/api/esm.html#commonjs-namespaces
+// When importing CommonJS modules, the module.exports object is provided as the default export
+module.exports = cacheExports
+
+// make import { xxx } from 'next/server' work
+exports.unstable_cache = cacheExports.unstable_cache
+exports.unstable_revalidatePath = cacheExports.unstable_revalidatePath
+exports.unstable_revalidateTag = cacheExports.unstable_revalidateTag

packages/next/index.d.ts

@@ -2,6 +2,7 @@
 /// <reference path="./dist/styled-jsx/types/global.d.ts" />
 /// <reference path="./amp.d.ts" />
 /// <reference path="./app.d.ts" />
+/// <reference path="./cache.d.ts" />
 /// <reference path="./config.d.ts" />
 /// <reference path="./document.d.ts" />
 /// <reference path="./dynamic.d.ts" />

packages/next/package.json

@@ -17,6 +17,8 @@
     "client.js",
     "client.d.ts",
     "compat",
+    "cache.js",
+    "cache.d.ts",
     "config.js",
     "config.d.ts",
     "constants.js",

packages/next/server.d.ts

@@ -13,6 +13,3 @@ export { userAgent } from 'next/dist/server/web/spec-extension/user-agent'
 export { URLPattern } from 'next/dist/compiled/@edge-runtime/primitives/url'
 export { ImageResponse } from 'next/dist/server/web/spec-extension/image-response'
 export type { ImageResponseOptions } from 'next/dist/compiled/@vercel/og/types'
-export { unstable_cache } from 'next/dist/server/web/spec-extension/unstable-cache'
-export { unstable_revalidatePath } from 'next/dist/server/web/spec-extension/unstable-revalidate-path'
-export { unstable_revalidateTag } from 'next/dist/server/web/spec-extension/unstable-revalidate-tag'

packages/next/server.js

@@ -5,14 +5,6 @@ const serverExports = {
     .NextResponse,
   ImageResponse: require('next/dist/server/web/spec-extension/image-response')
     .ImageResponse,
-  unstable_cache: require('next/dist/server/web/spec-extension/unstable-cache')
-    .unstable_cache,
-  unstable_revalidateTag:
-    require('next/dist/server/web/spec-extension/unstable-revalidate-tag')
-      .unstable_revalidateTag,
-  unstable_revalidatePath:
-    require('next/dist/server/web/spec-extension/unstable-revalidate-path')
-      .unstable_revalidatePath,
   userAgentFromString: require('next/dist/server/web/spec-extension/user-agent')
     .userAgentFromString,
   userAgent: require('next/dist/server/web/spec-extension/user-agent')
@@ -32,9 +24,6 @@ module.exports = serverExports
 exports.NextRequest = serverExports.NextRequest
 exports.NextResponse = serverExports.NextResponse
 exports.ImageResponse = serverExports.ImageResponse
-exports.unstable_cache = serverExports.unstable_cache
-exports.unstable_revalidatePath = serverExports.unstable_revalidatePath
-exports.unstable_revalidateTag = serverExports.unstable_revalidateTag
 exports.userAgentFromString = serverExports.userAgentFromString
 exports.userAgent = serverExports.userAgent
 exports.URLPattern = serverExports.URLPattern

packages/next/src/build/index.ts

@@ -2377,16 +2377,16 @@ export default async function build(
                   initialHeaders?: SsgRoute['initialHeaders']
                 } = {}
 
-                if (isRouteHandler) {
-                  const exportRouteMeta =
-                    exportConfig.initialPageMetaMap[route] || {}
+                const exportRouteMeta: {
+                  status?: number
+                  headers?: Record<string, string>
+                } = exportConfig.initialPageMetaMap[route] || {}
 
-                  if (exportRouteMeta.status !== 200) {
-                    routeMeta.initialStatus = exportRouteMeta.status
-                  }
-                  if (Object.keys(exportRouteMeta.headers).length) {
-                    routeMeta.initialHeaders = exportRouteMeta.headers
-                  }
+                if (exportRouteMeta.status !== 200) {
+                  routeMeta.initialStatus = exportRouteMeta.status
+                }
+                if (Object.keys(exportRouteMeta.headers || {}).length) {
+                  routeMeta.initialHeaders = exportRouteMeta.headers
                 }
 
                 finalPrerenderRoutes[route] = {

packages/next/src/client/components/static-generation-async-storage.ts

@@ -7,6 +7,7 @@ export interface StaticGenerationStore {
   readonly pathname: string
   readonly incrementalCache?: IncrementalCache
   readonly isRevalidate?: boolean
+  readonly isMinimalMode?: boolean
   readonly isOnDemandRevalidate?: boolean
   readonly isPrerendering?: boolean
 
@@ -17,6 +18,7 @@ export interface StaticGenerationStore {
     | 'force-no-store'
     | 'default-no-store'
     | 'only-no-store'
+
   revalidate?: false | number
   forceStatic?: boolean
   dynamicShouldError?: boolean
@@ -26,6 +28,8 @@ export interface StaticGenerationStore {
   dynamicUsageStack?: string
 
   nextFetchId?: number
+
+  tags?: string[]
 }
 
 export type StaticGenerationAsyncStorage =

packages/next/src/export/worker.ts

@@ -46,6 +46,7 @@ import { isAppRouteRoute } from '../lib/is-app-route-route'
 import { toNodeHeaders } from '../server/web/utils'
 import { RouteModuleLoader } from '../server/future/helpers/module-loader/route-module-loader'
 import { NextRequestAdapter } from '../server/web/spec-extension/adapters/next-request'
+import * as ciEnvironment from '../telemetry/ci-info'
 
 const envConfig = require('../shared/lib/runtime-config')
 
@@ -322,6 +323,12 @@ export default async function exportPage({
           fontManifest: optimizeFonts ? requireFontManifest(distDir) : null,
           locale: locale as string,
           supportsDynamicHTML: false,
+          ...(ciEnvironment.hasNextSupport
+            ? {
+                isMinimalMode: true,
+                isRevalidate: true,
+              }
+            : {}),
         }
       }
 
@@ -400,6 +407,12 @@ export default async function exportPage({
               nextExport: true,
               supportsDynamicHTML: false,
               incrementalCache: curRenderOpts.incrementalCache,
+              ...(ciEnvironment.hasNextSupport
+                ? {
+                    isMinimalMode: true,
+                    isRevalidate: true,
+                  }
+                : {}),
             },
           }
 
@@ -429,6 +442,12 @@ export default async function exportPage({
 
               results.fromBuildExportRevalidate = revalidate
               const headers = toNodeHeaders(response.headers)
+              const cacheTags = (context.staticGenerationContext as any)
+                .fetchTags
+
+              if (cacheTags) {
+                headers['x-next-cache-tags'] = cacheTags
+              }
 
               if (!headers['content-type'] && body.type) {
                 headers['content-type'] = body.type
@@ -481,7 +500,26 @@ export default async function exportPage({
             results.fromBuildExportRevalidate = revalidate
 
             if (revalidate !== 0) {
+              const cacheTags = (curRenderOpts as any).fetchTags
+              const headers = cacheTags
+                ? {
+                    'x-next-cache-tags': cacheTags,
+                  }
+                : undefined
+
+              if (ciEnvironment.hasNextSupport) {
+                if (cacheTags) {
+                  results.fromBuildExportMeta = {
+                    headers,
+                  }
+                }
+              }
+
               await promises.writeFile(htmlFilepath, html ?? '', 'utf8')
+              await promises.writeFile(
+                htmlFilepath.replace(/\.html$/, '.meta'),
+                JSON.stringify({ headers })
+              )
               await promises.writeFile(
                 htmlFilepath.replace(/\.html$/, '.rsc'),
                 flightData

packages/next/src/server/app-render/app-render.tsx

@@ -49,7 +49,7 @@ import {
   getURLFromRedirectError,
   isRedirectError,
 } from '../../client/components/redirect'
-import { patchFetch } from '../lib/patch-fetch'
+import { addImplicitTags, patchFetch } from '../lib/patch-fetch'
 import { AppRenderSpan } from '../lib/trace/constants'
 import { getTracer } from '../lib/trace/tracer'
 import { interopDefault } from './interop-default'
@@ -1571,6 +1571,8 @@ export async function renderToHTMLOrFlight(
     if (staticGenerationStore.pendingRevalidates) {
       await Promise.all(staticGenerationStore.pendingRevalidates)
     }
+    addImplicitTags(staticGenerationStore)
+    ;(renderOpts as any).fetchTags = staticGenerationStore.tags?.join(',')
 
     if (staticGenerationStore.isStaticGeneration) {
       const htmlResult = await streamToBufferedResult(renderResult)

packages/next/src/server/base-http/index.ts

@@ -38,6 +38,11 @@ export abstract class BaseNextResponse<Destination = any> {
    */
   abstract setHeader(name: string, value: string | string[]): this
 
+  /**
+   * Removes a header
+   */
+  abstract removeHeader(name: string): this
+
   /**
    * Appends value for the given header name
    */

packages/next/src/server/base-http/node.ts

@@ -85,6 +85,11 @@ export class NodeNextResponse extends BaseNextResponse<Writable> {
     return this
   }
 
+  removeHeader(name: string): this {
+    this._res.removeHeader(name)
+    return this
+  }
+
   getHeaderValues(name: string): string[] | undefined {
     const values = this._res.getHeader(name)
 

packages/next/src/server/base-http/web.ts

@@ -64,6 +64,11 @@ export class WebNextResponse extends BaseNextResponse<WritableStream> {
     return this
   }
 
+  removeHeader(name: string): this {
+    this.headers.delete(name)
+    return this
+  }
+
   getHeaderValues(name: string): string[] | undefined {
     // https://developer.mozilla.org/en-US/docs/Web/API/Headers/get#example
     return this.getHeader(name)