vinext 0.0.46 → 0.0.48

package/README.md

@@ -4,7 +4,7 @@ The Next.js API surface, reimplemented on Vite.
 
 > **Read the announcement:** [How we rebuilt Next.js with AI in one week](https://blog.cloudflare.com/vinext/)
 
-> 🚧 **Experimental — under heavy development.** This project is an experiment in AI-driven software development. The vast majority of the code, tests, and documentation were written by AI (Claude Code). Humans direct architecture, priorities, and design decisions, but have not reviewed most of the code line-by-line. Treat this accordingly — there will be bugs, rough edges, and things that don't work. Use at your own risk.
+> 🚧 **Experimental — under heavy development.** This project is an experiment in AI-driven software development. The vast majority of the code, tests, and documentation are written by AI, with humans steering throughout: setting architecture and priorities, making design decisions, reviewing changes, triaging complex problems, and shipping fixes. There may be bugs, rough edges, or things that don't work. Use at your own risk.
 
 ## Quick start
 
@@ -124,7 +124,7 @@ Use `--force` to overwrite an existing `vite.config.ts`, or `--skip-check` to sk
 
 Vite has become the default build tool for modern web frameworks — fast HMR, a clean plugin API, native ESM, and a growing ecosystem. With [`@vitejs/plugin-rsc`](https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-rsc) adding React Server Components support, it's now possible to build a full RSC framework on Vite.
 
-vinext is an experiment: can we reimplement the Next.js API surface on Vite, so that existing Next.js applications can run on a completely different toolchain? The answer, so far, is mostly yes — about 94% of the API surface works.
+vinext is an experiment: can we reimplement the Next.js API surface on Vite, so that existing Next.js applications can run on a completely different toolchain? The answer, so far, is mostly yes.
 
 vinext works everywhere. It natively supports Cloudflare Workers (with `vinext deploy`, bindings, KV caching), and can be deployed to Vercel, Netlify, AWS, Deno Deploy, and more via the [Nitro](https://v3.nitro.build/) Vite plugin. Native support for additional platforms is [planned](https://github.com/cloudflare/vinext/issues/80).
 
@@ -161,7 +161,7 @@ Yes. Next.js supports [self-hosting](https://nextjs.org/docs/app/building-your-a
 The test suite has over 1,700 Vitest tests and 380 Playwright E2E tests. This includes tests ported directly from the [Next.js test suite](https://github.com/vercel/next.js/tree/canary/test) and [OpenNext's Cloudflare conformance suite](https://github.com/opennextjs/opennextjs-cloudflare), covering routing, SSR, RSC, server actions, caching, metadata, middleware, streaming, and more. Vercel's [App Router Playground](https://github.com/vercel/next-app-router-playground) also runs on vinext as an integration test. See the [Tests](#tests) section and `tests/nextjs-compat/TRACKING.md` for details.
 
 **Who is reviewing this code?**
-Mostly nobody. This is an experiment in seeing how far AI-driven development can go. The test suite is the primary quality gate — not human code review. Contributions and code review are welcome.
+A mix of humans and AI agents. Humans review PRs before they merge, focused on behavior, structure, and long-term direction. We lean heavily on agent-driven code review to catch issues at PR time and across the codebase. The test suite is the primary quality gate. Outside contributions and deeper human code review are very welcome.
 
 **Why Vite?**
 Vite is an excellent build tool with a rich plugin ecosystem, first-class ESM support, and fast HMR. The [`@vitejs/plugin-rsc`](https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-rsc) plugin adds React Server Components support with multi-environment builds. This project is an experiment to see how much of the Next.js developer experience can be replicated on top of Vite's infrastructure.
@@ -544,7 +544,7 @@ The `CacheHandler` interface matches Next.js 16's shape, so community adapters s
 
 ## What's NOT supported (and won't be)
 
-These are intentional exclusions:
+These are intentional exclusions. For things that are missing today but on the roadmap, see [Known limitations](#known-limitations) below.
 
 - **Vercel-specific features** — `@vercel/og` edge runtime, Vercel Analytics integration, Vercel KV/Blob/Postgres bindings. Use platform equivalents.
 - **AMP** — Deprecated since Next.js 13. `useAmp()` returns `false`.
@@ -556,6 +556,8 @@ These are intentional exclusions:
 
 ## Known limitations
 
+These are gaps we'd like to close — distinct from the [intentional exclusions](#whats-not-supported-and-wont-be) above.
+
 - **Image optimization doesn't happen at build time.** Remote images work via `@unpic/react` (auto-detects 28 CDN providers). Local images are routed through a `/_vinext/image` endpoint that can resize and transcode on Cloudflare Workers (via the Images binding) in production, but no build-time optimization or static resizing occurs.
 - **Google Fonts are loaded from the CDN, not self-hosted.** No `size-adjust` fallback font metrics. Local fonts work but `@font-face` CSS is injected at runtime, not extracted at build time.
 - **Route segment config** — `runtime` and `preferredRegion` are ignored (everything runs in the same environment).
@@ -693,7 +695,7 @@ pnpm install
 pnpm run build
 ```
 
-This builds the vinext package to `packages/vinext/dist/` via `vp pack`. For active development, use `pnpm --filter vinext run dev` to run `vp pack --watch`.
+This builds the vinext package to `packages/vinext/dist/`. For active development, use `pnpm --filter vinext run dev` to rebuild on changes.
 
 To use it against an external Next.js app, link the built package:
 
@@ -712,7 +714,7 @@ Or add it to your `package.json` as a file dependency:
 }
 ```
 
-vinext has peer dependencies on `react ^19.2.5`, `react-dom ^19.2.5`, `react-server-dom-webpack ^19.2.5`, and `vite ^7.0.0 || ^8.0.0`. Then replace `next` with `vinext` in your scripts and run as normal.
+vinext has peer dependencies on `react ^19.2.6`, `react-dom ^19.2.6`, `react-server-dom-webpack ^19.2.6`, and `vite ^7.0.0 || ^8.0.0`. Then replace `next` with `vinext` in your scripts and run as normal.
 
 ## Contributing
 

package/dist/build/layout-classification.js

@@ -1,3 +1,5 @@
+import { AppElementsWire } from "../server/app-elements-wire.js";
+import "../server/app-elements.js";
 import { classifyLayoutSegmentConfig } from "./report.js";
 import { createAppPageTreePath } from "../server/app-page-route-wiring.js";
 //#region src/build/layout-classification.ts
@@ -74,7 +76,7 @@ function isStaticModuleGraphResult(graphResult) {
 function classifyAllRouteLayouts(routes, dynamicShimPaths, moduleInfo) {
 	const result = /* @__PURE__ */ new Map();
 	for (const route of routes) for (const layout of route.layouts) {
-		const layoutId = `layout:${createAppPageTreePath(route.routeSegments, layout.treePosition)}`;
+		const layoutId = AppElementsWire.encodeLayoutId(createAppPageTreePath(route.routeSegments, layout.treePosition));
 		if (result.has(layoutId)) continue;
 		if (layout.segmentConfig) {
 			const configResult = classifyLayoutSegmentConfig(layout.segmentConfig.code);

package/dist/build/layout-classification.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout-classification.js","names":[],"sources":["../../src/build/layout-classification.ts"],"sourcesContent":["/**\n * Layout classification — determines whether each layout in an App Router\n * route tree is static or dynamic via two complementary detection layers:\n *\n *   Layer 1: Segment config (`export const dynamic`, `export const revalidate`)\n *   Layer 2: Module graph traversal (checks for transitive dynamic shim imports)\n *\n * Layer 3 (probe-based runtime detection) is handled separately in\n * `app-page-execution.ts` at request time.\n *\n * Every result is carried as a `LayoutBuildClassification` tagged variant so\n * operators can trace which layer produced a decision via the structured\n * `ClassificationReason` sidecar without that metadata leaking onto the wire.\n */\n\nimport { classifyLayoutSegmentConfig } from \"./report.js\";\nimport { createAppPageTreePath } from \"../server/app-page-route-wiring.js\";\nimport type {\n  ClassificationReason,\n  LayoutBuildClassification,\n  ModuleGraphStaticReason,\n} from \"./layout-classification-types.js\";\n\ntype ModuleGraphClassification = \"static\" | \"needs-probe\";\n\ntype ModuleGraphClassificationResult = {\n  result: ModuleGraphClassification;\n  /** First dynamic shim module ID encountered during BFS, when any. */\n  firstShimMatch?: string;\n};\n\nexport type ModuleInfoProvider = {\n  getModuleInfo(id: string): {\n    importedIds: string[];\n    dynamicImportedIds: string[];\n  } | null;\n};\n\ntype LayoutEntry = {\n  /** Rollup/Vite module ID for the layout file. */\n  moduleId: string;\n  /** Directory depth from the app root, used to build the stable layout ID. */\n  treePosition: number;\n  /** Segment config source code extracted at build time, or null when absent. */\n  segmentConfig?: { code: string } | null;\n};\n\ntype RouteForClassification = {\n  layouts: readonly LayoutEntry[];\n  routeSegments: string[];\n};\n\n/**\n * BFS traversal of a layout's dependency tree. If any transitive import\n * resolves to a dynamic shim path (headers, cache, server), the layout\n * cannot be proven static at build time and needs a runtime probe.\n *\n * The returned object carries the classification plus the first matching\n * shim module ID (when any). Operators use the shim ID via the debug\n * channel to trace why a layout was flagged for probing.\n */\nexport function classifyLayoutByModuleGraph(\n  layoutModuleId: string,\n  dynamicShimPaths: ReadonlySet<string>,\n  moduleInfo: ModuleInfoProvider,\n): ModuleGraphClassificationResult {\n  const visited = new Set<string>();\n  const queue: string[] = [layoutModuleId];\n  let head = 0;\n\n  while (head < queue.length) {\n    const currentId = queue[head++]!;\n\n    if (visited.has(currentId)) continue;\n    visited.add(currentId);\n\n    if (dynamicShimPaths.has(currentId)) {\n      return { result: \"needs-probe\", firstShimMatch: currentId };\n    }\n\n    const info = moduleInfo.getModuleInfo(currentId);\n    if (!info) continue;\n\n    for (const importedId of info.importedIds) {\n      if (!visited.has(importedId)) queue.push(importedId);\n    }\n    for (const dynamicId of info.dynamicImportedIds) {\n      if (!visited.has(dynamicId)) queue.push(dynamicId);\n    }\n  }\n\n  return { result: \"static\" };\n}\n\nexport function moduleGraphReason(\n  graphResult: ModuleGraphClassificationResult & { result: \"static\" },\n): ModuleGraphStaticReason;\nexport function moduleGraphReason(\n  graphResult: ModuleGraphClassificationResult,\n): ClassificationReason;\nexport function moduleGraphReason(\n  graphResult: ModuleGraphClassificationResult,\n): ClassificationReason {\n  if (graphResult.firstShimMatch === undefined) {\n    return { layer: \"module-graph\", result: graphResult.result };\n  }\n  return {\n    layer: \"module-graph\",\n    result: graphResult.result,\n    firstShimMatch: graphResult.firstShimMatch,\n  };\n}\n\nexport function isStaticModuleGraphResult(\n  graphResult: ModuleGraphClassificationResult,\n): graphResult is ModuleGraphClassificationResult & { result: \"static\" } {\n  return graphResult.result === \"static\";\n}\n\n/**\n * Classifies all layouts across all routes using a two-layer strategy:\n *\n * 1. Segment config (Layer 1) — short-circuits to \"static\" or \"dynamic\"\n * 2. Module graph (Layer 2) — BFS for dynamic shim imports → \"static\" or \"needs-probe\"\n *\n * Shared layouts (same file appearing in multiple routes) are classified once\n * and deduplicated by layout ID.\n *\n * @internal Not called by production code. The `generateBundle` hook in\n * `index.ts` calls `classifyLayoutByModuleGraph` directly and composes\n * via the numeric-index manifest in `route-classification-manifest.ts`.\n * Used only by `tests/layout-classification.test.ts`.\n */\nexport function classifyAllRouteLayouts(\n  routes: readonly RouteForClassification[],\n  dynamicShimPaths: ReadonlySet<string>,\n  moduleInfo: ModuleInfoProvider,\n): Map<string, LayoutBuildClassification> {\n  const result = new Map<string, LayoutBuildClassification>();\n\n  for (const route of routes) {\n    for (const layout of route.layouts) {\n      const layoutId = `layout:${createAppPageTreePath(route.routeSegments, layout.treePosition)}`;\n\n      if (result.has(layoutId)) continue;\n\n      // Layer 1: segment config\n      if (layout.segmentConfig) {\n        const configResult = classifyLayoutSegmentConfig(layout.segmentConfig.code);\n        if (configResult.kind !== \"absent\") {\n          result.set(layoutId, configResult);\n          continue;\n        }\n      }\n\n      // Layer 2: module graph\n      const graphResult = classifyLayoutByModuleGraph(\n        layout.moduleId,\n        dynamicShimPaths,\n        moduleInfo,\n      );\n      const reason = moduleGraphReason(graphResult);\n      result.set(layoutId, { kind: graphResult.result, reason });\n    }\n  }\n\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AA6DA,SAAgB,4BACd,gBACA,kBACA,YACiC;CACjC,MAAM,0BAAU,IAAI,KAAa;CACjC,MAAM,QAAkB,CAAC,eAAe;CACxC,IAAI,OAAO;AAEX,QAAO,OAAO,MAAM,QAAQ;EAC1B,MAAM,YAAY,MAAM;AAExB,MAAI,QAAQ,IAAI,UAAU,CAAE;AAC5B,UAAQ,IAAI,UAAU;AAEtB,MAAI,iBAAiB,IAAI,UAAU,CACjC,QAAO;GAAE,QAAQ;GAAe,gBAAgB;GAAW;EAG7D,MAAM,OAAO,WAAW,cAAc,UAAU;AAChD,MAAI,CAAC,KAAM;AAEX,OAAK,MAAM,cAAc,KAAK,YAC5B,KAAI,CAAC,QAAQ,IAAI,WAAW,CAAE,OAAM,KAAK,WAAW;AAEtD,OAAK,MAAM,aAAa,KAAK,mBAC3B,KAAI,CAAC,QAAQ,IAAI,UAAU,CAAE,OAAM,KAAK,UAAU;;AAItD,QAAO,EAAE,QAAQ,UAAU;;AAS7B,SAAgB,kBACd,aACsB;AACtB,KAAI,YAAY,mBAAmB,KAAA,EACjC,QAAO;EAAE,OAAO;EAAgB,QAAQ,YAAY;EAAQ;AAE9D,QAAO;EACL,OAAO;EACP,QAAQ,YAAY;EACpB,gBAAgB,YAAY;EAC7B;;AAGH,SAAgB,0BACd,aACuE;AACvE,QAAO,YAAY,WAAW;;;;;;;;;;;;;;;;AAiBhC,SAAgB,wBACd,QACA,kBACA,YACwC;CACxC,MAAM,yBAAS,IAAI,KAAwC;AAE3D,MAAK,MAAM,SAAS,OAClB,MAAK,MAAM,UAAU,MAAM,SAAS;EAClC,MAAM,WAAW,UAAU,sBAAsB,MAAM,eAAe,OAAO,aAAa;AAE1F,MAAI,OAAO,IAAI,SAAS,CAAE;AAG1B,MAAI,OAAO,eAAe;GACxB,MAAM,eAAe,4BAA4B,OAAO,cAAc,KAAK;AAC3E,OAAI,aAAa,SAAS,UAAU;AAClC,WAAO,IAAI,UAAU,aAAa;AAClC;;;EAKJ,MAAM,cAAc,4BAClB,OAAO,UACP,kBACA,WACD;EACD,MAAM,SAAS,kBAAkB,YAAY;AAC7C,SAAO,IAAI,UAAU;GAAE,MAAM,YAAY;GAAQ;GAAQ,CAAC;;AAI9D,QAAO"}
+{"version":3,"file":"layout-classification.js","names":[],"sources":["../../src/build/layout-classification.ts"],"sourcesContent":["/**\n * Layout classification — determines whether each layout in an App Router\n * route tree is static or dynamic via two complementary detection layers:\n *\n *   Layer 1: Segment config (`export const dynamic`, `export const revalidate`)\n *   Layer 2: Module graph traversal (checks for transitive dynamic shim imports)\n *\n * Layer 3 (probe-based runtime detection) is handled separately in\n * `app-page-execution.ts` at request time.\n *\n * Every result is carried as a `LayoutBuildClassification` tagged variant so\n * operators can trace which layer produced a decision via the structured\n * `ClassificationReason` sidecar without that metadata leaking onto the wire.\n */\n\nimport { classifyLayoutSegmentConfig } from \"./report.js\";\nimport { AppElementsWire } from \"../server/app-elements.js\";\nimport { createAppPageTreePath } from \"../server/app-page-route-wiring.js\";\nimport type {\n  ClassificationReason,\n  LayoutBuildClassification,\n  ModuleGraphStaticReason,\n} from \"./layout-classification-types.js\";\n\ntype ModuleGraphClassification = \"static\" | \"needs-probe\";\n\ntype ModuleGraphClassificationResult = {\n  result: ModuleGraphClassification;\n  /** First dynamic shim module ID encountered during BFS, when any. */\n  firstShimMatch?: string;\n};\n\nexport type ModuleInfoProvider = {\n  getModuleInfo(id: string): {\n    importedIds: string[];\n    dynamicImportedIds: string[];\n  } | null;\n};\n\ntype LayoutEntry = {\n  /** Rollup/Vite module ID for the layout file. */\n  moduleId: string;\n  /** Directory depth from the app root, used to build the stable layout ID. */\n  treePosition: number;\n  /** Segment config source code extracted at build time, or null when absent. */\n  segmentConfig?: { code: string } | null;\n};\n\ntype RouteForClassification = {\n  layouts: readonly LayoutEntry[];\n  routeSegments: string[];\n};\n\n/**\n * BFS traversal of a layout's dependency tree. If any transitive import\n * resolves to a dynamic shim path (headers, cache, server), the layout\n * cannot be proven static at build time and needs a runtime probe.\n *\n * The returned object carries the classification plus the first matching\n * shim module ID (when any). Operators use the shim ID via the debug\n * channel to trace why a layout was flagged for probing.\n */\nexport function classifyLayoutByModuleGraph(\n  layoutModuleId: string,\n  dynamicShimPaths: ReadonlySet<string>,\n  moduleInfo: ModuleInfoProvider,\n): ModuleGraphClassificationResult {\n  const visited = new Set<string>();\n  const queue: string[] = [layoutModuleId];\n  let head = 0;\n\n  while (head < queue.length) {\n    const currentId = queue[head++]!;\n\n    if (visited.has(currentId)) continue;\n    visited.add(currentId);\n\n    if (dynamicShimPaths.has(currentId)) {\n      return { result: \"needs-probe\", firstShimMatch: currentId };\n    }\n\n    const info = moduleInfo.getModuleInfo(currentId);\n    if (!info) continue;\n\n    for (const importedId of info.importedIds) {\n      if (!visited.has(importedId)) queue.push(importedId);\n    }\n    for (const dynamicId of info.dynamicImportedIds) {\n      if (!visited.has(dynamicId)) queue.push(dynamicId);\n    }\n  }\n\n  return { result: \"static\" };\n}\n\nexport function moduleGraphReason(\n  graphResult: ModuleGraphClassificationResult & { result: \"static\" },\n): ModuleGraphStaticReason;\nexport function moduleGraphReason(\n  graphResult: ModuleGraphClassificationResult,\n): ClassificationReason;\nexport function moduleGraphReason(\n  graphResult: ModuleGraphClassificationResult,\n): ClassificationReason {\n  if (graphResult.firstShimMatch === undefined) {\n    return { layer: \"module-graph\", result: graphResult.result };\n  }\n  return {\n    layer: \"module-graph\",\n    result: graphResult.result,\n    firstShimMatch: graphResult.firstShimMatch,\n  };\n}\n\nexport function isStaticModuleGraphResult(\n  graphResult: ModuleGraphClassificationResult,\n): graphResult is ModuleGraphClassificationResult & { result: \"static\" } {\n  return graphResult.result === \"static\";\n}\n\n/**\n * Classifies all layouts across all routes using a two-layer strategy:\n *\n * 1. Segment config (Layer 1) — short-circuits to \"static\" or \"dynamic\"\n * 2. Module graph (Layer 2) — BFS for dynamic shim imports → \"static\" or \"needs-probe\"\n *\n * Shared layouts (same file appearing in multiple routes) are classified once\n * and deduplicated by layout ID.\n *\n * @internal Not called by production code. The `generateBundle` hook in\n * `index.ts` calls `classifyLayoutByModuleGraph` directly and composes\n * via the numeric-index manifest in `route-classification-manifest.ts`.\n * Used only by `tests/layout-classification.test.ts`.\n */\nexport function classifyAllRouteLayouts(\n  routes: readonly RouteForClassification[],\n  dynamicShimPaths: ReadonlySet<string>,\n  moduleInfo: ModuleInfoProvider,\n): Map<string, LayoutBuildClassification> {\n  const result = new Map<string, LayoutBuildClassification>();\n\n  for (const route of routes) {\n    for (const layout of route.layouts) {\n      const layoutId = AppElementsWire.encodeLayoutId(\n        createAppPageTreePath(route.routeSegments, layout.treePosition),\n      );\n\n      if (result.has(layoutId)) continue;\n\n      // Layer 1: segment config\n      if (layout.segmentConfig) {\n        const configResult = classifyLayoutSegmentConfig(layout.segmentConfig.code);\n        if (configResult.kind !== \"absent\") {\n          result.set(layoutId, configResult);\n          continue;\n        }\n      }\n\n      // Layer 2: module graph\n      const graphResult = classifyLayoutByModuleGraph(\n        layout.moduleId,\n        dynamicShimPaths,\n        moduleInfo,\n      );\n      const reason = moduleGraphReason(graphResult);\n      result.set(layoutId, { kind: graphResult.result, reason });\n    }\n  }\n\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8DA,SAAgB,4BACd,gBACA,kBACA,YACiC;CACjC,MAAM,0BAAU,IAAI,KAAa;CACjC,MAAM,QAAkB,CAAC,eAAe;CACxC,IAAI,OAAO;AAEX,QAAO,OAAO,MAAM,QAAQ;EAC1B,MAAM,YAAY,MAAM;AAExB,MAAI,QAAQ,IAAI,UAAU,CAAE;AAC5B,UAAQ,IAAI,UAAU;AAEtB,MAAI,iBAAiB,IAAI,UAAU,CACjC,QAAO;GAAE,QAAQ;GAAe,gBAAgB;GAAW;EAG7D,MAAM,OAAO,WAAW,cAAc,UAAU;AAChD,MAAI,CAAC,KAAM;AAEX,OAAK,MAAM,cAAc,KAAK,YAC5B,KAAI,CAAC,QAAQ,IAAI,WAAW,CAAE,OAAM,KAAK,WAAW;AAEtD,OAAK,MAAM,aAAa,KAAK,mBAC3B,KAAI,CAAC,QAAQ,IAAI,UAAU,CAAE,OAAM,KAAK,UAAU;;AAItD,QAAO,EAAE,QAAQ,UAAU;;AAS7B,SAAgB,kBACd,aACsB;AACtB,KAAI,YAAY,mBAAmB,KAAA,EACjC,QAAO;EAAE,OAAO;EAAgB,QAAQ,YAAY;EAAQ;AAE9D,QAAO;EACL,OAAO;EACP,QAAQ,YAAY;EACpB,gBAAgB,YAAY;EAC7B;;AAGH,SAAgB,0BACd,aACuE;AACvE,QAAO,YAAY,WAAW;;;;;;;;;;;;;;;;AAiBhC,SAAgB,wBACd,QACA,kBACA,YACwC;CACxC,MAAM,yBAAS,IAAI,KAAwC;AAE3D,MAAK,MAAM,SAAS,OAClB,MAAK,MAAM,UAAU,MAAM,SAAS;EAClC,MAAM,WAAW,gBAAgB,eAC/B,sBAAsB,MAAM,eAAe,OAAO,aAAa,CAChE;AAED,MAAI,OAAO,IAAI,SAAS,CAAE;AAG1B,MAAI,OAAO,eAAe;GACxB,MAAM,eAAe,4BAA4B,OAAO,cAAc,KAAK;AAC3E,OAAI,aAAa,SAAS,UAAU;AAClC,WAAO,IAAI,UAAU,aAAa;AAClC;;;EAKJ,MAAM,cAAc,4BAClB,OAAO,UACP,kBACA,WACD;EACD,MAAM,SAAS,kBAAkB,YAAY;AAC7C,SAAO,IAAI,UAAU;GAAE,MAAM,YAAY;GAAQ;GAAQ,CAAC;;AAI9D,QAAO"}

package/dist/build/prerender.d.ts

@@ -1,5 +1,5 @@
 import { Route } from "../routing/pages-router.js";
-import { AppRoute } from "../routing/app-router.js";
+import { AppRoute } from "../routing/app-route-graph.js";
 import { ResolvedNextConfig } from "../config/next-config.js";
 import { readPrerenderSecret } from "./server-manifest.js";
 import { Server } from "node:http";
@@ -13,6 +13,7 @@ type PrerenderRouteResult = {
   status: "rendered";
   outputFiles: string[];
   revalidate: number | false;
+  expire?: number;
   /**
    * The concrete prerendered URL path, e.g. `/blog/hello-world`.
    * Only present when the route is dynamic and `path` differs from `route`.

package/dist/build/prerender.js

@@ -1,7 +1,7 @@
-import { createValidFileMatcher } from "../routing/file-matcher.js";
+import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-matcher.js";
 import { headersContextFromRequest, runWithHeadersContext } from "../shims/headers.js";
-import { NoOpCacheHandler, getCacheHandler, setCacheHandler } from "../shims/cache.js";
-import { classifyAppRoute, classifyPagesRoute } from "./report.js";
+import { NoOpCacheHandler, _consumeRequestScopedCacheLife, getCacheHandler, setCacheHandler } from "../shims/cache.js";
+import { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.js";
 import { readPrerenderSecret } from "./server-manifest.js";
 import { startProdServer } from "../server/prod-server.js";
 import fs from "node:fs";
@@ -49,9 +49,6 @@ async function runWithConcurrency(items, concurrency, fn) {
 	await Promise.all(workers);
 	return results;
 }
-function findFileWithExtensions(basePath, matcher) {
-	return matcher.dottedExtensions.some((ext) => fs.existsSync(basePath + ext));
-}
 /**
 * Build a URL path from a route pattern and params.
 * "/posts/:id" + { id: "42" } → "/posts/42"
@@ -164,7 +161,8 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 				port: 0,
 				host: "127.0.0.1",
 				outDir: path.dirname(path.dirname(pagesBundlePath)),
-				noCompression: true
+				noCompression: true,
+				purpose: "prerender"
 			});
 			ownedProdServerHandle = srv;
 			return srv;
@@ -287,6 +285,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					status: "rendered",
 					outputFiles,
 					revalidate,
+					...typeof revalidate === "number" ? { expire: config.expireTime } : {},
 					router: "pages",
 					...urlPath !== route.pattern ? { path: urlPath } : {}
 				};
@@ -374,7 +373,8 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 				port: 0,
 				host: "127.0.0.1",
 				outDir: path.dirname(serverDir),
-				noCompression: true
+				noCompression: true,
+				purpose: "prerender"
 			});
 			ownedProdServerHandle = srv;
 			return srv;
@@ -423,7 +423,8 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 		const routeIndex = new Map(routes.map((r) => [r.pattern, r]));
 		const urlsToRender = [];
 		for (const route of routes) {
-			if (route.routePath && !route.pagePath) {
+			const renderEntryPath = getAppRouteRenderEntryPath(route);
+			if (!renderEntryPath && route.routePath) {
 				results.push({
 					route: route.pattern,
 					status: "skipped",
@@ -431,8 +432,8 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 				});
 				continue;
 			}
-			if (!route.pagePath) continue;
-			const { type, revalidate: classifiedRevalidate } = classifyAppRoute(route.pagePath, route.routePath, route.isDynamic);
+			if (!renderEntryPath) continue;
+			const { type, revalidate: classifiedRevalidate } = classifyAppRoute(renderEntryPath, route.routePath, route.isDynamic);
 			if (type === "api") {
 				results.push({
 					route: route.pattern,
@@ -547,8 +548,29 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 		async function renderUrl({ urlPath, routePattern, revalidate, isSpeculative }) {
 			try {
 				const htmlRequest = new Request(`http://localhost${urlPath}`);
-				const htmlRes = await runWithHeadersContext(headersContextFromRequest(htmlRequest), () => rscHandler(htmlRequest));
-				if (!htmlRes.ok) {
+				const htmlRender = await runWithHeadersContext(headersContextFromRequest(htmlRequest), async () => {
+					const response = await rscHandler(htmlRequest);
+					const cacheControl = response.headers.get("cache-control") ?? "";
+					if (!response.ok || isSpeculative && cacheControl.includes("no-store")) {
+						await response.body?.cancel();
+						return {
+							cacheControl,
+							html: null,
+							ok: response.ok,
+							requestCacheLife: null,
+							status: response.status
+						};
+					}
+					return {
+						cacheControl,
+						html: await response.text(),
+						ok: true,
+						requestCacheLife: _consumeRequestScopedCacheLife(),
+						status: response.status
+					};
+				});
+				const htmlCacheControl = htmlRender.cacheControl;
+				if (!htmlRender.ok) {
 					if (isSpeculative) return {
 						route: routePattern,
 						status: "skipped",
@@ -557,20 +579,22 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 					return {
 						route: routePattern,
 						status: "error",
-						error: `RSC handler returned ${htmlRes.status}`
+						error: `RSC handler returned ${htmlRender.status}`
 					};
 				}
 				if (isSpeculative) {
-					if ((htmlRes.headers.get("cache-control") ?? "").includes("no-store")) {
-						await htmlRes.body?.cancel();
-						return {
-							route: routePattern,
-							status: "skipped",
-							reason: "dynamic"
-						};
-					}
+					if (htmlCacheControl.includes("no-store")) return {
+						route: routePattern,
+						status: "skipped",
+						reason: "dynamic"
+					};
 				}
-				const html = await htmlRes.text();
+				if (htmlRender.html === null) return {
+					route: routePattern,
+					status: "error",
+					error: "RSC handler returned no prerender HTML"
+				};
+				const html = htmlRender.html;
 				const rscRequest = new Request(`http://localhost${urlPath}`, { headers: {
 					Accept: "text/x-component",
 					RSC: "1"
@@ -590,11 +614,14 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 					fs.writeFileSync(rscFullPath, rscData, "utf-8");
 					outputFiles.push(rscOutputPath);
 				}
+				const renderedCacheControl = resolveRenderedCacheControl(htmlRender.requestCacheLife ?? {}, htmlCacheControl, config.expireTime);
+				const renderedRevalidate = typeof revalidate === "number" ? renderedCacheControl.revalidate === void 0 ? revalidate : Math.min(revalidate, renderedCacheControl.revalidate) : renderedCacheControl.revalidate ?? revalidate;
 				return {
 					route: routePattern,
 					status: "rendered",
 					outputFiles,
-					revalidate,
+					revalidate: renderedRevalidate,
+					...typeof renderedRevalidate === "number" ? { expire: renderedCacheControl.expire } : {},
 					router: "app",
 					...urlPath !== routePattern ? { path: urlPath } : {}
 				};
@@ -663,6 +690,34 @@ function getRscOutputPath(urlPath) {
 	if (urlPath === "/") return "index.rsc";
 	return urlPath.replace(/^\//, "") + ".rsc";
 }
+function resolveRenderedCacheControl(requestCacheLife, cacheControl, fallbackExpireSeconds) {
+	const sMaxage = parseCacheControlSeconds(cacheControl, "s-maxage");
+	const staleWhileRevalidate = parseCacheControlSeconds(cacheControl, "stale-while-revalidate");
+	const revalidate = requestCacheLife.revalidate ?? (staleWhileRevalidate === void 0 ? void 0 : sMaxage);
+	return {
+		expire: requestCacheLife.expire ?? resolveRenderedExpireSeconds({
+			fallbackExpireSeconds,
+			sMaxage,
+			staleWhileRevalidate
+		}),
+		...revalidate === void 0 ? {} : { revalidate }
+	};
+}
+function resolveRenderedExpireSeconds(options) {
+	const { fallbackExpireSeconds, sMaxage, staleWhileRevalidate } = options;
+	if (sMaxage === void 0 || staleWhileRevalidate === void 0) return fallbackExpireSeconds;
+	return sMaxage + staleWhileRevalidate;
+}
+function parseCacheControlSeconds(cacheControl, directive) {
+	for (const part of cacheControl.split(",")) {
+		const [rawName, rawValue] = part.trim().split("=", 2);
+		if (rawName.trim().toLowerCase() !== directive) continue;
+		if (rawValue === void 0) return void 0;
+		const value = Number(rawValue.trim());
+		if (!Number.isFinite(value) || value < 0) return void 0;
+		return value;
+	}
+}
 /**
 * Write `vinext-prerender.json` to `outDir`.
 *
@@ -677,6 +732,7 @@ function writePrerenderIndex(routes, outDir, options) {
 			route: r.route,
 			status: r.status,
 			revalidate: r.revalidate,
+			...typeof r.revalidate === "number" ? { expire: r.expire } : {},
 			router: r.router,
 			...r.path ? { path: r.path } : {}
 		};