vinext 0.0.47 → 0.0.49

package/dist/server/app-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-middleware.js","names":[],"sources":["../../src/server/app-middleware.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport { isExternalUrl, proxyExternalRequest } from \"../config/config-matchers.js\";\nimport { applyMiddlewareRequestHeaders, setHeadersContext } from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { buildRequestHeadersFromMiddlewareResponse } from \"./middleware-request-headers.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { executeMiddleware, type MiddlewareModule } from \"./middleware-runtime.js\";\nimport { processMiddlewareHeaders } from \"./request-pipeline.js\";\n\nexport type AppMiddlewareContext = {\n  headers: Headers | null;\n  requestHeaders: Headers | null;\n  status: number | null;\n};\n\nexport type ApplyAppMiddlewareOptions = {\n  basePath?: string;\n  cleanPathname: string;\n  context: AppMiddlewareContext;\n  i18nConfig?: NextI18nConfig | null;\n  isProxy: boolean;\n  module: MiddlewareModule;\n  request: Request;\n};\n\nexport type ApplyAppMiddlewareResult =\n  | {\n      kind: \"continue\";\n      cleanPathname: string;\n      search: string | null;\n    }\n  | {\n      kind: \"response\";\n      response: Response;\n    };\n\ntype ForwardedMiddlewareContext = {\n  h?: unknown;\n  r?: unknown;\n  s?: unknown;\n};\n\nfunction isForwardedMiddlewareContext(value: unknown): value is ForwardedMiddlewareContext {\n  return !!value && typeof value === \"object\";\n}\n\nfunction appendForwardedHeader(headers: Headers, value: unknown): void {\n  if (!Array.isArray(value) || value.length < 2) return;\n  const key = value[0];\n  const headerValue = value[1];\n  if (typeof key === \"string\" && typeof headerValue === \"string\") {\n    headers.append(key, headerValue);\n  }\n}\n\nfunction responseFromMiddlewareRedirect(result: {\n  redirectStatus?: number;\n  redirectUrl?: string;\n  response?: Response;\n  responseHeaders?: Headers;\n}): Response {\n  if (result.response) return result.response;\n\n  const headers = new Headers(result.responseHeaders);\n  if (result.redirectUrl) {\n    headers.set(\"Location\", result.redirectUrl);\n  }\n  return new Response(null, {\n    status: result.redirectStatus ?? 307,\n    headers,\n  });\n}\n\nexport function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean {\n  const rewriteParsed = new URL(rewriteUrl, request.url);\n  return rewriteParsed.origin !== new URL(request.url).origin;\n}\n\nfunction requestWithMiddlewareRequestHeaders(\n  request: Request,\n  middlewareHeaders: Headers | null,\n): Request {\n  const nextHeaders = middlewareHeaders\n    ? buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders)\n    : null;\n  if (!nextHeaders) return request;\n\n  const init: RequestInit = {\n    method: request.method,\n    headers: nextHeaders,\n    body: request.body,\n  };\n  if (request.body) {\n    Object.defineProperty(init, \"duplex\", { value: \"half\", enumerable: true });\n  }\n\n  return new Request(request.url, init);\n}\n\nexport async function proxyExternalMiddlewareRewrite(\n  request: Request,\n  rewriteUrl: string,\n  context: AppMiddlewareContext,\n): Promise<Response> {\n  const proxyRequest = requestWithMiddlewareRequestHeaders(\n    request,\n    context.requestHeaders ?? context.headers,\n  );\n  setHeadersContext(null);\n  setNavigationContext(null);\n\n  const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);\n  if (!context.headers) return proxyResponse;\n\n  const middlewareHeaders = new Headers(context.headers);\n  processMiddlewareHeaders(middlewareHeaders);\n  const headers = new Headers(proxyResponse.headers);\n  mergeMiddlewareResponseHeaders(headers, middlewareHeaders);\n  return new Response(proxyResponse.body, {\n    status: proxyResponse.status,\n    statusText: proxyResponse.statusText,\n    headers,\n  });\n}\n\nfunction applyForwardedMiddlewareContext(\n  request: Request,\n  context: AppMiddlewareContext,\n): { applied: boolean; rewriteUrl?: string } {\n  if (process.env.NODE_ENV === \"production\") {\n    return { applied: false };\n  }\n\n  const header = request.headers.get(\"x-vinext-mw-ctx\");\n  if (!header) return { applied: false };\n\n  try {\n    const data = JSON.parse(header);\n    if (!isForwardedMiddlewareContext(data)) return { applied: false };\n\n    if (Array.isArray(data.h) && data.h.length > 0) {\n      context.headers = new Headers();\n      for (const entry of data.h) {\n        appendForwardedHeader(context.headers, entry);\n      }\n    }\n    if (typeof data.s === \"number\") {\n      context.status = data.s;\n    }\n    if (typeof data.r === \"string\" && data.r.length > 0) {\n      return { applied: true, rewriteUrl: data.r };\n    }\n    return { applied: true };\n  } catch (e) {\n    console.error(\"[vinext] Failed to parse forwarded middleware context:\", e);\n    return { applied: false };\n  }\n}\n\nexport async function applyAppMiddleware(\n  options: ApplyAppMiddlewareOptions,\n): Promise<ApplyAppMiddlewareResult> {\n  const forwarded = applyForwardedMiddlewareContext(options.request, options.context);\n  let cleanPathname = options.cleanPathname;\n  let search: string | null = null;\n\n  if (forwarded.rewriteUrl) {\n    try {\n      if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, options.request)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            options.request,\n            forwarded.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(forwarded.rewriteUrl, options.request.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    } catch (e) {\n      console.error(\"[vinext] Failed to apply forwarded middleware rewrite:\", e);\n      forwarded.applied = false;\n    }\n  }\n\n  if (!forwarded.applied) {\n    const result = await executeMiddleware({\n      basePath: options.basePath,\n      i18nConfig: options.i18nConfig,\n      isProxy: options.isProxy,\n      module: options.module,\n      normalizedPathname: cleanPathname,\n      request: options.request,\n    });\n\n    if (!result.continue) {\n      if (result.redirectUrl) {\n        return { kind: \"response\", response: responseFromMiddlewareRedirect(result) };\n      }\n      if (result.response) {\n        return { kind: \"response\", response: result.response };\n      }\n      return { kind: \"response\", response: new Response(\"Internal Server Error\", { status: 500 }) };\n    }\n\n    if (result.responseHeaders) {\n      options.context.headers = new Headers(result.responseHeaders);\n    }\n\n    if (result.rewriteUrl) {\n      if (result.rewriteStatus !== undefined) {\n        options.context.status = result.rewriteStatus;\n      }\n      if (isExternalUrl(result.rewriteUrl)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            options.request,\n            result.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(result.rewriteUrl, options.request.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    }\n  }\n\n  if (options.context.headers) {\n    options.context.requestHeaders = new Headers(options.context.headers);\n    applyMiddlewareRequestHeaders(options.context.headers);\n    processMiddlewareHeaders(options.context.headers);\n  }\n\n  return { kind: \"continue\", cleanPathname, search };\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-middleware.js","names":[],"sources":["../../src/server/app-middleware.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport { isExternalUrl, proxyExternalRequest } from \"../config/config-matchers.js\";\nimport { applyMiddlewareRequestHeaders, setHeadersContext } from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { buildRequestHeadersFromMiddlewareResponse } from \"./middleware-request-headers.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { executeMiddleware, type MiddlewareModule } from \"./middleware-runtime.js\";\nimport { cloneRequestWithHeaders, processMiddlewareHeaders } from \"./request-pipeline.js\";\nimport { internalServerErrorResponse } from \"./http-error-responses.js\";\n\nexport type AppMiddlewareContext = {\n  headers: Headers | null;\n  requestHeaders: Headers | null;\n  status: number | null;\n};\n\nexport type ApplyAppMiddlewareOptions = {\n  basePath?: string;\n  cleanPathname: string;\n  context: AppMiddlewareContext;\n  i18nConfig?: NextI18nConfig | null;\n  isProxy: boolean;\n  module: MiddlewareModule;\n  request: Request;\n};\n\nexport type ApplyAppMiddlewareResult =\n  | {\n      kind: \"continue\";\n      cleanPathname: string;\n      search: string | null;\n    }\n  | {\n      kind: \"response\";\n      response: Response;\n    };\n\ntype ForwardedMiddlewareContext = {\n  h?: unknown;\n  r?: unknown;\n  s?: unknown;\n};\n\nexport const FLIGHT_HEADERS: readonly string[] = [\n  \"rsc\",\n  \"next-router-state-tree\",\n  \"next-router-prefetch\",\n  \"next-hmr-refresh\",\n  \"next-router-segment-prefetch\",\n];\n\nconst FLIGHT_HEADER_SET = new Set(FLIGHT_HEADERS);\n\nfunction isForwardedMiddlewareContext(value: unknown): value is ForwardedMiddlewareContext {\n  return !!value && typeof value === \"object\";\n}\n\nfunction requestWithoutFlightHeaders(request: Request): Request {\n  let hasFlightHeader = false;\n  const headers = new Headers();\n\n  for (const [key, value] of request.headers) {\n    if (FLIGHT_HEADER_SET.has(key.toLowerCase())) {\n      hasFlightHeader = true;\n    } else {\n      headers.append(key, value);\n    }\n  }\n\n  if (!hasFlightHeader) return request;\n  const source = request.body ? request.clone() : request;\n  return cloneRequestWithHeaders(source, headers);\n}\n\nfunction appendForwardedHeader(headers: Headers, value: unknown): void {\n  if (!Array.isArray(value) || value.length < 2) return;\n  const key = value[0];\n  const headerValue = value[1];\n  if (typeof key === \"string\" && typeof headerValue === \"string\") {\n    headers.append(key, headerValue);\n  }\n}\n\nfunction responseFromMiddlewareRedirect(result: {\n  redirectStatus?: number;\n  redirectUrl?: string;\n  response?: Response;\n  responseHeaders?: Headers;\n}): Response {\n  if (result.response) return result.response;\n\n  const headers = new Headers(result.responseHeaders);\n  if (result.redirectUrl) {\n    headers.set(\"Location\", result.redirectUrl);\n  }\n  return new Response(null, {\n    status: result.redirectStatus ?? 307,\n    headers,\n  });\n}\n\nexport function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean {\n  const rewriteParsed = new URL(rewriteUrl, request.url);\n  return rewriteParsed.origin !== new URL(request.url).origin;\n}\n\nfunction requestWithMiddlewareRequestHeaders(\n  request: Request,\n  middlewareHeaders: Headers | null,\n): Request {\n  const nextHeaders = middlewareHeaders\n    ? buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders)\n    : null;\n  if (!nextHeaders) return request;\n\n  const init: RequestInit = {\n    method: request.method,\n    headers: nextHeaders,\n    body: request.body,\n  };\n  if (request.body) {\n    Object.defineProperty(init, \"duplex\", { value: \"half\", enumerable: true });\n  }\n\n  return new Request(request.url, init);\n}\n\nexport async function proxyExternalMiddlewareRewrite(\n  request: Request,\n  rewriteUrl: string,\n  context: AppMiddlewareContext,\n): Promise<Response> {\n  const proxyRequest = requestWithMiddlewareRequestHeaders(\n    request,\n    context.requestHeaders ?? context.headers,\n  );\n  setHeadersContext(null);\n  setNavigationContext(null);\n\n  const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);\n  const headers = new Headers(proxyResponse.headers);\n  processMiddlewareHeaders(headers);\n\n  if (!context.headers) {\n    return new Response(proxyResponse.body, {\n      status: proxyResponse.status,\n      statusText: proxyResponse.statusText,\n      headers,\n    });\n  }\n\n  const middlewareHeaders = new Headers(context.headers);\n  processMiddlewareHeaders(middlewareHeaders);\n  mergeMiddlewareResponseHeaders(headers, middlewareHeaders);\n  return new Response(proxyResponse.body, {\n    status: proxyResponse.status,\n    statusText: proxyResponse.statusText,\n    headers,\n  });\n}\n\nfunction applyForwardedMiddlewareContext(\n  request: Request,\n  context: AppMiddlewareContext,\n): { applied: boolean; rewriteUrl?: string } {\n  if (process.env.NODE_ENV === \"production\") {\n    return { applied: false };\n  }\n\n  const header = request.headers.get(\"x-vinext-mw-ctx\");\n  if (!header) return { applied: false };\n\n  try {\n    const data = JSON.parse(header);\n    if (!isForwardedMiddlewareContext(data)) return { applied: false };\n\n    if (Array.isArray(data.h) && data.h.length > 0) {\n      context.headers = new Headers();\n      for (const entry of data.h) {\n        appendForwardedHeader(context.headers, entry);\n      }\n    }\n    if (typeof data.s === \"number\") {\n      context.status = data.s;\n    }\n    if (typeof data.r === \"string\" && data.r.length > 0) {\n      return { applied: true, rewriteUrl: data.r };\n    }\n    return { applied: true };\n  } catch (e) {\n    console.error(\"[vinext] Failed to parse forwarded middleware context:\", e);\n    return { applied: false };\n  }\n}\n\nexport async function applyAppMiddleware(\n  options: ApplyAppMiddlewareOptions,\n): Promise<ApplyAppMiddlewareResult> {\n  const forwarded = applyForwardedMiddlewareContext(options.request, options.context);\n  const middlewareRequest = requestWithoutFlightHeaders(options.request);\n  let cleanPathname = options.cleanPathname;\n  let search: string | null = null;\n\n  if (forwarded.rewriteUrl) {\n    try {\n      if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, middlewareRequest)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            middlewareRequest,\n            forwarded.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(forwarded.rewriteUrl, middlewareRequest.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    } catch (e) {\n      console.error(\"[vinext] Failed to apply forwarded middleware rewrite:\", e);\n      forwarded.applied = false;\n    }\n  }\n\n  if (!forwarded.applied) {\n    const result = await executeMiddleware({\n      basePath: options.basePath,\n      i18nConfig: options.i18nConfig,\n      isProxy: options.isProxy,\n      module: options.module,\n      normalizedPathname: cleanPathname,\n      request: middlewareRequest,\n    });\n\n    if (!result.continue) {\n      if (result.redirectUrl) {\n        return { kind: \"response\", response: responseFromMiddlewareRedirect(result) };\n      }\n      if (result.response) {\n        return { kind: \"response\", response: result.response };\n      }\n      return { kind: \"response\", response: internalServerErrorResponse() };\n    }\n\n    if (result.responseHeaders) {\n      options.context.headers = new Headers(result.responseHeaders);\n    }\n\n    if (result.rewriteUrl) {\n      if (result.rewriteStatus !== undefined) {\n        options.context.status = result.rewriteStatus;\n      }\n      if (isExternalUrl(result.rewriteUrl)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            middlewareRequest,\n            result.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(result.rewriteUrl, middlewareRequest.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    }\n  }\n\n  if (options.context.headers) {\n    options.context.requestHeaders = new Headers(options.context.headers);\n    applyMiddlewareRequestHeaders(options.context.headers);\n    processMiddlewareHeaders(options.context.headers);\n  }\n\n  return { kind: \"continue\", cleanPathname, search };\n}\n"],"mappings":"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"}

package/dist/server/app-page-boundary-render.d.ts

@@ -1,5 +1,5 @@
 import { MetadataFileRoute } from "./metadata-routes.js";
-import { AppElements } from "./app-elements.js";
+import { AppElements } from "./app-elements-wire.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";

package/dist/server/app-page-boundary-render.js

@@ -1,4 +1,5 @@
-import { APP_INTERCEPTION_CONTEXT_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, createAppPayloadRouteId } from "./app-elements.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
 import { ErrorBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
@@ -69,11 +70,13 @@ function resolveHttpAccessFallbackHeadLayoutTreePositions(route, layoutModules)
 	return route.layoutTreePositions?.slice(0, layoutModules.length);
 }
 function createAppPageBoundaryRscPayload(options) {
-	const routeId = createAppPayloadRouteId(options.pathname, null);
+	const routeId = AppElementsWire.encodeRouteId(options.pathname, null);
 	return {
-		[APP_INTERCEPTION_CONTEXT_KEY]: null,
-		[APP_ROUTE_KEY]: routeId,
-		[APP_ROOT_LAYOUT_KEY]: resolveAppPageBoundaryRootLayoutTreePath(options.route),
+		...AppElementsWire.createMetadataEntries({
+			interceptionContext: null,
+			rootLayoutTreePath: resolveAppPageBoundaryRootLayoutTreePath(options.route),
+			routeId
+		}),
 		[routeId]: options.element
 	};
 }

package/dist/server/app-page-boundary-render.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-page-boundary-render.js","names":[],"sources":["../../src/server/app-page-boundary-render.ts"],"sourcesContent":["import { Fragment, createElement, type ComponentType, type ReactNode } from \"react\";\nimport { buildClientHookErrorMessage } from \"vinext/shims/client-hook-error\";\nimport { ErrorBoundary } from \"vinext/shims/error-boundary\";\nimport { LayoutSegmentProvider } from \"vinext/shims/layout-segment-context\";\nimport { MetadataHead, ViewportHead } from \"vinext/shims/metadata\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\nimport { resolveAppPageHead } from \"./app-page-head.js\";\nimport {\n  renderAppPageBoundaryResponse,\n  resolveAppPageErrorBoundary,\n  resolveAppPageHttpAccessBoundaryComponent,\n  wrapAppPageBoundaryElement,\n  type AppPageParams,\n} from \"./app-page-boundary.js\";\nimport {\n  createAppPageFontData,\n  renderAppPageHtmlResponse,\n  type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\nimport {\n  APP_INTERCEPTION_CONTEXT_KEY,\n  APP_ROOT_LAYOUT_KEY,\n  APP_ROUTE_KEY,\n  createAppPayloadRouteId,\n  type AppElements,\n} from \"./app-elements.js\";\nimport { createAppPageLayoutEntries } from \"./app-page-route-wiring.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype AppPageBoundaryRscPayloadOptions<TModule extends AppPageModule = AppPageModule> = {\n  element: ReactNode;\n  pathname: string;\n  route?: AppPageBoundaryRoute<TModule> | null;\n};\n\nexport type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {\n  error?: TModule | null;\n  errors?: readonly (TModule | null | undefined)[] | null;\n  forbidden?: TModule | null;\n  layoutTreePositions?: readonly number[] | null;\n  layouts?: readonly (TModule | null | undefined)[];\n  notFound?: TModule | null;\n  params?: AppPageParams;\n  pattern?: string;\n  routeSegments?: readonly string[];\n  unauthorized?: TModule | null;\n};\n\ntype AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {\n  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n  clearRequestContext: () => void;\n  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n  getNavigationContext: () => unknown;\n  globalErrorModule?: TModule | null;\n  isRscRequest: boolean;\n  loadSsrHandler: () => Promise<AppPageSsrHandler>;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  middlewareContext: AppPageMiddlewareContext;\n  metadataRoutes: MetadataFileRoute[];\n  renderToReadableStream: (\n    element: ReactNode | AppElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  requestUrl: string;\n  resolveChildSegments: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => string[];\n  rootLayouts: readonly (TModule | null | undefined)[];\n  scriptNonce?: string;\n};\n\ntype RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {\n  boundaryComponent?: AppPageComponent | null;\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  matchedParams: AppPageParams;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  statusCode: number;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\ntype RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageModule> = {\n  error: unknown;\n  matchedParams?: AppPageParams | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  sanitizeErrorForClient: (error: Error) => Error;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n  module: TModule | null | undefined,\n): AppPageComponent | null {\n  return module?.default ?? null;\n}\n\nfunction wrapRenderedBoundaryElement<TModule extends AppPageModule>(\n  options: Pick<\n    AppPageBoundaryRenderCommonOptions<TModule>,\n    \"globalErrorModule\" | \"isRscRequest\" | \"makeThenableParams\" | \"resolveChildSegments\"\n  > & {\n    element: ReactNode;\n    includeGlobalErrorBoundary: boolean;\n    layoutModules: readonly (TModule | null | undefined)[];\n    layoutTreePositions?: readonly number[] | null;\n    matchedParams: AppPageParams;\n    routeSegments?: readonly string[];\n    skipLayoutWrapping?: boolean;\n  },\n): ReactNode {\n  return wrapAppPageBoundaryElement({\n    element: options.element,\n    getDefaultExport,\n    globalErrorComponent: getDefaultExport(options.globalErrorModule),\n    includeGlobalErrorBoundary: options.includeGlobalErrorBoundary,\n    isRscRequest: options.isRscRequest,\n    layoutModules: options.layoutModules,\n    layoutTreePositions: options.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    renderErrorBoundary(GlobalErrorComponent, children) {\n      return createElement(ErrorBoundary, {\n        fallback: GlobalErrorComponent,\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n      });\n    },\n    renderLayout(LayoutComponent, children, asyncParams) {\n      return createElement(LayoutComponent as AppPageComponent, {\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n        params: asyncParams,\n      });\n    },\n    renderLayoutSegmentProvider(segmentMap, children) {\n      return createElement(\n        // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n        LayoutSegmentProvider as ComponentType<any>,\n        { segmentMap },\n        children,\n      );\n    },\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.routeSegments ?? [],\n    skipLayoutWrapping: options.skipLayoutWrapping,\n  });\n}\n\nfunction resolveAppPageBoundaryRootLayoutTreePath<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n): string | null {\n  if (route?.layouts) {\n    const rootLayoutEntry = createAppPageLayoutEntries({\n      errors: route.errors,\n      layoutTreePositions: route.layoutTreePositions,\n      layouts: route.layouts,\n      notFounds: null,\n      routeSegments: route.routeSegments,\n    })[0];\n\n    if (rootLayoutEntry) {\n      return rootLayoutEntry.treePath;\n    }\n  }\n\n  // Without route tree metadata we cannot derive a canonical root layout tree path.\n  // Returning null keeps boundary payloads soft-navigation compatible.\n  return null;\n}\n\nfunction resolveHttpAccessFallbackHeadRouteSegments<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly string[] | undefined {\n  if (!route?.routeSegments) {\n    return undefined;\n  }\n\n  if (!route.layouts || layoutModules.length >= route.layouts.length) {\n    return route.routeSegments;\n  }\n\n  const lastIncludedLayoutIndex = layoutModules.length - 1;\n  if (lastIncludedLayoutIndex < 0) {\n    return [];\n  }\n\n  const segmentCount = route.layoutTreePositions?.[lastIncludedLayoutIndex] ?? 0;\n  return route.routeSegments.slice(0, segmentCount);\n}\n\nfunction resolveHttpAccessFallbackHeadLayoutTreePositions<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly number[] | null | undefined {\n  if (!route?.layouts || layoutModules.length >= route.layouts.length) {\n    return route?.layoutTreePositions;\n  }\n\n  return route.layoutTreePositions?.slice(0, layoutModules.length);\n}\n\nfunction createAppPageBoundaryRscPayload<TModule extends AppPageModule>(\n  options: AppPageBoundaryRscPayloadOptions<TModule>,\n): AppElements {\n  const routeId = createAppPayloadRouteId(options.pathname, null);\n\n  return {\n    [APP_INTERCEPTION_CONTEXT_KEY]: null,\n    [APP_ROUTE_KEY]: routeId,\n    [APP_ROOT_LAYOUT_KEY]: resolveAppPageBoundaryRootLayoutTreePath(options.route),\n    [routeId]: options.element,\n  };\n}\n\nasync function renderAppPageBoundaryElementResponse<TModule extends AppPageModule>(\n  options: AppPageBoundaryRenderCommonOptions<TModule> & {\n    element: ReactNode;\n    layoutModules: readonly (TModule | null | undefined)[];\n    route?: AppPageBoundaryRoute<TModule> | null;\n    routePattern?: string;\n    status: number;\n  },\n): Promise<Response> {\n  const pathname = new URL(options.requestUrl).pathname;\n  const payload = createAppPageBoundaryRscPayload({\n    element: options.element,\n    pathname,\n    route: options.route,\n  });\n\n  return renderAppPageBoundaryResponse({\n    async createHtmlResponse(rscStream, responseStatus) {\n      const fontData = createAppPageFontData({\n        getLinks: options.getFontLinks,\n        getPreloads: options.getFontPreloads,\n        getStyles: options.getFontStyles,\n      });\n      const ssrHandler = await options.loadSsrHandler();\n      return renderAppPageHtmlResponse({\n        clearRequestContext: options.clearRequestContext,\n        fontData,\n        fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),\n        middlewareHeaders: options.middlewareContext.headers,\n        navigationContext: options.getNavigationContext(),\n        rscStream,\n        scriptNonce: options.scriptNonce,\n        ssrHandler,\n        status: responseStatus,\n      });\n    },\n    createRscOnErrorHandler() {\n      return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);\n    },\n    element: payload,\n    isRscRequest: options.isRscRequest,\n    middlewareHeaders: options.middlewareContext.headers,\n    renderToReadableStream: options.renderToReadableStream,\n    status: options.status,\n  });\n}\n\nexport async function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(\n  options: RenderAppPageHttpAccessFallbackOptions<TModule>,\n): Promise<Response | null> {\n  const boundaryComponent =\n    options.boundaryComponent ??\n    resolveAppPageHttpAccessBoundaryComponent({\n      getDefaultExport,\n      rootForbiddenModule: options.rootForbiddenModule,\n      rootNotFoundModule: options.rootNotFoundModule,\n      rootUnauthorizedModule: options.rootUnauthorizedModule,\n      routeForbiddenModule: options.route?.forbidden,\n      routeNotFoundModule: options.route?.notFound,\n      routeUnauthorizedModule: options.route?.unauthorized,\n      statusCode: options.statusCode,\n    });\n  if (!boundaryComponent) {\n    return null;\n  }\n\n  const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;\n  const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);\n  const { metadata, viewport } = await resolveAppPageHead({\n    layoutModules,\n    layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(\n      options.route,\n      layoutModules,\n    ),\n    metadataRoutes: options.metadataRoutes,\n    params: options.matchedParams,\n    routePath: options.route?.pattern ?? new URL(options.requestUrl).pathname,\n    routeSegments,\n  });\n\n  const headElements: ReactNode[] = [\n    createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" }),\n    createElement(\"meta\", { content: \"noindex\", key: \"robots\", name: \"robots\" }),\n  ];\n  if (metadata) {\n    headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n  }\n  headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(Fragment, null, ...headElements, createElement(boundaryComponent)),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: true,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: options.statusCode,\n  });\n}\n\nexport async function renderAppPageErrorBoundary<TModule extends AppPageModule>(\n  options: RenderAppPageErrorBoundaryOptions<TModule>,\n): Promise<Response | null> {\n  const errorBoundary = resolveAppPageErrorBoundary({\n    getDefaultExport,\n    globalErrorModule: options.globalErrorModule,\n    layoutErrorModules: options.route?.errors,\n    pageErrorModule: options.route?.error,\n  });\n  if (!errorBoundary.component) {\n    return null;\n  }\n\n  const rawError =\n    options.error instanceof Error ? options.error : new Error(String(options.error));\n  rewriteClientHookError(rawError);\n  const errorObject = options.sanitizeErrorForClient(rawError);\n  const matchedParams = options.matchedParams ?? options.route?.params ?? {};\n  const layoutModules = options.route?.layouts ?? options.rootLayouts;\n  const pathname = new URL(options.requestUrl).pathname;\n\n  const headElements: ReactNode[] = [createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" })];\n  if (!errorBoundary.isGlobalError) {\n    try {\n      const { metadata, viewport } = await resolveAppPageHead({\n        fallbackOnFileMetadataError: true,\n        layoutModules,\n        layoutTreePositions: options.route?.layoutTreePositions,\n        metadataRoutes: options.metadataRoutes,\n        params: matchedParams,\n        routePath: options.route?.pattern ?? pathname,\n        routeSegments: options.route?.routeSegments,\n      });\n      if (metadata) {\n        headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n      }\n      headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n    } catch (error) {\n      console.error(\n        `[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`,\n        error,\n      );\n    }\n  }\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(\n      Fragment,\n      null,\n      ...headElements,\n      createElement(errorBoundary.component, {\n        error: errorObject,\n      }),\n    ),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: !errorBoundary.isGlobalError,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n    skipLayoutWrapping: errorBoundary.isGlobalError,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: 200,\n  });\n}\n\n// React client-only hooks that are absent from the `react-server` export\n// condition. When called in a Server Component they produce a TypeError like\n// \"useState is not a function\". Rewrite into an actionable message matching\n// the format used by the next/navigation shims (see client-hook-error.ts).\nconst _clientHookPattern =\n  /\\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\\b.*is not a function/;\n\nfunction rewriteClientHookError(error: Error): void {\n  const match = error.message.match(_clientHookPattern);\n  if (match) {\n    error.message = buildClientHookErrorMessage(`${match[1]}()`);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-boundary-render.js","names":[],"sources":["../../src/server/app-page-boundary-render.ts"],"sourcesContent":["import { Fragment, createElement, type ComponentType, type ReactNode } from \"react\";\nimport { buildClientHookErrorMessage } from \"vinext/shims/client-hook-error\";\nimport { ErrorBoundary } from \"vinext/shims/error-boundary\";\nimport { LayoutSegmentProvider } from \"vinext/shims/layout-segment-context\";\nimport { MetadataHead, ViewportHead } from \"vinext/shims/metadata\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\nimport { resolveAppPageHead } from \"./app-page-head.js\";\nimport {\n  renderAppPageBoundaryResponse,\n  resolveAppPageErrorBoundary,\n  resolveAppPageHttpAccessBoundaryComponent,\n  wrapAppPageBoundaryElement,\n  type AppPageParams,\n} from \"./app-page-boundary.js\";\nimport {\n  createAppPageFontData,\n  renderAppPageHtmlResponse,\n  type AppPageSsrHandler,\n} from \"./app-page-stream.js\";\nimport { AppElementsWire, type AppElements } from \"./app-elements.js\";\nimport { createAppPageLayoutEntries } from \"./app-page-route-wiring.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype AppPageBoundaryRscPayloadOptions<TModule extends AppPageModule = AppPageModule> = {\n  element: ReactNode;\n  pathname: string;\n  route?: AppPageBoundaryRoute<TModule> | null;\n};\n\nexport type AppPageBoundaryRoute<TModule extends AppPageModule = AppPageModule> = {\n  error?: TModule | null;\n  errors?: readonly (TModule | null | undefined)[] | null;\n  forbidden?: TModule | null;\n  layoutTreePositions?: readonly number[] | null;\n  layouts?: readonly (TModule | null | undefined)[];\n  notFound?: TModule | null;\n  params?: AppPageParams;\n  pattern?: string;\n  routeSegments?: readonly string[];\n  unauthorized?: TModule | null;\n};\n\ntype AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageModule> = {\n  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n  clearRequestContext: () => void;\n  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n  getNavigationContext: () => unknown;\n  globalErrorModule?: TModule | null;\n  isRscRequest: boolean;\n  loadSsrHandler: () => Promise<AppPageSsrHandler>;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  middlewareContext: AppPageMiddlewareContext;\n  metadataRoutes: MetadataFileRoute[];\n  renderToReadableStream: (\n    element: ReactNode | AppElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  requestUrl: string;\n  resolveChildSegments: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => string[];\n  rootLayouts: readonly (TModule | null | undefined)[];\n  scriptNonce?: string;\n};\n\ntype RenderAppPageHttpAccessFallbackOptions<TModule extends AppPageModule = AppPageModule> = {\n  boundaryComponent?: AppPageComponent | null;\n  layoutModules?: readonly (TModule | null | undefined)[] | null;\n  matchedParams: AppPageParams;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  statusCode: number;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\ntype RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageModule> = {\n  error: unknown;\n  matchedParams?: AppPageParams | null;\n  route?: AppPageBoundaryRoute<TModule> | null;\n  sanitizeErrorForClient: (error: Error) => Error;\n} & AppPageBoundaryRenderCommonOptions<TModule>;\n\nfunction getDefaultExport<TModule extends AppPageModule>(\n  module: TModule | null | undefined,\n): AppPageComponent | null {\n  return module?.default ?? null;\n}\n\nfunction wrapRenderedBoundaryElement<TModule extends AppPageModule>(\n  options: Pick<\n    AppPageBoundaryRenderCommonOptions<TModule>,\n    \"globalErrorModule\" | \"isRscRequest\" | \"makeThenableParams\" | \"resolveChildSegments\"\n  > & {\n    element: ReactNode;\n    includeGlobalErrorBoundary: boolean;\n    layoutModules: readonly (TModule | null | undefined)[];\n    layoutTreePositions?: readonly number[] | null;\n    matchedParams: AppPageParams;\n    routeSegments?: readonly string[];\n    skipLayoutWrapping?: boolean;\n  },\n): ReactNode {\n  return wrapAppPageBoundaryElement({\n    element: options.element,\n    getDefaultExport,\n    globalErrorComponent: getDefaultExport(options.globalErrorModule),\n    includeGlobalErrorBoundary: options.includeGlobalErrorBoundary,\n    isRscRequest: options.isRscRequest,\n    layoutModules: options.layoutModules,\n    layoutTreePositions: options.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    renderErrorBoundary(GlobalErrorComponent, children) {\n      return createElement(ErrorBoundary, {\n        fallback: GlobalErrorComponent,\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n      });\n    },\n    renderLayout(LayoutComponent, children, asyncParams) {\n      return createElement(LayoutComponent as AppPageComponent, {\n        // oxlint-disable-next-line react/no-children-prop\n        children,\n        params: asyncParams,\n      });\n    },\n    renderLayoutSegmentProvider(segmentMap, children) {\n      return createElement(\n        // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n        LayoutSegmentProvider as ComponentType<any>,\n        { segmentMap },\n        children,\n      );\n    },\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.routeSegments ?? [],\n    skipLayoutWrapping: options.skipLayoutWrapping,\n  });\n}\n\nfunction resolveAppPageBoundaryRootLayoutTreePath<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n): string | null {\n  if (route?.layouts) {\n    const rootLayoutEntry = createAppPageLayoutEntries({\n      errors: route.errors,\n      layoutTreePositions: route.layoutTreePositions,\n      layouts: route.layouts,\n      notFounds: null,\n      routeSegments: route.routeSegments,\n    })[0];\n\n    if (rootLayoutEntry) {\n      return rootLayoutEntry.treePath;\n    }\n  }\n\n  // Without route tree metadata we cannot derive a canonical root layout tree path.\n  // Returning null keeps boundary payloads soft-navigation compatible.\n  return null;\n}\n\nfunction resolveHttpAccessFallbackHeadRouteSegments<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly string[] | undefined {\n  if (!route?.routeSegments) {\n    return undefined;\n  }\n\n  if (!route.layouts || layoutModules.length >= route.layouts.length) {\n    return route.routeSegments;\n  }\n\n  const lastIncludedLayoutIndex = layoutModules.length - 1;\n  if (lastIncludedLayoutIndex < 0) {\n    return [];\n  }\n\n  const segmentCount = route.layoutTreePositions?.[lastIncludedLayoutIndex] ?? 0;\n  return route.routeSegments.slice(0, segmentCount);\n}\n\nfunction resolveHttpAccessFallbackHeadLayoutTreePositions<TModule extends AppPageModule>(\n  route: AppPageBoundaryRoute<TModule> | null | undefined,\n  layoutModules: readonly (TModule | null | undefined)[],\n): readonly number[] | null | undefined {\n  if (!route?.layouts || layoutModules.length >= route.layouts.length) {\n    return route?.layoutTreePositions;\n  }\n\n  return route.layoutTreePositions?.slice(0, layoutModules.length);\n}\n\nfunction createAppPageBoundaryRscPayload<TModule extends AppPageModule>(\n  options: AppPageBoundaryRscPayloadOptions<TModule>,\n): AppElements {\n  const routeId = AppElementsWire.encodeRouteId(options.pathname, null);\n\n  return {\n    ...AppElementsWire.createMetadataEntries({\n      interceptionContext: null,\n      rootLayoutTreePath: resolveAppPageBoundaryRootLayoutTreePath(options.route),\n      routeId,\n    }),\n    [routeId]: options.element,\n  };\n}\n\nasync function renderAppPageBoundaryElementResponse<TModule extends AppPageModule>(\n  options: AppPageBoundaryRenderCommonOptions<TModule> & {\n    element: ReactNode;\n    layoutModules: readonly (TModule | null | undefined)[];\n    route?: AppPageBoundaryRoute<TModule> | null;\n    routePattern?: string;\n    status: number;\n  },\n): Promise<Response> {\n  const pathname = new URL(options.requestUrl).pathname;\n  const payload = createAppPageBoundaryRscPayload({\n    element: options.element,\n    pathname,\n    route: options.route,\n  });\n\n  return renderAppPageBoundaryResponse({\n    async createHtmlResponse(rscStream, responseStatus) {\n      const fontData = createAppPageFontData({\n        getLinks: options.getFontLinks,\n        getPreloads: options.getFontPreloads,\n        getStyles: options.getFontStyles,\n      });\n      const ssrHandler = await options.loadSsrHandler();\n      return renderAppPageHtmlResponse({\n        clearRequestContext: options.clearRequestContext,\n        fontData,\n        fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),\n        middlewareHeaders: options.middlewareContext.headers,\n        navigationContext: options.getNavigationContext(),\n        rscStream,\n        scriptNonce: options.scriptNonce,\n        ssrHandler,\n        status: responseStatus,\n      });\n    },\n    createRscOnErrorHandler() {\n      return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);\n    },\n    element: payload,\n    isRscRequest: options.isRscRequest,\n    middlewareHeaders: options.middlewareContext.headers,\n    renderToReadableStream: options.renderToReadableStream,\n    status: options.status,\n  });\n}\n\nexport async function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(\n  options: RenderAppPageHttpAccessFallbackOptions<TModule>,\n): Promise<Response | null> {\n  const boundaryComponent =\n    options.boundaryComponent ??\n    resolveAppPageHttpAccessBoundaryComponent({\n      getDefaultExport,\n      rootForbiddenModule: options.rootForbiddenModule,\n      rootNotFoundModule: options.rootNotFoundModule,\n      rootUnauthorizedModule: options.rootUnauthorizedModule,\n      routeForbiddenModule: options.route?.forbidden,\n      routeNotFoundModule: options.route?.notFound,\n      routeUnauthorizedModule: options.route?.unauthorized,\n      statusCode: options.statusCode,\n    });\n  if (!boundaryComponent) {\n    return null;\n  }\n\n  const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;\n  const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);\n  const { metadata, viewport } = await resolveAppPageHead({\n    layoutModules,\n    layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(\n      options.route,\n      layoutModules,\n    ),\n    metadataRoutes: options.metadataRoutes,\n    params: options.matchedParams,\n    routePath: options.route?.pattern ?? new URL(options.requestUrl).pathname,\n    routeSegments,\n  });\n\n  const headElements: ReactNode[] = [\n    createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" }),\n    createElement(\"meta\", { content: \"noindex\", key: \"robots\", name: \"robots\" }),\n  ];\n  if (metadata) {\n    headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n  }\n  headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(Fragment, null, ...headElements, createElement(boundaryComponent)),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: true,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams: options.matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: options.statusCode,\n  });\n}\n\nexport async function renderAppPageErrorBoundary<TModule extends AppPageModule>(\n  options: RenderAppPageErrorBoundaryOptions<TModule>,\n): Promise<Response | null> {\n  const errorBoundary = resolveAppPageErrorBoundary({\n    getDefaultExport,\n    globalErrorModule: options.globalErrorModule,\n    layoutErrorModules: options.route?.errors,\n    pageErrorModule: options.route?.error,\n  });\n  if (!errorBoundary.component) {\n    return null;\n  }\n\n  const rawError =\n    options.error instanceof Error ? options.error : new Error(String(options.error));\n  rewriteClientHookError(rawError);\n  const errorObject = options.sanitizeErrorForClient(rawError);\n  const matchedParams = options.matchedParams ?? options.route?.params ?? {};\n  const layoutModules = options.route?.layouts ?? options.rootLayouts;\n  const pathname = new URL(options.requestUrl).pathname;\n\n  const headElements: ReactNode[] = [createElement(\"meta\", { charSet: \"utf-8\", key: \"charset\" })];\n  if (!errorBoundary.isGlobalError) {\n    try {\n      const { metadata, viewport } = await resolveAppPageHead({\n        fallbackOnFileMetadataError: true,\n        layoutModules,\n        layoutTreePositions: options.route?.layoutTreePositions,\n        metadataRoutes: options.metadataRoutes,\n        params: matchedParams,\n        routePath: options.route?.pattern ?? pathname,\n        routeSegments: options.route?.routeSegments,\n      });\n      if (metadata) {\n        headElements.push(createElement(MetadataHead, { key: \"metadata\", metadata }));\n      }\n      headElements.push(createElement(ViewportHead, { key: \"viewport\", viewport }));\n    } catch (error) {\n      console.error(\n        `[vinext] App page error boundary head resolution failed for ${options.route?.pattern ?? pathname}:`,\n        error,\n      );\n    }\n  }\n\n  const element = wrapRenderedBoundaryElement({\n    element: createElement(\n      Fragment,\n      null,\n      ...headElements,\n      createElement(errorBoundary.component, {\n        error: errorObject,\n      }),\n    ),\n    globalErrorModule: options.globalErrorModule,\n    includeGlobalErrorBoundary: !errorBoundary.isGlobalError,\n    isRscRequest: options.isRscRequest,\n    layoutModules,\n    layoutTreePositions: options.route?.layoutTreePositions,\n    makeThenableParams: options.makeThenableParams,\n    matchedParams,\n    resolveChildSegments: options.resolveChildSegments,\n    routeSegments: options.route?.routeSegments,\n    skipLayoutWrapping: errorBoundary.isGlobalError,\n  });\n\n  return renderAppPageBoundaryElementResponse({\n    ...options,\n    element,\n    layoutModules,\n    route: options.route,\n    routePattern: options.route?.pattern,\n    status: 200,\n  });\n}\n\n// React client-only hooks that are absent from the `react-server` export\n// condition. When called in a Server Component they produce a TypeError like\n// \"useState is not a function\". Rewrite into an actionable message matching\n// the format used by the next/navigation shims (see client-hook-error.ts).\nconst _clientHookPattern =\n  /\\b(useState|useEffect|useReducer|useRef|useContext|useLayoutEffect|useInsertionEffect|useSyncExternalStore|useTransition|useImperativeHandle|useDeferredValue|useActionState|useOptimistic|useEffectEvent)\\b.*is not a function/;\n\nfunction rewriteClientHookError(error: Error): void {\n  const match = error.message.match(_clientHookPattern);\n  if (match) {\n    error.message = buildClientHookErrorMessage(`${match[1]}()`);\n  }\n}\n"],"mappings":"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"}

package/dist/server/app-page-boundary.js

@@ -1,3 +1,4 @@
+import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 //#region src/server/app-page-boundary.ts
@@ -64,7 +65,7 @@ async function renderAppPageBoundaryResponse(options) {
 	if (options.isRscRequest) {
 		const headers = new Headers({
 			"Content-Type": "text/x-component; charset=utf-8",
-			Vary: "RSC, Accept"
+			Vary: VINEXT_RSC_VARY_HEADER
 		});
 		mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
 		return new Response(rscStream, {

package/dist/server/app-page-boundary.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-page-boundary.js","names":[],"sources":["../../src/server/app-page-boundary.ts"],"sourcesContent":["import { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { resolveAppPageSegmentParams } from \"./app-page-params.js\";\n\nexport type AppPageParams = Record<string, string | string[]>;\n\ntype ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModule?: TModule | null;\n  routeNotFoundModule?: TModule | null;\n  routeUnauthorizedModule?: TModule | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule> = {\n  layoutIndex: number;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModules?: readonly (TModule | null | undefined)[] | null;\n  routeNotFoundModules?: readonly (TModule | null | undefined)[] | null;\n  routeUnauthorizedModules?: readonly (TModule | null | undefined)[] | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageErrorBoundaryOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  globalErrorModule?: TModule | null;\n  layoutErrorModules?: readonly (TModule | null | undefined)[] | null;\n  pageErrorModule?: TModule | null;\n};\n\ntype ResolveAppPageErrorBoundaryResult<TComponent> = {\n  component: TComponent | null;\n  isGlobalError: boolean;\n};\n\ntype WrapAppPageBoundaryElementOptions<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n> = {\n  element: TElement;\n  getDefaultExport: (\n    module: TLayoutModule | null | undefined,\n  ) => TLayoutComponent | null | undefined;\n  globalErrorComponent?: TGlobalErrorComponent | null;\n  includeGlobalErrorBoundary: boolean;\n  isRscRequest: boolean;\n  layoutModules: readonly (TLayoutModule | null | undefined)[];\n  layoutTreePositions?: readonly number[] | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  matchedParams: AppPageParams;\n  renderErrorBoundary: (component: TGlobalErrorComponent, children: TElement) => TElement;\n  renderLayout: (component: TLayoutComponent, children: TElement, params: unknown) => TElement;\n  renderLayoutSegmentProvider?: (\n    segmentMap: { children: TChildSegments },\n    children: TElement,\n  ) => TElement;\n  resolveChildSegments?: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => TChildSegments;\n  routeSegments?: readonly string[];\n  skipLayoutWrapping?: boolean;\n};\n\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype RenderAppPageBoundaryResponseOptions<TElement> = {\n  createHtmlResponse: (rscStream: ReadableStream<Uint8Array>, status: number) => Promise<Response>;\n  createRscOnErrorHandler: () => AppPageBoundaryOnError;\n  element: TElement;\n  isRscRequest: boolean;\n  middlewareHeaders?: Headers | null;\n  renderToReadableStream: (\n    element: TElement,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  status: number;\n};\n\nexport function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(\n  options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>,\n): TComponent | null {\n  let boundaryModule: TModule | null | undefined;\n\n  if (options.statusCode === 403) {\n    boundaryModule = options.routeForbiddenModule ?? options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    boundaryModule = options.routeUnauthorizedModule ?? options.rootUnauthorizedModule;\n  } else {\n    boundaryModule = options.routeNotFoundModule ?? options.rootNotFoundModule;\n  }\n\n  return options.getDefaultExport(boundaryModule) ?? null;\n}\n\nexport function resolveAppPageParentHttpAccessBoundaryModule<TModule>(\n  options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>,\n): TModule | null {\n  let routeModules = options.routeNotFoundModules;\n  let rootModule = options.rootNotFoundModule;\n\n  if (options.statusCode === 403) {\n    routeModules = options.routeForbiddenModules;\n    rootModule = options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    routeModules = options.routeUnauthorizedModules;\n    rootModule = options.rootUnauthorizedModule;\n  }\n\n  if (routeModules) {\n    for (let index = options.layoutIndex - 1; index >= 0; index--) {\n      const module = routeModules[index];\n      if (module) {\n        return module;\n      }\n    }\n  }\n\n  return rootModule ?? null;\n}\n\nexport function resolveAppPageErrorBoundary<TModule, TComponent>(\n  options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>,\n): ResolveAppPageErrorBoundaryResult<TComponent> {\n  const pageErrorComponent = options.getDefaultExport(options.pageErrorModule);\n  if (pageErrorComponent) {\n    return {\n      component: pageErrorComponent,\n      isGlobalError: false,\n    };\n  }\n\n  if (options.layoutErrorModules) {\n    for (let index = options.layoutErrorModules.length - 1; index >= 0; index--) {\n      const layoutErrorComponent = options.getDefaultExport(options.layoutErrorModules[index]);\n      if (layoutErrorComponent) {\n        return {\n          component: layoutErrorComponent,\n          isGlobalError: false,\n        };\n      }\n    }\n  }\n\n  const globalErrorComponent = options.getDefaultExport(options.globalErrorModule);\n  return {\n    component: globalErrorComponent ?? null,\n    isGlobalError: Boolean(globalErrorComponent),\n  };\n}\n\nexport function wrapAppPageBoundaryElement<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n>(\n  options: WrapAppPageBoundaryElementOptions<\n    TElement,\n    TLayoutModule,\n    TLayoutComponent,\n    TChildSegments,\n    TGlobalErrorComponent\n  >,\n): TElement {\n  let element = options.element;\n\n  if (!options.skipLayoutWrapping) {\n    for (let index = options.layoutModules.length - 1; index >= 0; index--) {\n      const layoutComponent = options.getDefaultExport(options.layoutModules[index]);\n      if (!layoutComponent) {\n        continue;\n      }\n\n      const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;\n      const asyncParams = options.makeThenableParams(\n        resolveAppPageSegmentParams(options.routeSegments, treePosition, options.matchedParams),\n      );\n      element = options.renderLayout(layoutComponent, element, asyncParams);\n\n      if (\n        options.isRscRequest &&\n        options.renderLayoutSegmentProvider &&\n        options.resolveChildSegments\n      ) {\n        const childSegments = options.resolveChildSegments(\n          options.routeSegments ?? [],\n          treePosition,\n          options.matchedParams,\n        );\n        element = options.renderLayoutSegmentProvider({ children: childSegments }, element);\n      }\n    }\n  }\n\n  if (options.isRscRequest && options.includeGlobalErrorBoundary && options.globalErrorComponent) {\n    element = options.renderErrorBoundary(options.globalErrorComponent, element);\n  }\n\n  return element;\n}\n\nexport async function renderAppPageBoundaryResponse<TElement>(\n  options: RenderAppPageBoundaryResponseOptions<TElement>,\n): Promise<Response> {\n  const rscStream = options.renderToReadableStream(options.element, {\n    onError: options.createRscOnErrorHandler(),\n  });\n\n  if (options.isRscRequest) {\n    // Do NOT clear request-scoped context here. RSC responses are consumed lazily\n    // by the client, so headers()/cookies() and async server components still need\n    // their ALS-backed state while the stream is being read.\n    const headers = new Headers({\n      \"Content-Type\": \"text/x-component; charset=utf-8\",\n      Vary: \"RSC, Accept\",\n    });\n    mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n\n    return new Response(rscStream, {\n      status: options.status,\n      headers,\n    });\n  }\n\n  return options.createHtmlResponse(rscStream, options.status);\n}\n"],"mappings":";;;AA2FA,SAAgB,0CACd,SACmB;CACnB,IAAI;AAEJ,KAAI,QAAQ,eAAe,IACzB,kBAAiB,QAAQ,wBAAwB,QAAQ;UAChD,QAAQ,eAAe,IAChC,kBAAiB,QAAQ,2BAA2B,QAAQ;KAE5D,kBAAiB,QAAQ,uBAAuB,QAAQ;AAG1D,QAAO,QAAQ,iBAAiB,eAAe,IAAI;;AAGrD,SAAgB,6CACd,SACgB;CAChB,IAAI,eAAe,QAAQ;CAC3B,IAAI,aAAa,QAAQ;AAEzB,KAAI,QAAQ,eAAe,KAAK;AAC9B,iBAAe,QAAQ;AACvB,eAAa,QAAQ;YACZ,QAAQ,eAAe,KAAK;AACrC,iBAAe,QAAQ;AACvB,eAAa,QAAQ;;AAGvB,KAAI,aACF,MAAK,IAAI,QAAQ,QAAQ,cAAc,GAAG,SAAS,GAAG,SAAS;EAC7D,MAAM,SAAS,aAAa;AAC5B,MAAI,OACF,QAAO;;AAKb,QAAO,cAAc;;AAGvB,SAAgB,4BACd,SAC+C;CAC/C,MAAM,qBAAqB,QAAQ,iBAAiB,QAAQ,gBAAgB;AAC5E,KAAI,mBACF,QAAO;EACL,WAAW;EACX,eAAe;EAChB;AAGH,KAAI,QAAQ,mBACV,MAAK,IAAI,QAAQ,QAAQ,mBAAmB,SAAS,GAAG,SAAS,GAAG,SAAS;EAC3E,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,mBAAmB,OAAO;AACxF,MAAI,qBACF,QAAO;GACL,WAAW;GACX,eAAe;GAChB;;CAKP,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,kBAAkB;AAChF,QAAO;EACL,WAAW,wBAAwB;EACnC,eAAe,QAAQ,qBAAqB;EAC7C;;AAGH,SAAgB,2BAOd,SAOU;CACV,IAAI,UAAU,QAAQ;AAEtB,KAAI,CAAC,QAAQ,mBACX,MAAK,IAAI,QAAQ,QAAQ,cAAc,SAAS,GAAG,SAAS,GAAG,SAAS;EACtE,MAAM,kBAAkB,QAAQ,iBAAiB,QAAQ,cAAc,OAAO;AAC9E,MAAI,CAAC,gBACH;EAGF,MAAM,eAAe,QAAQ,sBAAsB,QAAQ,oBAAoB,SAAS;EACxF,MAAM,cAAc,QAAQ,mBAC1B,4BAA4B,QAAQ,eAAe,cAAc,QAAQ,cAAc,CACxF;AACD,YAAU,QAAQ,aAAa,iBAAiB,SAAS,YAAY;AAErE,MACE,QAAQ,gBACR,QAAQ,+BACR,QAAQ,sBACR;GACA,MAAM,gBAAgB,QAAQ,qBAC5B,QAAQ,iBAAiB,EAAE,EAC3B,cACA,QAAQ,cACT;AACD,aAAU,QAAQ,4BAA4B,EAAE,UAAU,eAAe,EAAE,QAAQ;;;AAKzF,KAAI,QAAQ,gBAAgB,QAAQ,8BAA8B,QAAQ,qBACxE,WAAU,QAAQ,oBAAoB,QAAQ,sBAAsB,QAAQ;AAG9E,QAAO;;AAGT,eAAsB,8BACpB,SACmB;CACnB,MAAM,YAAY,QAAQ,uBAAuB,QAAQ,SAAS,EAChE,SAAS,QAAQ,yBAAyB,EAC3C,CAAC;AAEF,KAAI,QAAQ,cAAc;EAIxB,MAAM,UAAU,IAAI,QAAQ;GAC1B,gBAAgB;GAChB,MAAM;GACP,CAAC;AACF,iCAA+B,SAAS,QAAQ,qBAAqB,KAAK;AAE1E,SAAO,IAAI,SAAS,WAAW;GAC7B,QAAQ,QAAQ;GAChB;GACD,CAAC;;AAGJ,QAAO,QAAQ,mBAAmB,WAAW,QAAQ,OAAO"}
+{"version":3,"file":"app-page-boundary.js","names":[],"sources":["../../src/server/app-page-boundary.ts"],"sourcesContent":["import { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\nimport { resolveAppPageSegmentParams } from \"./app-page-params.js\";\n\nexport type AppPageParams = Record<string, string | string[]>;\n\ntype ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModule?: TModule | null;\n  routeNotFoundModule?: TModule | null;\n  routeUnauthorizedModule?: TModule | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule> = {\n  layoutIndex: number;\n  rootForbiddenModule?: TModule | null;\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n  routeForbiddenModules?: readonly (TModule | null | undefined)[] | null;\n  routeNotFoundModules?: readonly (TModule | null | undefined)[] | null;\n  routeUnauthorizedModules?: readonly (TModule | null | undefined)[] | null;\n  statusCode: number;\n};\n\ntype ResolveAppPageErrorBoundaryOptions<TModule, TComponent> = {\n  getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;\n  globalErrorModule?: TModule | null;\n  layoutErrorModules?: readonly (TModule | null | undefined)[] | null;\n  pageErrorModule?: TModule | null;\n};\n\ntype ResolveAppPageErrorBoundaryResult<TComponent> = {\n  component: TComponent | null;\n  isGlobalError: boolean;\n};\n\ntype WrapAppPageBoundaryElementOptions<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n> = {\n  element: TElement;\n  getDefaultExport: (\n    module: TLayoutModule | null | undefined,\n  ) => TLayoutComponent | null | undefined;\n  globalErrorComponent?: TGlobalErrorComponent | null;\n  includeGlobalErrorBoundary: boolean;\n  isRscRequest: boolean;\n  layoutModules: readonly (TLayoutModule | null | undefined)[];\n  layoutTreePositions?: readonly number[] | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  matchedParams: AppPageParams;\n  renderErrorBoundary: (component: TGlobalErrorComponent, children: TElement) => TElement;\n  renderLayout: (component: TLayoutComponent, children: TElement, params: unknown) => TElement;\n  renderLayoutSegmentProvider?: (\n    segmentMap: { children: TChildSegments },\n    children: TElement,\n  ) => TElement;\n  resolveChildSegments?: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => TChildSegments;\n  routeSegments?: readonly string[];\n  skipLayoutWrapping?: boolean;\n};\n\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype RenderAppPageBoundaryResponseOptions<TElement> = {\n  createHtmlResponse: (rscStream: ReadableStream<Uint8Array>, status: number) => Promise<Response>;\n  createRscOnErrorHandler: () => AppPageBoundaryOnError;\n  element: TElement;\n  isRscRequest: boolean;\n  middlewareHeaders?: Headers | null;\n  renderToReadableStream: (\n    element: TElement,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  status: number;\n};\n\nexport function resolveAppPageHttpAccessBoundaryComponent<TModule, TComponent>(\n  options: ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent>,\n): TComponent | null {\n  let boundaryModule: TModule | null | undefined;\n\n  if (options.statusCode === 403) {\n    boundaryModule = options.routeForbiddenModule ?? options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    boundaryModule = options.routeUnauthorizedModule ?? options.rootUnauthorizedModule;\n  } else {\n    boundaryModule = options.routeNotFoundModule ?? options.rootNotFoundModule;\n  }\n\n  return options.getDefaultExport(boundaryModule) ?? null;\n}\n\nexport function resolveAppPageParentHttpAccessBoundaryModule<TModule>(\n  options: ResolveAppPageParentHttpAccessBoundaryModuleOptions<TModule>,\n): TModule | null {\n  let routeModules = options.routeNotFoundModules;\n  let rootModule = options.rootNotFoundModule;\n\n  if (options.statusCode === 403) {\n    routeModules = options.routeForbiddenModules;\n    rootModule = options.rootForbiddenModule;\n  } else if (options.statusCode === 401) {\n    routeModules = options.routeUnauthorizedModules;\n    rootModule = options.rootUnauthorizedModule;\n  }\n\n  if (routeModules) {\n    for (let index = options.layoutIndex - 1; index >= 0; index--) {\n      const module = routeModules[index];\n      if (module) {\n        return module;\n      }\n    }\n  }\n\n  return rootModule ?? null;\n}\n\nexport function resolveAppPageErrorBoundary<TModule, TComponent>(\n  options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>,\n): ResolveAppPageErrorBoundaryResult<TComponent> {\n  const pageErrorComponent = options.getDefaultExport(options.pageErrorModule);\n  if (pageErrorComponent) {\n    return {\n      component: pageErrorComponent,\n      isGlobalError: false,\n    };\n  }\n\n  if (options.layoutErrorModules) {\n    for (let index = options.layoutErrorModules.length - 1; index >= 0; index--) {\n      const layoutErrorComponent = options.getDefaultExport(options.layoutErrorModules[index]);\n      if (layoutErrorComponent) {\n        return {\n          component: layoutErrorComponent,\n          isGlobalError: false,\n        };\n      }\n    }\n  }\n\n  const globalErrorComponent = options.getDefaultExport(options.globalErrorModule);\n  return {\n    component: globalErrorComponent ?? null,\n    isGlobalError: Boolean(globalErrorComponent),\n  };\n}\n\nexport function wrapAppPageBoundaryElement<\n  TElement,\n  TLayoutModule,\n  TLayoutComponent,\n  TChildSegments,\n  TGlobalErrorComponent,\n>(\n  options: WrapAppPageBoundaryElementOptions<\n    TElement,\n    TLayoutModule,\n    TLayoutComponent,\n    TChildSegments,\n    TGlobalErrorComponent\n  >,\n): TElement {\n  let element = options.element;\n\n  if (!options.skipLayoutWrapping) {\n    for (let index = options.layoutModules.length - 1; index >= 0; index--) {\n      const layoutComponent = options.getDefaultExport(options.layoutModules[index]);\n      if (!layoutComponent) {\n        continue;\n      }\n\n      const treePosition = options.layoutTreePositions ? options.layoutTreePositions[index] : 0;\n      const asyncParams = options.makeThenableParams(\n        resolveAppPageSegmentParams(options.routeSegments, treePosition, options.matchedParams),\n      );\n      element = options.renderLayout(layoutComponent, element, asyncParams);\n\n      if (\n        options.isRscRequest &&\n        options.renderLayoutSegmentProvider &&\n        options.resolveChildSegments\n      ) {\n        const childSegments = options.resolveChildSegments(\n          options.routeSegments ?? [],\n          treePosition,\n          options.matchedParams,\n        );\n        element = options.renderLayoutSegmentProvider({ children: childSegments }, element);\n      }\n    }\n  }\n\n  if (options.isRscRequest && options.includeGlobalErrorBoundary && options.globalErrorComponent) {\n    element = options.renderErrorBoundary(options.globalErrorComponent, element);\n  }\n\n  return element;\n}\n\nexport async function renderAppPageBoundaryResponse<TElement>(\n  options: RenderAppPageBoundaryResponseOptions<TElement>,\n): Promise<Response> {\n  const rscStream = options.renderToReadableStream(options.element, {\n    onError: options.createRscOnErrorHandler(),\n  });\n\n  if (options.isRscRequest) {\n    // Do NOT clear request-scoped context here. RSC responses are consumed lazily\n    // by the client, so headers()/cookies() and async server components still need\n    // their ALS-backed state while the stream is being read.\n    const headers = new Headers({\n      \"Content-Type\": \"text/x-component; charset=utf-8\",\n      Vary: VINEXT_RSC_VARY_HEADER,\n    });\n    mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);\n\n    return new Response(rscStream, {\n      status: options.status,\n      headers,\n    });\n  }\n\n  return options.createHtmlResponse(rscStream, options.status);\n}\n"],"mappings":";;;;AA4FA,SAAgB,0CACd,SACmB;CACnB,IAAI;AAEJ,KAAI,QAAQ,eAAe,IACzB,kBAAiB,QAAQ,wBAAwB,QAAQ;UAChD,QAAQ,eAAe,IAChC,kBAAiB,QAAQ,2BAA2B,QAAQ;KAE5D,kBAAiB,QAAQ,uBAAuB,QAAQ;AAG1D,QAAO,QAAQ,iBAAiB,eAAe,IAAI;;AAGrD,SAAgB,6CACd,SACgB;CAChB,IAAI,eAAe,QAAQ;CAC3B,IAAI,aAAa,QAAQ;AAEzB,KAAI,QAAQ,eAAe,KAAK;AAC9B,iBAAe,QAAQ;AACvB,eAAa,QAAQ;YACZ,QAAQ,eAAe,KAAK;AACrC,iBAAe,QAAQ;AACvB,eAAa,QAAQ;;AAGvB,KAAI,aACF,MAAK,IAAI,QAAQ,QAAQ,cAAc,GAAG,SAAS,GAAG,SAAS;EAC7D,MAAM,SAAS,aAAa;AAC5B,MAAI,OACF,QAAO;;AAKb,QAAO,cAAc;;AAGvB,SAAgB,4BACd,SAC+C;CAC/C,MAAM,qBAAqB,QAAQ,iBAAiB,QAAQ,gBAAgB;AAC5E,KAAI,mBACF,QAAO;EACL,WAAW;EACX,eAAe;EAChB;AAGH,KAAI,QAAQ,mBACV,MAAK,IAAI,QAAQ,QAAQ,mBAAmB,SAAS,GAAG,SAAS,GAAG,SAAS;EAC3E,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,mBAAmB,OAAO;AACxF,MAAI,qBACF,QAAO;GACL,WAAW;GACX,eAAe;GAChB;;CAKP,MAAM,uBAAuB,QAAQ,iBAAiB,QAAQ,kBAAkB;AAChF,QAAO;EACL,WAAW,wBAAwB;EACnC,eAAe,QAAQ,qBAAqB;EAC7C;;AAGH,SAAgB,2BAOd,SAOU;CACV,IAAI,UAAU,QAAQ;AAEtB,KAAI,CAAC,QAAQ,mBACX,MAAK,IAAI,QAAQ,QAAQ,cAAc,SAAS,GAAG,SAAS,GAAG,SAAS;EACtE,MAAM,kBAAkB,QAAQ,iBAAiB,QAAQ,cAAc,OAAO;AAC9E,MAAI,CAAC,gBACH;EAGF,MAAM,eAAe,QAAQ,sBAAsB,QAAQ,oBAAoB,SAAS;EACxF,MAAM,cAAc,QAAQ,mBAC1B,4BAA4B,QAAQ,eAAe,cAAc,QAAQ,cAAc,CACxF;AACD,YAAU,QAAQ,aAAa,iBAAiB,SAAS,YAAY;AAErE,MACE,QAAQ,gBACR,QAAQ,+BACR,QAAQ,sBACR;GACA,MAAM,gBAAgB,QAAQ,qBAC5B,QAAQ,iBAAiB,EAAE,EAC3B,cACA,QAAQ,cACT;AACD,aAAU,QAAQ,4BAA4B,EAAE,UAAU,eAAe,EAAE,QAAQ;;;AAKzF,KAAI,QAAQ,gBAAgB,QAAQ,8BAA8B,QAAQ,qBACxE,WAAU,QAAQ,oBAAoB,QAAQ,sBAAsB,QAAQ;AAG9E,QAAO;;AAGT,eAAsB,8BACpB,SACmB;CACnB,MAAM,YAAY,QAAQ,uBAAuB,QAAQ,SAAS,EAChE,SAAS,QAAQ,yBAAyB,EAC3C,CAAC;AAEF,KAAI,QAAQ,cAAc;EAIxB,MAAM,UAAU,IAAI,QAAQ;GAC1B,gBAAgB;GAChB,MAAM;GACP,CAAC;AACF,iCAA+B,SAAS,QAAQ,qBAAqB,KAAK;AAE1E,SAAO,IAAI,SAAS,WAAW;GAC7B,QAAQ,QAAQ;GAChB;GACD,CAAC;;AAGJ,QAAO,QAAQ,mBAAmB,WAAW,QAAQ,OAAO"}

package/dist/server/app-page-cache.d.ts

@@ -40,6 +40,7 @@ type ReadAppPageCacheResponseOptions = {
   scheduleBackgroundRegeneration: AppPageBackgroundRegenerator;
 };
 type FinalizeAppPageHtmlCacheResponseOptions = {
+  capturedDynamicUsageBeforeContextCleanup?: () => boolean;
   capturedRscDataPromise: Promise<ArrayBuffer> | null;
   cleanPathname: string;
   consumeDynamicUsage: () => boolean;

package/dist/server/app-page-cache.js

@@ -1,5 +1,7 @@
 import { buildAppPageCacheValue } from "./isr-cache.js";
+import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { buildCachedRevalidateCacheControl } from "./cache-control.js";
+import { readStreamAsText } from "../utils/text-stream.js";
 //#region src/server/app-page-cache.ts
 const NO_STORE_CACHE_CONTROL = "no-store, must-revalidate";
 function buildAppPageCacheTags(pathname, extraTags) {
@@ -45,7 +47,7 @@ function buildAppPageCachedResponse(cachedValue, options) {
 	const expireSeconds = options.cacheControl === void 0 ? void 0 : options.cacheControl.expire ?? options.expireSeconds;
 	const headers = {
 		"Cache-Control": buildAppPageCacheControl(options.cacheState, revalidateSeconds, expireSeconds),
-		Vary: "RSC, Accept",
+		Vary: VINEXT_RSC_VARY_HEADER,
 		"X-Vinext-Cache": options.cacheState
 	};
 	if (options.isRscRequest) {
@@ -91,7 +93,8 @@ async function readAppPageCacheResponse(options) {
 			options.isrDebug?.("MISS (empty cached entry)", options.cleanPathname);
 		}
 		if (cached?.isStale && cachedValue) {
-			options.scheduleBackgroundRegeneration(options.cleanPathname, async () => {
+			const regenerationKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader) : options.isrHtmlKey(options.cleanPathname);
+			options.scheduleBackgroundRegeneration(regenerationKey, async () => {
 				const revalidatedPage = await options.renderFreshPageForCache();
 				const revalidateSeconds = revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;
 				const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;
@@ -133,16 +136,8 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 	}
 	const cachePromise = (async () => {
 		try {
-			const reader = streamForCache.getReader();
-			const decoder = new TextDecoder();
-			const chunks = [];
-			for (;;) {
-				const { done, value } = await reader.read();
-				if (done) break;
-				chunks.push(decoder.decode(value, { stream: true }));
-			}
-			chunks.push(decoder.decode());
-			if (options.consumeDynamicUsage()) {
+			const cachedHtml = await readStreamAsText(streamForCache);
+			if (options.capturedDynamicUsageBeforeContextCleanup?.() === true || options.consumeDynamicUsage()) {
 				options.isrDebug?.("HTML cache write skipped (dynamic usage during render)", htmlKey);
 				return;
 			}
@@ -156,7 +151,7 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 				return;
 			}
 			const pageTags = options.getPageTags();
-			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(chunks.join(""), void 0, 200), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
+			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(cachedHtml, void 0, 200), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
 			if (options.capturedRscDataPromise) writes.push(options.capturedRscDataPromise.then((rscData) => options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)));
 			await Promise.all(writes);
 			options.isrDebug?.("HTML cache written", htmlKey);

package/dist/server/app-page-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-page-cache.js","names":[],"sources":["../../src/server/app-page-cache.ts"],"sourcesContent":["import type { CachedAppPageValue, CacheControlMetadata } from \"vinext/shims/cache\";\nimport { buildCachedRevalidateCacheControl } from \"./cache-control.js\";\nimport { buildAppPageCacheValue, type ISRCacheEntry } from \"./isr-cache.js\";\n\ntype AppPageDebugLogger = (event: string, detail: string) => void;\ntype AppPageCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype AppPageCacheSetter = (\n  key: string,\n  data: CachedAppPageValue,\n  revalidateSeconds: number,\n  tags: string[],\n  expireSeconds?: number,\n) => Promise<void>;\ntype AppPageBackgroundRegenerator = (key: string, renderFn: () => Promise<void>) => void;\ntype AppPageRequestCacheLife = {\n  revalidate?: number;\n  expire?: number;\n};\n\ntype AppPageCacheRenderResult = {\n  cacheControl?: CacheControlMetadata;\n  html: string;\n  rscData: ArrayBuffer;\n  tags: string[];\n};\n\ntype BuildAppPageCachedResponseOptions = {\n  cacheControl?: CacheControlMetadata;\n  cacheState: \"HIT\" | \"STALE\";\n  expireSeconds?: number;\n  isRscRequest: boolean;\n  mountedSlotsHeader?: string | null;\n  revalidateSeconds: number;\n};\n\ntype ReadAppPageCacheResponseOptions = {\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  isRscRequest: boolean;\n  isrDebug?: AppPageDebugLogger;\n  isrGet: AppPageCacheGetter;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;\n  isrSet: AppPageCacheSetter;\n  mountedSlotsHeader?: string | null;\n  expireSeconds?: number;\n  revalidateSeconds: number;\n  renderFreshPageForCache: () => Promise<AppPageCacheRenderResult>;\n  scheduleBackgroundRegeneration: AppPageBackgroundRegenerator;\n};\n\ntype FinalizeAppPageHtmlCacheResponseOptions = {\n  capturedRscDataPromise: Promise<ArrayBuffer> | null;\n  cleanPathname: string;\n  consumeDynamicUsage: () => boolean;\n  getPageTags: () => string[];\n  getRequestCacheLife?: () => AppPageRequestCacheLife | null;\n  isrDebug?: AppPageDebugLogger;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;\n  isrSet: AppPageCacheSetter;\n  preserveClientResponseHeaders?: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  waitUntil?: (promise: Promise<void>) => void;\n};\n\ntype ScheduleAppPageRscCacheWriteOptions = {\n  capturedRscDataPromise: Promise<ArrayBuffer> | null;\n  cleanPathname: string;\n  consumeDynamicUsage: () => boolean;\n  dynamicUsedDuringBuild: boolean;\n  getPageTags: () => string[];\n  getRequestCacheLife?: () => AppPageRequestCacheLife | null;\n  isrDebug?: AppPageDebugLogger;\n  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;\n  isrSet: AppPageCacheSetter;\n  mountedSlotsHeader?: string | null;\n  preserveClientResponseHeaders?: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  waitUntil?: (promise: Promise<void>) => void;\n};\n\nconst NO_STORE_CACHE_CONTROL = \"no-store, must-revalidate\";\n\nexport function buildAppPageCacheTags(pathname: string, extraTags: readonly string[]): string[] {\n  const tags = [pathname, `_N_T_${pathname}`, \"_N_T_/layout\"];\n  const segments = pathname.split(\"/\");\n  let built = \"\";\n  for (let index = 1; index < segments.length; index++) {\n    const segment = segments[index];\n    if (segment) {\n      built += `/${segment}`;\n      tags.push(`_N_T_${built}/layout`);\n    }\n  }\n\n  tags.push(`_N_T_${built}/page`);\n  for (const tag of extraTags) {\n    if (!tags.includes(tag)) {\n      tags.push(tag);\n    }\n  }\n  return tags;\n}\n\nfunction buildAppPageCacheControl(\n  cacheState: BuildAppPageCachedResponseOptions[\"cacheState\"],\n  revalidateSeconds: number,\n  expireSeconds?: number,\n): string {\n  return buildCachedRevalidateCacheControl(cacheState, revalidateSeconds, expireSeconds);\n}\n\nfunction getCachedAppPageValue(entry: ISRCacheEntry | null): CachedAppPageValue | null {\n  return entry?.value.value && entry.value.value.kind === \"APP_PAGE\" ? entry.value.value : null;\n}\n\nfunction resolveAppPageCacheWritePolicy(options: {\n  expireSeconds?: number;\n  requestCacheLife?: AppPageRequestCacheLife | null;\n  revalidateSeconds: number | null;\n}): { expireSeconds?: number; revalidateSeconds: number } | null {\n  let revalidateSeconds = options.revalidateSeconds;\n  let expireSeconds = options.expireSeconds;\n  const requestCacheLife = options.requestCacheLife;\n\n  if (requestCacheLife?.revalidate !== undefined) {\n    revalidateSeconds =\n      revalidateSeconds === null\n        ? requestCacheLife.revalidate\n        : Math.min(revalidateSeconds, requestCacheLife.revalidate);\n  }\n  if (requestCacheLife?.expire !== undefined) {\n    expireSeconds = requestCacheLife.expire;\n  }\n\n  if (revalidateSeconds === null || revalidateSeconds <= 0 || !Number.isFinite(revalidateSeconds)) {\n    return null;\n  }\n\n  return { expireSeconds, revalidateSeconds };\n}\n\nexport function buildAppPageCachedResponse(\n  cachedValue: CachedAppPageValue,\n  options: BuildAppPageCachedResponseOptions,\n): Response | null {\n  // Preserve the legacy fallback semantics from the generated entry: invalid\n  // falsy statuses still fall back to 200 rather than being forwarded through.\n  const status = cachedValue.status || 200;\n  const revalidateSeconds = options.cacheControl?.revalidate ?? options.revalidateSeconds;\n  const expireSeconds =\n    options.cacheControl === undefined\n      ? undefined\n      : (options.cacheControl.expire ?? options.expireSeconds);\n  const headers = {\n    \"Cache-Control\": buildAppPageCacheControl(options.cacheState, revalidateSeconds, expireSeconds),\n    Vary: \"RSC, Accept\",\n    \"X-Vinext-Cache\": options.cacheState,\n  };\n\n  if (options.isRscRequest) {\n    if (!cachedValue.rscData) {\n      return null;\n    }\n\n    const rscHeaders: Record<string, string> = {\n      \"Content-Type\": \"text/x-component; charset=utf-8\",\n      ...headers,\n    };\n    if (options.mountedSlotsHeader) {\n      rscHeaders[\"X-Vinext-Mounted-Slots\"] = options.mountedSlotsHeader;\n    }\n\n    return new Response(cachedValue.rscData, {\n      status,\n      headers: rscHeaders,\n    });\n  }\n\n  if (typeof cachedValue.html !== \"string\" || cachedValue.html.length === 0) {\n    return null;\n  }\n\n  return new Response(cachedValue.html, {\n    status,\n    headers: {\n      \"Content-Type\": \"text/html; charset=utf-8\",\n      ...headers,\n    },\n  });\n}\n\nexport async function readAppPageCacheResponse(\n  options: ReadAppPageCacheResponseOptions,\n): Promise<Response | null> {\n  const isrKey = options.isRscRequest\n    ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader)\n    : options.isrHtmlKey(options.cleanPathname);\n\n  try {\n    const cached = await options.isrGet(isrKey);\n    const cachedValue = getCachedAppPageValue(cached);\n\n    if (cachedValue && !cached?.isStale) {\n      const hitResponse = buildAppPageCachedResponse(cachedValue, {\n        cacheState: \"HIT\",\n        cacheControl: cached?.value.cacheControl,\n        expireSeconds: options.expireSeconds,\n        isRscRequest: options.isRscRequest,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        revalidateSeconds: options.revalidateSeconds,\n      });\n\n      if (hitResponse) {\n        options.isrDebug?.(\n          options.isRscRequest ? \"HIT (RSC)\" : \"HIT (HTML)\",\n          options.cleanPathname,\n        );\n        options.clearRequestContext();\n        return hitResponse;\n      }\n\n      options.isrDebug?.(\"MISS (empty cached entry)\", options.cleanPathname);\n    }\n\n    if (cached?.isStale && cachedValue) {\n      // Preserve the legacy behavior from the inline generator: stale entries\n      // still trigger background regeneration even if this request cannot use\n      // the stale payload and will fall through to a fresh render.\n      // Dedup key is pathname-only: if multiple slot variants are stale\n      // concurrently, only one regen runs. Other variants refresh on\n      // their next STALE read.\n      options.scheduleBackgroundRegeneration(options.cleanPathname, async () => {\n        const revalidatedPage = await options.renderFreshPageForCache();\n        const revalidateSeconds =\n          revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;\n        const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;\n        const writes = [\n          options.isrSet(\n            options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader),\n            buildAppPageCacheValue(\"\", revalidatedPage.rscData, 200),\n            revalidateSeconds,\n            revalidatedPage.tags,\n            expireSeconds,\n          ),\n        ];\n\n        if (!options.isRscRequest) {\n          // HTML cache is slot-state-independent (canonical), so only refresh it\n          // during HTML-triggered regens. RSC-triggered regens only update the\n          // requesting client's RSC slot variant; a stale HTML cache entry will\n          // be regenerated independently by the next full-page HTML request.\n          writes.push(\n            options.isrSet(\n              options.isrHtmlKey(options.cleanPathname),\n              buildAppPageCacheValue(revalidatedPage.html, undefined, 200),\n              revalidateSeconds,\n              revalidatedPage.tags,\n              expireSeconds,\n            ),\n          );\n        }\n\n        await Promise.all(writes);\n        options.isrDebug?.(\"regen complete\", options.cleanPathname);\n      });\n\n      const staleResponse = buildAppPageCachedResponse(cachedValue, {\n        cacheState: \"STALE\",\n        cacheControl: cached.value.cacheControl,\n        expireSeconds: options.expireSeconds,\n        isRscRequest: options.isRscRequest,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        revalidateSeconds: options.revalidateSeconds,\n      });\n\n      if (staleResponse) {\n        options.isrDebug?.(\n          options.isRscRequest ? \"STALE (RSC)\" : \"STALE (HTML)\",\n          options.cleanPathname,\n        );\n        options.clearRequestContext();\n        return staleResponse;\n      }\n\n      options.isrDebug?.(\"STALE MISS (empty stale entry)\", options.cleanPathname);\n    }\n\n    if (!cached) {\n      options.isrDebug?.(\"MISS (no cache entry)\", options.cleanPathname);\n    }\n  } catch (isrReadError) {\n    console.error(\"[vinext] ISR cache read error:\", isrReadError);\n  }\n\n  return null;\n}\n\nexport function finalizeAppPageHtmlCacheResponse(\n  response: Response,\n  options: FinalizeAppPageHtmlCacheResponseOptions,\n): Response {\n  if (!response.body) {\n    return response;\n  }\n\n  const [streamForClient, streamForCache] = response.body.tee();\n  const htmlKey = options.isrHtmlKey(options.cleanPathname);\n  const rscKey = options.isrRscKey(options.cleanPathname, null);\n  const clientHeaders = new Headers(response.headers);\n  if (options.preserveClientResponseHeaders !== true) {\n    // HTML Server Components can access request APIs while the stream is being\n    // consumed. Until that late dynamic check finishes, downstream shared caches\n    // must not cache a response whose ISR policy was known before streaming.\n    clientHeaders.set(\"Cache-Control\", NO_STORE_CACHE_CONTROL);\n    clientHeaders.set(\"X-Vinext-Cache\", \"MISS\");\n  }\n\n  const cachePromise = (async () => {\n    try {\n      const reader = streamForCache.getReader();\n      const decoder = new TextDecoder();\n      const chunks: string[] = [];\n      for (;;) {\n        const { done, value } = await reader.read();\n        if (done) {\n          break;\n        }\n        chunks.push(decoder.decode(value, { stream: true }));\n      }\n      chunks.push(decoder.decode());\n\n      if (options.consumeDynamicUsage()) {\n        options.isrDebug?.(\"HTML cache write skipped (dynamic usage during render)\", htmlKey);\n        return;\n      }\n\n      const cachePolicy = resolveAppPageCacheWritePolicy({\n        expireSeconds: options.expireSeconds,\n        requestCacheLife: options.getRequestCacheLife?.(),\n        revalidateSeconds: options.revalidateSeconds,\n      });\n      if (!cachePolicy) {\n        options.isrDebug?.(\"HTML cache write skipped (no cache policy)\", htmlKey);\n        return;\n      }\n\n      const pageTags = options.getPageTags();\n      const writes = [\n        options.isrSet(\n          htmlKey,\n          buildAppPageCacheValue(chunks.join(\"\"), undefined, 200),\n          cachePolicy.revalidateSeconds,\n          pageTags,\n          cachePolicy.expireSeconds,\n        ),\n      ];\n\n      if (options.capturedRscDataPromise) {\n        writes.push(\n          options.capturedRscDataPromise.then((rscData) =>\n            options.isrSet(\n              rscKey,\n              buildAppPageCacheValue(\"\", rscData, 200),\n              cachePolicy.revalidateSeconds,\n              pageTags,\n              cachePolicy.expireSeconds,\n            ),\n          ),\n        );\n      }\n\n      await Promise.all(writes);\n      options.isrDebug?.(\"HTML cache written\", htmlKey);\n    } catch (cacheError) {\n      console.error(\"[vinext] ISR cache write error:\", cacheError);\n    }\n  })();\n\n  options.waitUntil?.(cachePromise);\n\n  return new Response(streamForClient, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: clientHeaders,\n  });\n}\n\nexport function finalizeAppPageRscCacheResponse(\n  response: Response,\n  options: ScheduleAppPageRscCacheWriteOptions,\n): Response {\n  const didSchedule = scheduleAppPageRscCacheWrite(options);\n  if (!didSchedule) {\n    return response;\n  }\n\n  if (options.preserveClientResponseHeaders === true) {\n    return response;\n  }\n\n  const clientHeaders = new Headers(response.headers);\n  // RSC payloads are also streamed lazily. Until the captured stream proves no\n  // late request API was used, the client-facing MISS response must not enter a\n  // shared cache when the ISR policy was known before streaming.\n  clientHeaders.set(\"Cache-Control\", NO_STORE_CACHE_CONTROL);\n  clientHeaders.set(\"X-Vinext-Cache\", \"MISS\");\n\n  return new Response(response.body, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: clientHeaders,\n  });\n}\n\nexport function scheduleAppPageRscCacheWrite(\n  options: ScheduleAppPageRscCacheWriteOptions,\n): boolean {\n  const capturedRscDataPromise = options.capturedRscDataPromise;\n  if (!capturedRscDataPromise || options.dynamicUsedDuringBuild) {\n    return false;\n  }\n\n  const rscKey = options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader);\n  const cachePromise = (async () => {\n    try {\n      const rscData = await capturedRscDataPromise;\n\n      // Two-phase dynamic detection:\n      // 1. dynamicUsedDuringBuild catches searchParams-driven opt-in before the\n      //    RSC response is sent.\n      // 2. consumeDynamicUsage() here catches APIs that fire while the RSC\n      //    stream is consumed (headers(), cookies(), noStore()).\n      if (options.consumeDynamicUsage()) {\n        options.isrDebug?.(\"RSC cache write skipped (dynamic usage during render)\", rscKey);\n        return;\n      }\n\n      const cachePolicy = resolveAppPageCacheWritePolicy({\n        expireSeconds: options.expireSeconds,\n        requestCacheLife: options.getRequestCacheLife?.(),\n        revalidateSeconds: options.revalidateSeconds,\n      });\n      if (!cachePolicy) {\n        options.isrDebug?.(\"RSC cache write skipped (no cache policy)\", rscKey);\n        return;\n      }\n\n      await options.isrSet(\n        rscKey,\n        buildAppPageCacheValue(\"\", rscData, 200),\n        cachePolicy.revalidateSeconds,\n        options.getPageTags(),\n        cachePolicy.expireSeconds,\n      );\n      options.isrDebug?.(\"RSC cache written\", rscKey);\n    } catch (cacheError) {\n      console.error(\"[vinext] ISR RSC cache write error:\", cacheError);\n    }\n  })();\n\n  options.waitUntil?.(cachePromise);\n  return true;\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-cache.js","names":[],"sources":["../../src/server/app-page-cache.ts"],"sourcesContent":["import type { CachedAppPageValue, CacheControlMetadata } from \"vinext/shims/cache\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\nimport { buildCachedRevalidateCacheControl } from \"./cache-control.js\";\nimport { buildAppPageCacheValue, type ISRCacheEntry } from \"./isr-cache.js\";\nimport { readStreamAsText } from \"../utils/text-stream.js\";\n\ntype AppPageDebugLogger = (event: string, detail: string) => void;\ntype AppPageCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype AppPageCacheSetter = (\n  key: string,\n  data: CachedAppPageValue,\n  revalidateSeconds: number,\n  tags: string[],\n  expireSeconds?: number,\n) => Promise<void>;\ntype AppPageBackgroundRegenerator = (key: string, renderFn: () => Promise<void>) => void;\ntype AppPageRequestCacheLife = {\n  revalidate?: number;\n  expire?: number;\n};\n\ntype AppPageCacheRenderResult = {\n  cacheControl?: CacheControlMetadata;\n  html: string;\n  rscData: ArrayBuffer;\n  tags: string[];\n};\n\ntype BuildAppPageCachedResponseOptions = {\n  cacheControl?: CacheControlMetadata;\n  cacheState: \"HIT\" | \"STALE\";\n  expireSeconds?: number;\n  isRscRequest: boolean;\n  mountedSlotsHeader?: string | null;\n  revalidateSeconds: number;\n};\n\ntype ReadAppPageCacheResponseOptions = {\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  isRscRequest: boolean;\n  isrDebug?: AppPageDebugLogger;\n  isrGet: AppPageCacheGetter;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;\n  isrSet: AppPageCacheSetter;\n  mountedSlotsHeader?: string | null;\n  expireSeconds?: number;\n  revalidateSeconds: number;\n  renderFreshPageForCache: () => Promise<AppPageCacheRenderResult>;\n  scheduleBackgroundRegeneration: AppPageBackgroundRegenerator;\n};\n\ntype FinalizeAppPageHtmlCacheResponseOptions = {\n  capturedDynamicUsageBeforeContextCleanup?: () => boolean;\n  capturedRscDataPromise: Promise<ArrayBuffer> | null;\n  cleanPathname: string;\n  consumeDynamicUsage: () => boolean;\n  getPageTags: () => string[];\n  getRequestCacheLife?: () => AppPageRequestCacheLife | null;\n  isrDebug?: AppPageDebugLogger;\n  isrHtmlKey: (pathname: string) => string;\n  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;\n  isrSet: AppPageCacheSetter;\n  preserveClientResponseHeaders?: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  waitUntil?: (promise: Promise<void>) => void;\n};\n\ntype ScheduleAppPageRscCacheWriteOptions = {\n  capturedRscDataPromise: Promise<ArrayBuffer> | null;\n  cleanPathname: string;\n  consumeDynamicUsage: () => boolean;\n  dynamicUsedDuringBuild: boolean;\n  getPageTags: () => string[];\n  getRequestCacheLife?: () => AppPageRequestCacheLife | null;\n  isrDebug?: AppPageDebugLogger;\n  isrRscKey: (pathname: string, mountedSlotsHeader?: string | null) => string;\n  isrSet: AppPageCacheSetter;\n  mountedSlotsHeader?: string | null;\n  preserveClientResponseHeaders?: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  waitUntil?: (promise: Promise<void>) => void;\n};\n\nconst NO_STORE_CACHE_CONTROL = \"no-store, must-revalidate\";\n\nexport function buildAppPageCacheTags(pathname: string, extraTags: readonly string[]): string[] {\n  const tags = [pathname, `_N_T_${pathname}`, \"_N_T_/layout\"];\n  const segments = pathname.split(\"/\");\n  let built = \"\";\n  for (let index = 1; index < segments.length; index++) {\n    const segment = segments[index];\n    if (segment) {\n      built += `/${segment}`;\n      tags.push(`_N_T_${built}/layout`);\n    }\n  }\n\n  tags.push(`_N_T_${built}/page`);\n  for (const tag of extraTags) {\n    if (!tags.includes(tag)) {\n      tags.push(tag);\n    }\n  }\n  return tags;\n}\n\nfunction buildAppPageCacheControl(\n  cacheState: BuildAppPageCachedResponseOptions[\"cacheState\"],\n  revalidateSeconds: number,\n  expireSeconds?: number,\n): string {\n  return buildCachedRevalidateCacheControl(cacheState, revalidateSeconds, expireSeconds);\n}\n\nfunction getCachedAppPageValue(entry: ISRCacheEntry | null): CachedAppPageValue | null {\n  return entry?.value.value && entry.value.value.kind === \"APP_PAGE\" ? entry.value.value : null;\n}\n\nfunction resolveAppPageCacheWritePolicy(options: {\n  expireSeconds?: number;\n  requestCacheLife?: AppPageRequestCacheLife | null;\n  revalidateSeconds: number | null;\n}): { expireSeconds?: number; revalidateSeconds: number } | null {\n  let revalidateSeconds = options.revalidateSeconds;\n  let expireSeconds = options.expireSeconds;\n  const requestCacheLife = options.requestCacheLife;\n\n  if (requestCacheLife?.revalidate !== undefined) {\n    revalidateSeconds =\n      revalidateSeconds === null\n        ? requestCacheLife.revalidate\n        : Math.min(revalidateSeconds, requestCacheLife.revalidate);\n  }\n  if (requestCacheLife?.expire !== undefined) {\n    expireSeconds = requestCacheLife.expire;\n  }\n\n  if (revalidateSeconds === null || revalidateSeconds <= 0 || !Number.isFinite(revalidateSeconds)) {\n    return null;\n  }\n\n  return { expireSeconds, revalidateSeconds };\n}\n\nexport function buildAppPageCachedResponse(\n  cachedValue: CachedAppPageValue,\n  options: BuildAppPageCachedResponseOptions,\n): Response | null {\n  // Preserve the legacy fallback semantics from the generated entry: invalid\n  // falsy statuses still fall back to 200 rather than being forwarded through.\n  const status = cachedValue.status || 200;\n  const revalidateSeconds = options.cacheControl?.revalidate ?? options.revalidateSeconds;\n  const expireSeconds =\n    options.cacheControl === undefined\n      ? undefined\n      : (options.cacheControl.expire ?? options.expireSeconds);\n  const headers = {\n    \"Cache-Control\": buildAppPageCacheControl(options.cacheState, revalidateSeconds, expireSeconds),\n    Vary: VINEXT_RSC_VARY_HEADER,\n    \"X-Vinext-Cache\": options.cacheState,\n  };\n\n  if (options.isRscRequest) {\n    if (!cachedValue.rscData) {\n      return null;\n    }\n\n    const rscHeaders: Record<string, string> = {\n      \"Content-Type\": \"text/x-component; charset=utf-8\",\n      ...headers,\n    };\n    if (options.mountedSlotsHeader) {\n      rscHeaders[\"X-Vinext-Mounted-Slots\"] = options.mountedSlotsHeader;\n    }\n\n    return new Response(cachedValue.rscData, {\n      status,\n      headers: rscHeaders,\n    });\n  }\n\n  if (typeof cachedValue.html !== \"string\" || cachedValue.html.length === 0) {\n    return null;\n  }\n\n  return new Response(cachedValue.html, {\n    status,\n    headers: {\n      \"Content-Type\": \"text/html; charset=utf-8\",\n      ...headers,\n    },\n  });\n}\n\nexport async function readAppPageCacheResponse(\n  options: ReadAppPageCacheResponseOptions,\n): Promise<Response | null> {\n  const isrKey = options.isRscRequest\n    ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader)\n    : options.isrHtmlKey(options.cleanPathname);\n\n  try {\n    const cached = await options.isrGet(isrKey);\n    const cachedValue = getCachedAppPageValue(cached);\n\n    if (cachedValue && !cached?.isStale) {\n      const hitResponse = buildAppPageCachedResponse(cachedValue, {\n        cacheState: \"HIT\",\n        cacheControl: cached?.value.cacheControl,\n        expireSeconds: options.expireSeconds,\n        isRscRequest: options.isRscRequest,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        revalidateSeconds: options.revalidateSeconds,\n      });\n\n      if (hitResponse) {\n        options.isrDebug?.(\n          options.isRscRequest ? \"HIT (RSC)\" : \"HIT (HTML)\",\n          options.cleanPathname,\n        );\n        options.clearRequestContext();\n        return hitResponse;\n      }\n\n      options.isrDebug?.(\"MISS (empty cached entry)\", options.cleanPathname);\n    }\n\n    if (cached?.isStale && cachedValue) {\n      const regenerationKey = options.isRscRequest\n        ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader)\n        : options.isrHtmlKey(options.cleanPathname);\n\n      // Preserve the legacy behavior from the inline generator: stale entries\n      // still trigger background regeneration even if this request cannot use\n      // the stale payload and will fall through to a fresh render.\n      options.scheduleBackgroundRegeneration(regenerationKey, async () => {\n        const revalidatedPage = await options.renderFreshPageForCache();\n        const revalidateSeconds =\n          revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;\n        const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;\n        const writes = [\n          options.isrSet(\n            options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader),\n            buildAppPageCacheValue(\"\", revalidatedPage.rscData, 200),\n            revalidateSeconds,\n            revalidatedPage.tags,\n            expireSeconds,\n          ),\n        ];\n\n        if (!options.isRscRequest) {\n          // HTML cache is slot-state-independent (canonical), so only refresh it\n          // during HTML-triggered regens. RSC-triggered regens only update the\n          // requesting client's RSC slot variant; a stale HTML cache entry will\n          // be regenerated independently by the next full-page HTML request.\n          writes.push(\n            options.isrSet(\n              options.isrHtmlKey(options.cleanPathname),\n              buildAppPageCacheValue(revalidatedPage.html, undefined, 200),\n              revalidateSeconds,\n              revalidatedPage.tags,\n              expireSeconds,\n            ),\n          );\n        }\n\n        await Promise.all(writes);\n        options.isrDebug?.(\"regen complete\", options.cleanPathname);\n      });\n\n      const staleResponse = buildAppPageCachedResponse(cachedValue, {\n        cacheState: \"STALE\",\n        cacheControl: cached.value.cacheControl,\n        expireSeconds: options.expireSeconds,\n        isRscRequest: options.isRscRequest,\n        mountedSlotsHeader: options.mountedSlotsHeader,\n        revalidateSeconds: options.revalidateSeconds,\n      });\n\n      if (staleResponse) {\n        options.isrDebug?.(\n          options.isRscRequest ? \"STALE (RSC)\" : \"STALE (HTML)\",\n          options.cleanPathname,\n        );\n        options.clearRequestContext();\n        return staleResponse;\n      }\n\n      options.isrDebug?.(\"STALE MISS (empty stale entry)\", options.cleanPathname);\n    }\n\n    if (!cached) {\n      options.isrDebug?.(\"MISS (no cache entry)\", options.cleanPathname);\n    }\n  } catch (isrReadError) {\n    console.error(\"[vinext] ISR cache read error:\", isrReadError);\n  }\n\n  return null;\n}\n\nexport function finalizeAppPageHtmlCacheResponse(\n  response: Response,\n  options: FinalizeAppPageHtmlCacheResponseOptions,\n): Response {\n  if (!response.body) {\n    return response;\n  }\n\n  const [streamForClient, streamForCache] = response.body.tee();\n  const htmlKey = options.isrHtmlKey(options.cleanPathname);\n  const rscKey = options.isrRscKey(options.cleanPathname, null);\n  const clientHeaders = new Headers(response.headers);\n  if (options.preserveClientResponseHeaders !== true) {\n    // HTML Server Components can access request APIs while the stream is being\n    // consumed. Until that late dynamic check finishes, downstream shared caches\n    // must not cache a response whose ISR policy was known before streaming.\n    clientHeaders.set(\"Cache-Control\", NO_STORE_CACHE_CONTROL);\n    clientHeaders.set(\"X-Vinext-Cache\", \"MISS\");\n  }\n\n  const cachePromise = (async () => {\n    try {\n      const cachedHtml = await readStreamAsText(streamForCache);\n\n      if (\n        options.capturedDynamicUsageBeforeContextCleanup?.() === true ||\n        options.consumeDynamicUsage()\n      ) {\n        options.isrDebug?.(\"HTML cache write skipped (dynamic usage during render)\", htmlKey);\n        return;\n      }\n\n      const cachePolicy = resolveAppPageCacheWritePolicy({\n        expireSeconds: options.expireSeconds,\n        requestCacheLife: options.getRequestCacheLife?.(),\n        revalidateSeconds: options.revalidateSeconds,\n      });\n      if (!cachePolicy) {\n        options.isrDebug?.(\"HTML cache write skipped (no cache policy)\", htmlKey);\n        return;\n      }\n\n      const pageTags = options.getPageTags();\n      const writes = [\n        options.isrSet(\n          htmlKey,\n          buildAppPageCacheValue(cachedHtml, undefined, 200),\n          cachePolicy.revalidateSeconds,\n          pageTags,\n          cachePolicy.expireSeconds,\n        ),\n      ];\n\n      if (options.capturedRscDataPromise) {\n        writes.push(\n          options.capturedRscDataPromise.then((rscData) =>\n            options.isrSet(\n              rscKey,\n              buildAppPageCacheValue(\"\", rscData, 200),\n              cachePolicy.revalidateSeconds,\n              pageTags,\n              cachePolicy.expireSeconds,\n            ),\n          ),\n        );\n      }\n\n      await Promise.all(writes);\n      options.isrDebug?.(\"HTML cache written\", htmlKey);\n    } catch (cacheError) {\n      console.error(\"[vinext] ISR cache write error:\", cacheError);\n    }\n  })();\n\n  options.waitUntil?.(cachePromise);\n\n  return new Response(streamForClient, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: clientHeaders,\n  });\n}\n\nexport function finalizeAppPageRscCacheResponse(\n  response: Response,\n  options: ScheduleAppPageRscCacheWriteOptions,\n): Response {\n  const didSchedule = scheduleAppPageRscCacheWrite(options);\n  if (!didSchedule) {\n    return response;\n  }\n\n  if (options.preserveClientResponseHeaders === true) {\n    return response;\n  }\n\n  const clientHeaders = new Headers(response.headers);\n  // RSC payloads are also streamed lazily. Until the captured stream proves no\n  // late request API was used, the client-facing MISS response must not enter a\n  // shared cache when the ISR policy was known before streaming.\n  clientHeaders.set(\"Cache-Control\", NO_STORE_CACHE_CONTROL);\n  clientHeaders.set(\"X-Vinext-Cache\", \"MISS\");\n\n  return new Response(response.body, {\n    status: response.status,\n    statusText: response.statusText,\n    headers: clientHeaders,\n  });\n}\n\nexport function scheduleAppPageRscCacheWrite(\n  options: ScheduleAppPageRscCacheWriteOptions,\n): boolean {\n  const capturedRscDataPromise = options.capturedRscDataPromise;\n  if (!capturedRscDataPromise || options.dynamicUsedDuringBuild) {\n    return false;\n  }\n\n  const rscKey = options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader);\n  const cachePromise = (async () => {\n    try {\n      const rscData = await capturedRscDataPromise;\n\n      // Two-phase dynamic detection:\n      // 1. dynamicUsedDuringBuild catches searchParams-driven opt-in before the\n      //    RSC response is sent.\n      // 2. consumeDynamicUsage() here catches APIs that fire while the RSC\n      //    stream is consumed (headers(), cookies(), noStore()).\n      if (options.consumeDynamicUsage()) {\n        options.isrDebug?.(\"RSC cache write skipped (dynamic usage during render)\", rscKey);\n        return;\n      }\n\n      const cachePolicy = resolveAppPageCacheWritePolicy({\n        expireSeconds: options.expireSeconds,\n        requestCacheLife: options.getRequestCacheLife?.(),\n        revalidateSeconds: options.revalidateSeconds,\n      });\n      if (!cachePolicy) {\n        options.isrDebug?.(\"RSC cache write skipped (no cache policy)\", rscKey);\n        return;\n      }\n\n      await options.isrSet(\n        rscKey,\n        buildAppPageCacheValue(\"\", rscData, 200),\n        cachePolicy.revalidateSeconds,\n        options.getPageTags(),\n        cachePolicy.expireSeconds,\n      );\n      options.isrDebug?.(\"RSC cache written\", rscKey);\n    } catch (cacheError) {\n      console.error(\"[vinext] ISR RSC cache write error:\", cacheError);\n    }\n  })();\n\n  options.waitUntil?.(cachePromise);\n  return true;\n}\n"],"mappings":"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"}

package/dist/server/app-page-dispatch.d.ts

@@ -1,6 +1,6 @@
 import { ClassificationReason } from "../build/layout-classification-types.js";
 import { CachedAppPageValue } from "../shims/cache.js";
-import { AppOutgoingElements } from "./app-elements.js";
+import { AppOutgoingElements } from "./app-elements-wire.js";
 import { AppPageFontPreload, LayoutClassificationOptions } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
@@ -57,6 +57,7 @@ type AppPageDispatchRoute = {
   unauthorizeds?: readonly (AppPageModule | null | undefined)[];
 };
 type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
+  /** Configured basePath (e.g. "/blog"). Used to prefix redirect Locations. */basePath?: string;
   buildPageElement: (route: TRoute, params: AppPageParams, opts: AppPageDispatchInterceptOptions | undefined, searchParams: URLSearchParams) => Promise<AppPageElement>;
   cleanPathname: string;
   clearRequestContext: () => void;

package/dist/server/app-page-dispatch.js

@@ -1,15 +1,20 @@
 import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getDraftModeCookieHeader, markDynamicUsage, setHeadersContext } from "../shims/headers.js";
+import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getAndClearPendingCookies, getDraftModeCookieHeader, markDynamicUsage, setHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife, _peekRequestScopedCacheLife } from "../shims/cache.js";
 import { ensureFetchPatch, getCollectedFetchTags, setCurrentFetchCacheMode, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
+import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { createAppPageTreePath } from "./app-page-route-wiring.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { resolveAppPageParentHttpAccessBoundaryModule } from "./app-page-boundary.js";
+import { readStreamAsText } from "../utils/text-stream.js";
 import { readAppPageCacheResponse } from "./app-page-cache.js";
-import { buildAppPageSpecialErrorResponse, readAppPageTextStream, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
+import { buildAppPageSpecialErrorResponse, resolveAppPageSpecialError, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
 import { resolveAppPageMethodResponse } from "./app-page-method.js";
 import { buildAppPageElement, resolveAppPageIntercept, validateAppPageDynamicParams } from "./app-page-request.js";
+import "./app-page-response.js";
 import { renderAppPageLifecycle } from "./app-page-render.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
@@ -124,7 +129,7 @@ async function dispatchAppPage(options) {
 				const revalidatedRscCapture = teeAppPageRscStreamForCapture(options.renderToReadableStream(revalidatedElement, { onError: revalidatedOnError }), true);
 				const revalidatedSsrEntry = await options.loadSsrHandler();
 				const revalidatedCapturedRscRef = { value: null };
-				const html = await readAppPageTextStream(await revalidatedSsrEntry.handleSsr(revalidatedRscCapture.ssrStream, options.getNavigationContext(), {
+				const html = await readStreamAsText(await revalidatedSsrEntry.handleSsr(revalidatedRscCapture.ssrStream, options.getNavigationContext(), {
 					links: options.getFontLinks(),
 					styles: options.getFontStyles(),
 					preloads: options.getFontPreloads()
@@ -160,9 +165,6 @@ async function dispatchAppPage(options) {
 		enforceStaticParamsOnly: options.dynamicParamsConfig === false,
 		generateStaticParams: options.generateStaticParams,
 		isDynamicRoute: route.isDynamic,
-		logGenerateStaticParamsError(error) {
-			console.error("[vinext] generateStaticParams error:", error);
-		},
 		params: options.params
 	});
 	if (dynamicParamsResponse) return dynamicParamsResponse;
@@ -188,7 +190,7 @@ async function dispatchAppPage(options) {
 			const interceptStream = options.renderToReadableStream(interceptElement, { onError: interceptOnError });
 			const interceptHeaders = new Headers({
 				"Content-Type": "text/x-component; charset=utf-8",
-				Vary: "RSC, Accept"
+				Vary: VINEXT_RSC_VARY_HEADER
 			});
 			mergeMiddlewareResponseHeaders(interceptHeaders, options.middlewareContext.headers);
 			return new Response(interceptStream, {
@@ -265,7 +267,7 @@ async function dispatchAppPage(options) {
 		classification: {
 			getLayoutId(index) {
 				const treePosition = route.layoutTreePositions?.[index] ?? 0;
-				return "layout:" + createAppPageTreePath([...route.routeSegments], treePosition);
+				return AppElementsWire.encodeLayoutId(createAppPageTreePath([...route.routeSegments], treePosition));
 			},
 			buildTimeClassifications: route.__buildTimeClassifications,
 			buildTimeReasons: route.__buildTimeReasons,
@@ -308,7 +310,10 @@ async function dispatchAppPage(options) {
 }
 async function renderLayoutSpecialError(options, specialError, layoutIndex) {
 	return buildAppPageSpecialErrorResponse({
+		basePath: options.basePath,
 		clearRequestContext: options.clearRequestContext,
+		getAndClearPendingCookies,
+		isRscRequest: options.isRscRequest,
 		middlewareContext: options.middlewareContext,
 		renderFallbackPage(statusCode) {
 			const parentBoundary = resolveAppPageParentHttpAccessBoundaryModule({
@@ -327,18 +332,21 @@ async function renderLayoutSpecialError(options, specialError, layoutIndex) {
 				matchedParams: options.params
 			}, null);
 		},
-		requestUrl: options.request.url,
+		request: options.request,
 		specialError
 	});
 }
 async function renderPageSpecialError(options, specialError) {
 	return buildAppPageSpecialErrorResponse({
+		basePath: options.basePath,
 		clearRequestContext: options.clearRequestContext,
+		getAndClearPendingCookies,
+		isRscRequest: options.isRscRequest,
 		middlewareContext: options.middlewareContext,
 		renderFallbackPage(statusCode) {
 			return options.renderHttpAccessFallbackPage(statusCode, { matchedParams: options.params }, null);
 		},
-		requestUrl: options.request.url,
+		request: options.request,
 		specialError
 	});
 }