vinext 1.0.0-beta.9 → 1.0.0

package/dist/server/client-reuse-manifest.d.ts

@@ -1,8 +1,8 @@
 import { ArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 //#region src/server/client-reuse-manifest.d.ts
-declare const CLIENT_REUSE_MANIFEST_SCHEMA_VERSION = 1;
+export declare const CLIENT_REUSE_MANIFEST_SCHEMA_VERSION = 1;
 type ClientReuseManifestSchemaVersion = 1;
-declare const CLIENT_REUSE_MANIFEST_HASH_ALGORITHM = "fnv1a64";
+export declare const CLIENT_REUSE_MANIFEST_HASH_ALGORITHM = "fnv1a64";
 type ClientReuseManifestHashAlgorithm = typeof CLIENT_REUSE_MANIFEST_HASH_ALGORITHM;
 type ClientReuseManifestLimits = Readonly<{
   maxEntryCount: number;
@@ -11,21 +11,21 @@ type ClientReuseManifestLimits = Readonly<{
   maxPayloadHashLength: number;
   maxVariantCacheKeyLength: number;
 }>;
-declare const DEFAULT_CLIENT_REUSE_MANIFEST_LIMITS: {
+export declare const DEFAULT_CLIENT_REUSE_MANIFEST_LIMITS: {
   maxEntryCount: number;
   maxEntryIdLength: number;
   maxManifestBytes: number;
   maxPayloadHashLength: number;
   maxVariantCacheKeyLength: number;
 };
-declare const CLIENT_REUSE_MANIFEST_SKIP_VERIFICATION_ENTRY_BUDGET = 8;
+export declare const CLIENT_REUSE_MANIFEST_SKIP_VERIFICATION_ENTRY_BUDGET = 8;
 type ClientReuseManifestEntryKind = "layout" | "page" | "route" | "slot" | "template";
 type ClientReuseManifestEntryPrivacy = "private" | "public";
 type ClientReuseManifestReplayWindow = Readonly<{
   validFromVisibleCommitVersion: number;
   validUntilVisibleCommitVersion: number;
 }>;
-type ClientReuseManifestEntry = Readonly<{
+export type ClientReuseManifestEntry = Readonly<{
   artifactCompatibility: ArtifactCompatibilityEnvelope;
   id: string;
   kind: ClientReuseManifestEntryKind;
@@ -59,17 +59,17 @@ type CreateClientReuseManifestInput = Readonly<{
   replayWindow?: ClientReuseManifestReplayWindow;
   visibleCommitVersion: number;
 }>;
-type ClientReuseManifestRejectionCode = "SKIP_CACHE_ARTIFACT_COMPATIBILITY_INCOMPATIBLE" | "SKIP_CACHE_ARTIFACT_COMPATIBILITY_UNKNOWN" | "SKIP_CACHE_ARTIFACT_PROOF_MISMATCH" | "SKIP_CACHE_ENTRY_ID_MISMATCH" | "SKIP_CACHE_INVALIDATED" | "SKIP_CACHE_INVALIDATION_UNKNOWN" | "SKIP_CACHE_PAYLOAD_HASH_MISMATCH" | "SKIP_CACHE_PAYLOAD_HASH_MISSING" | "SKIP_CACHE_PROOF_MISSING" | "SKIP_CACHE_PROOF_REJECTED" | "SKIP_CACHE_REUSE_CLASS_UNSUPPORTED" | "SKIP_CACHE_VARIANT_MISMATCH" | "SKIP_LAYOUT_CACHE_LIFE_OBSERVED" | "SKIP_LAYOUT_CACHE_TAGS_OBSERVED" | "SKIP_LAYOUT_CACHEABLE_FETCHES_OBSERVED" | "SKIP_LAYOUT_DYNAMIC_FETCHES_OBSERVED" | "SKIP_LAYOUT_DYNAMIC_USAGE_OBSERVED" | "SKIP_LAYOUT_PARAMS_OBSERVED" | "SKIP_LAYOUT_PARAMS_OBSERVATION_INCOMPLETE" | "SKIP_LAYOUT_PARAMS_PRESENT" | "SKIP_LAYOUT_REVALIDATE_PRESENT" | "SKIP_LAYOUT_REQUEST_API_OBSERVED" | "SKIP_LAYOUT_UNSTABLE_CACHE_OBSERVED" | "SKIP_ARTIFACT_COMPATIBILITY_INVALID" | "SKIP_ENTRY_COUNT_EXCEEDED" | "SKIP_VERIFICATION_BUDGET_EXCEEDED" | "SKIP_ENTRY_HASH_INVALID" | "SKIP_ENTRY_ID_INVALID" | "SKIP_ENTRY_ID_TOO_LONG" | "SKIP_ENTRY_MALFORMED" | "SKIP_ENTRY_ORDER_NON_CANONICAL" | "SKIP_HASH_ALGORITHM_UNSUPPORTED" | "SKIP_MANIFEST_MALFORMED" | "SKIP_MANIFEST_SCHEMA_UNSUPPORTED" | "SKIP_MANIFEST_TOO_LARGE" | "SKIP_PRIVATE_ENTRY" | "SKIP_REPLAY_WINDOW_INVALID" | "SKIP_UNKNOWN_ENTRY" | "SKIP_VARIANT_CACHE_KEY_INVALID" | "SKIP_VARIANT_CACHE_KEY_TOO_LONG" | "SKIP_VISIBLE_COMMIT_VERSION_INVALID" | "SKIP_VISIBLE_COMMIT_VERSION_MISMATCH";
+export type ClientReuseManifestRejectionCode = "SKIP_CACHE_ARTIFACT_COMPATIBILITY_INCOMPATIBLE" | "SKIP_CACHE_ARTIFACT_COMPATIBILITY_UNKNOWN" | "SKIP_CACHE_ARTIFACT_PROOF_MISMATCH" | "SKIP_CACHE_ENTRY_ID_MISMATCH" | "SKIP_CACHE_INVALIDATED" | "SKIP_CACHE_INVALIDATION_UNKNOWN" | "SKIP_CACHE_PAYLOAD_HASH_MISMATCH" | "SKIP_CACHE_PAYLOAD_HASH_MISSING" | "SKIP_CACHE_PROOF_MISSING" | "SKIP_CACHE_PROOF_REJECTED" | "SKIP_CACHE_REUSE_CLASS_UNSUPPORTED" | "SKIP_CACHE_VARIANT_MISMATCH" | "SKIP_LAYOUT_CACHE_LIFE_OBSERVED" | "SKIP_LAYOUT_CACHE_TAGS_OBSERVED" | "SKIP_LAYOUT_CACHEABLE_FETCHES_OBSERVED" | "SKIP_LAYOUT_DYNAMIC_FETCHES_OBSERVED" | "SKIP_LAYOUT_DYNAMIC_USAGE_OBSERVED" | "SKIP_LAYOUT_PARAMS_OBSERVED" | "SKIP_LAYOUT_PARAMS_OBSERVATION_INCOMPLETE" | "SKIP_LAYOUT_PARAMS_PRESENT" | "SKIP_LAYOUT_REVALIDATE_PRESENT" | "SKIP_LAYOUT_REQUEST_API_OBSERVED" | "SKIP_LAYOUT_UNSTABLE_CACHE_OBSERVED" | "SKIP_ARTIFACT_COMPATIBILITY_INVALID" | "SKIP_ENTRY_COUNT_EXCEEDED" | "SKIP_VERIFICATION_BUDGET_EXCEEDED" | "SKIP_ENTRY_HASH_INVALID" | "SKIP_ENTRY_ID_INVALID" | "SKIP_ENTRY_ID_TOO_LONG" | "SKIP_ENTRY_MALFORMED" | "SKIP_ENTRY_ORDER_NON_CANONICAL" | "SKIP_HASH_ALGORITHM_UNSUPPORTED" | "SKIP_MANIFEST_MALFORMED" | "SKIP_MANIFEST_SCHEMA_UNSUPPORTED" | "SKIP_MANIFEST_TOO_LARGE" | "SKIP_PRIVATE_ENTRY" | "SKIP_REPLAY_WINDOW_INVALID" | "SKIP_UNKNOWN_ENTRY" | "SKIP_VARIANT_CACHE_KEY_INVALID" | "SKIP_VARIANT_CACHE_KEY_TOO_LONG" | "SKIP_VISIBLE_COMMIT_VERSION_INVALID" | "SKIP_VISIBLE_COMMIT_VERSION_MISMATCH";
 type ClientReuseManifestTraceFieldValue = string | number | boolean | null | readonly string[];
-type ClientReuseManifestTraceFields = Readonly<Record<string, ClientReuseManifestTraceFieldValue>>;
-type ClientReuseManifestRejection = Readonly<{
+export type ClientReuseManifestTraceFields = Readonly<Record<string, ClientReuseManifestTraceFieldValue>>;
+export type ClientReuseManifestRejection = Readonly<{
   code: ClientReuseManifestRejectionCode;
   fields: ClientReuseManifestTraceFields;
 }>;
-type ClientReuseManifestEntryRejection = ClientReuseManifestRejection & Readonly<{
+export type ClientReuseManifestEntryRejection = ClientReuseManifestRejection & Readonly<{
   entryId: string | null;
 }>;
-type ClientReuseManifestSkipDisposition = Readonly<{
+export type ClientReuseManifestSkipDisposition = Readonly<{
   code: "SKIP_MODEL_DISABLED";
   enabled: false;
   mode: "renderAndSend";
@@ -79,7 +79,7 @@ type ClientReuseManifestSkipDisposition = Readonly<{
   mode: "skipStaticLayout";
   skippedEntryIds: readonly string[];
 }>;
-type ClientReuseManifestParseResult = Readonly<{
+export type ClientReuseManifestParseResult = Readonly<{
   kind: "absent";
 }> | Readonly<{
   kind: "rejected";
@@ -94,10 +94,9 @@ type ParseClientReuseManifestOptions = Readonly<{
   currentVisibleCommitVersion?: number;
   limits?: ClientReuseManifestLimits;
 }>;
-declare function countUtf8Bytes(input: string): number;
-declare function createClientReusePayloadHash(input: string): string;
-declare function createClientReuseManifest(input: CreateClientReuseManifestInput): ClientReuseManifestWire;
-declare function serializeClientReuseManifest(input: CreateClientReuseManifestInput): string;
-declare function parseClientReuseManifestHeader(rawHeader: string | null | undefined, options?: ParseClientReuseManifestOptions): ClientReuseManifestParseResult;
-//#endregion
-export { CLIENT_REUSE_MANIFEST_HASH_ALGORITHM, CLIENT_REUSE_MANIFEST_SCHEMA_VERSION, CLIENT_REUSE_MANIFEST_SKIP_VERIFICATION_ENTRY_BUDGET, ClientReuseManifestEntry, ClientReuseManifestEntryRejection, ClientReuseManifestParseResult, ClientReuseManifestRejection, ClientReuseManifestRejectionCode, ClientReuseManifestSkipDisposition, ClientReuseManifestTraceFields, DEFAULT_CLIENT_REUSE_MANIFEST_LIMITS, countUtf8Bytes, createClientReuseManifest, createClientReusePayloadHash, parseClientReuseManifestHeader, serializeClientReuseManifest };
+export declare function countUtf8Bytes(input: string): number;
+export declare function createClientReusePayloadHash(input: string): string;
+export declare function createClientReuseManifest(input: CreateClientReuseManifestInput): ClientReuseManifestWire;
+export declare function serializeClientReuseManifest(input: CreateClientReuseManifestInput): string;
+export declare function parseClientReuseManifestHeader(rawHeader: string | null | undefined, options?: ParseClientReuseManifestOptions): ClientReuseManifestParseResult;
+//#endregion

package/dist/server/client-reuse-manifest.js

@@ -1,7 +1,7 @@
 import { isUnknownRecord } from "../utils/record.js";
 import { fnv1a64 } from "../utils/hash.js";
+import { parseAppElementsWireElementKey } from "./app-elements-wire-key.js";
 import { parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
-import { AppElementsWire } from "./app-elements-wire.js";
 import { isNonNegativeSafeInteger } from "../utils/number.js";
 //#region src/server/client-reuse-manifest.ts
 const CLIENT_REUSE_MANIFEST_SCHEMA_VERSION = 1;
@@ -76,7 +76,7 @@ function currentCommitVersionMatchesReplayWindow(currentVisibleCommitVersion, re
 	return currentVisibleCommitVersion >= replayWindow.validFromVisibleCommitVersion && currentVisibleCommitVersion <= replayWindow.validUntilVisibleCommitVersion;
 }
 function parseEntryKind(id) {
-	const parsed = AppElementsWire.parseElementKey(id);
+	const parsed = parseAppElementsWireElementKey(id);
 	if (parsed === null) return null;
 	return parsed.kind;
 }

package/dist/server/client-trace-metadata.d.ts

@@ -1,5 +1,5 @@
 //#region src/server/client-trace-metadata.d.ts
-type ClientTraceDataEntry = {
+export type ClientTraceDataEntry = {
   key: string;
   value: string;
 };
@@ -8,13 +8,17 @@ type ClientTraceDataEntry = {
  * Returns `undefined` when the allow-list is unset so callers can skip
  * rendering altogether.
  */
-declare function filterClientTraceMetadata(entries: readonly ClientTraceDataEntry[], allowList: readonly string[] | undefined): ClientTraceDataEntry[] | undefined;
+export declare function filterClientTraceMetadata(entries: readonly ClientTraceDataEntry[], allowList: readonly string[] | undefined): ClientTraceDataEntry[] | undefined;
 /**
  * Render the filtered entries as a sequence of self-closing `<meta>` tags.
  * Names and values are HTML-attribute escaped. Returns an empty string when
  * `entries` is empty or undefined so callers can append unconditionally.
  */
-declare function renderClientTraceMetadataTags(entries: readonly ClientTraceDataEntry[] | undefined): string;
+export declare function renderClientTraceMetadataTags(entries: readonly ClientTraceDataEntry[] | undefined): string;
+/** Mark only vinext-injected trace metadata for removal from a shared cache copy. */
+export declare function markClientTraceMetadataBlock(html: string, marker: string | undefined): string;
+/** Remove the trace metadata block carrying this render's private marker. */
+export declare function stripClientTraceMetadataBlock(html: string, marker: string | undefined): string;
 /**
  * Convenience helper: read OTel propagation data, filter against the
  * configured allow-list, and render the resulting `<meta>` tags. Returns an
@@ -25,6 +29,5 @@ declare function renderClientTraceMetadataTags(entries: readonly ClientTraceData
  * configured/active this is a few `try/catch`-bounded operations and returns
  * `""`.
  */
-declare function getClientTraceMetadataHTML(allowList: readonly string[] | undefined): string;
-//#endregion
-export { ClientTraceDataEntry, filterClientTraceMetadata, getClientTraceMetadataHTML, renderClientTraceMetadataTags };
+export declare function getClientTraceMetadataHTML(allowList: readonly string[] | undefined, isStaticGeneration?: boolean): string;
+//#endregion

package/dist/server/client-trace-metadata.js

@@ -25,26 +25,16 @@ const carrierSetter = { set(carrier, key, value) {
 	});
 } };
 const OPEN_TELEMETRY_API_SYMBOL = Symbol.for("opentelemetry.js.api.1");
-const OPEN_TELEMETRY_SPAN_SYMBOL = Symbol.for("OpenTelemetry Context Key SPAN");
 function getRegisteredOpenTelemetryTraceData() {
-	let metadataSpan = null;
 	try {
 		const registry = globalThis[OPEN_TELEMETRY_API_SYMBOL];
 		if (!registry?.context || !registry.propagation) return null;
-		const contextApi = registry.context;
-		const propagation = registry.propagation;
-		const activeContext = contextApi.active();
-		metadataSpan = activeContext.getValue(OPEN_TELEMETRY_SPAN_SYMBOL) !== void 0 ? null : registry.trace?.getTracer("vinext").startSpan("vinext.clientTraceMetadata", void 0, activeContext) ?? null;
-		const context = metadataSpan ? activeContext.setValue(OPEN_TELEMETRY_SPAN_SYMBOL, metadataSpan) : activeContext;
+		const context = registry.context.active();
 		const entries = [];
-		contextApi.with(context, () => {
-			propagation.inject(context, entries, carrierSetter);
-		});
+		registry.propagation.inject(context, entries, carrierSetter);
 		return entries;
 	} catch {
 		return [];
-	} finally {
-		metadataSpan?.end();
 	}
 }
 function getOpenTelemetryTraceData() {
@@ -88,6 +78,28 @@ function renderClientTraceMetadataTags(entries) {
 	for (const { key, value } of entries) html += `<meta name="${escapeHtmlAttr(key)}" content="${escapeHtmlAttr(value)}"/>`;
 	return html;
 }
+function clientTraceMetadataBlockStart(marker) {
+	return `<!--vinext-client-trace-metadata:${marker}:start-->`;
+}
+function clientTraceMetadataBlockEnd(marker) {
+	return `<!--vinext-client-trace-metadata:${marker}:end-->`;
+}
+/** Mark only vinext-injected trace metadata for removal from a shared cache copy. */
+function markClientTraceMetadataBlock(html, marker) {
+	if (!html || !marker) return html;
+	return `${clientTraceMetadataBlockStart(marker)}${html}${clientTraceMetadataBlockEnd(marker)}`;
+}
+/** Remove the trace metadata block carrying this render's private marker. */
+function stripClientTraceMetadataBlock(html, marker) {
+	if (!marker) return html;
+	const start = clientTraceMetadataBlockStart(marker);
+	const end = clientTraceMetadataBlockEnd(marker);
+	const startIndex = html.indexOf(start);
+	if (startIndex === -1) return html;
+	const endIndex = html.indexOf(end, startIndex + start.length);
+	if (endIndex === -1) return html;
+	return html.slice(0, startIndex) + html.slice(endIndex + end.length);
+}
 /**
 * Convenience helper: read OTel propagation data, filter against the
 * configured allow-list, and render the resulting `<meta>` tags. Returns an
@@ -98,10 +110,10 @@ function renderClientTraceMetadataTags(entries) {
 * configured/active this is a few `try/catch`-bounded operations and returns
 * `""`.
 */
-function getClientTraceMetadataHTML(allowList) {
+function getClientTraceMetadataHTML(allowList, isStaticGeneration = false) {
 	if (!allowList || allowList.length === 0) return "";
-	if (typeof process !== "undefined" && process.env.VINEXT_PRERENDER === "1") return "";
+	if (isStaticGeneration || typeof process !== "undefined" && process.env.VINEXT_PRERENDER === "1") return "";
 	return renderClientTraceMetadataTags(filterClientTraceMetadata(getOpenTelemetryTraceData(), allowList));
 }
 //#endregion
-export { filterClientTraceMetadata, getClientTraceMetadataHTML, renderClientTraceMetadataTags };
+export { filterClientTraceMetadata, getClientTraceMetadataHTML, markClientTraceMetadataBlock, renderClientTraceMetadataTags, stripClientTraceMetadataBlock };

package/dist/server/cloudflare-workers-tracing.d.ts

@@ -0,0 +1 @@
+export {}

package/dist/server/cloudflare-workers-tracing.js

@@ -0,0 +1,8 @@
+import { registerFrameworkTracingIntegration } from "./tracer.js";
+import { createWorkersTracingIntegration } from "./workers-tracing.js";
+import * as cloudflareWorkers from "cloudflare:workers";
+//#region src/server/cloudflare-workers-tracing.ts
+const tracing = Reflect.get(cloudflareWorkers, "tracing");
+if (tracing) registerFrameworkTracingIntegration(createWorkersTracingIntegration(tracing));
+//#endregion
+export {};

package/dist/server/config-headers.d.ts

@@ -3,6 +3,19 @@ import { RequestContext } from "../config/request-context.js";
 import { BasePathMatchState } from "../config/config-matchers.js";
 import { HeaderRecord } from "./request-pipeline.js";
 //#region src/server/config-headers.d.ts
+export type ResponseStageCachePolicyOptions = {
+  basePathState?: BasePathMatchState;
+  configHeaders: NextHeader[];
+  pathname: string;
+  requestContext: RequestContext;
+};
+/**
+ * Resolve positive config cache policy that must accompany an inner artifact.
+ * The request stage evaluates every condition. Shared stage transports must key
+ * the complete serialized props, so the matched policy partitions the artifact
+ * without exposing request-only header, cookie, or host values to the renderer.
+ */
+export declare function resolveResponseStageCachePolicy({ basePathState, configHeaders, pathname, requestContext }: ResponseStageCachePolicyOptions): Array<[string, string]> | null;
 type ApplyConfigHeadersOptions = {
   configHeaders: NextHeader[];
   pathname: string;
@@ -14,15 +27,16 @@ type ApplyConfigHeadersOptions = {
    */
   basePathState?: BasePathMatchState;
   /** Existing framework-generated headers that matching config rules may replace. */
-  overwriteExisting?: ReadonlySet<string>;
+  overwriteExisting?: ReadonlySet<string> | ((name: string) => boolean);
   /** Renderer and Edge-handler Link values are emitted after config headers in Next.js. */
   appendToPostConfigLink?: boolean;
   /** Middleware response headers run after config and therefore suppress config values. */
   middlewareHeaders?: Headers | null;
+  /** Whether this composition participates in response-cache admission. */
+  recordCacheability?: boolean;
 };
 /** Apply matched next.config.js headers to a Web Headers object. */
-declare function applyConfigHeadersToResponse(responseHeaders: Headers, options: ApplyConfigHeadersOptions): void;
+export declare function applyConfigHeadersToResponse(responseHeaders: Headers, options: ApplyConfigHeadersOptions): void;
 /** Apply matched next.config.js headers to an early response header record. */
-declare function applyConfigHeadersToHeaderRecord(headers: HeaderRecord, options: ApplyConfigHeadersOptions): void;
-//#endregion
-export { applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse };
+export declare function applyConfigHeadersToHeaderRecord(headers: HeaderRecord, options: ApplyConfigHeadersOptions): void;
+//#endregion

package/dist/server/config-headers.js

@@ -1,9 +1,22 @@
 import { matchHeaders } from "../config/config-matchers.js";
-import { isNonCacheableCacheControl } from "../shims/cdn-cache.js";
-import { CACHEABILITY_POLICY_HEADERS, markRouteCacheabilityDynamic, markRouteCacheabilityExplicitConfigPolicy, markRouteCacheabilityFinalResponseUncacheable } from "../shims/cacheability-classification.js";
+import { markRouteCacheabilityConfigCdnCachePolicy, markRouteCacheabilityDynamic, markRouteCacheabilityFinalResponseUncacheable } from "../shims/cacheability-classification.js";
+import { isCdnResponsePolicyHeader, isNonCacheableCdnResponsePolicy } from "./cache-control.js";
+import { mergeVaryHeader } from "./middleware-response-headers.js";
 //#region src/server/config-headers.ts
 const ADDITIVE_CONFIG_HEADER_NAMES = /* @__PURE__ */ new Set(["set-cookie", "vary"]);
-const CACHEABILITY_POLICY_HEADER_NAMES = new Set(CACHEABILITY_POLICY_HEADERS);
+/**
+* Resolve positive config cache policy that must accompany an inner artifact.
+* The request stage evaluates every condition. Shared stage transports must key
+* the complete serialized props, so the matched policy partitions the artifact
+* without exposing request-only header, cookie, or host values to the renderer.
+*/
+function resolveResponseStageCachePolicy({ basePathState, configHeaders, pathname, requestContext }) {
+	const policy = retainLastSingularConfigValues(matchHeaders(pathname, configHeaders, requestContext, basePathState)).filter((header) => {
+		const name = header.key.toLowerCase();
+		return name === "vary" || isCdnResponsePolicyHeader(name) && !isNonCacheableCdnResponsePolicy(name, header.value);
+	}).map((header) => [header.key, header.value]);
+	return policy.length > 0 ? policy : null;
+}
 function markConditionalConfigHeaderCacheability(rule) {
 	if ([...rule.has ?? [], ...rule.missing ?? []].some((condition) => condition.type === "header" || condition.type === "cookie" || condition.type === "host")) markRouteCacheabilityDynamic("next.config headers depend on request headers, cookies, or hostnames");
 }
@@ -14,8 +27,8 @@ function markExplicitConfigResponseVeto(matched) {
 			markRouteCacheabilityFinalResponseUncacheable("next.config headers set a cookie");
 			continue;
 		}
-		if (CACHEABILITY_POLICY_HEADER_NAMES.has(name)) markRouteCacheabilityExplicitConfigPolicy();
-		if (CACHEABILITY_POLICY_HEADER_NAMES.has(name) && isNonCacheableCacheControl(header.value)) markRouteCacheabilityFinalResponseUncacheable(`next.config headers set a non-cacheable ${header.key} policy`);
+		if (isCdnResponsePolicyHeader(name)) markRouteCacheabilityConfigCdnCachePolicy(name, header.value);
+		if (isCdnResponsePolicyHeader(name) && isNonCacheableCdnResponsePolicy(name, header.value)) markRouteCacheabilityFinalResponseUncacheable(`next.config headers set a non-cacheable ${header.key} policy`);
 	}
 }
 function retainLastSingularConfigValues(matched) {
@@ -60,8 +73,8 @@ function appendVaryHeaderRecord(headers, value) {
 }
 /** Apply matched next.config.js headers to a Web Headers object. */
 function applyConfigHeadersToResponse(responseHeaders, options) {
-	const matched = retainLastSingularConfigValues(matchHeaders(options.pathname, options.configHeaders, options.requestContext, options.basePathState, markConditionalConfigHeaderCacheability));
-	markExplicitConfigResponseVeto(matched);
+	const matched = retainLastSingularConfigValues(matchHeaders(options.pathname, options.configHeaders, options.requestContext, options.basePathState, options.recordCacheability === false ? void 0 : markConditionalConfigHeaderCacheability));
+	if (options.recordCacheability !== false) markExplicitConfigResponseVeto(matched);
 	for (const header of matched) {
 		const lowerName = header.key.toLowerCase();
 		if (lowerName === "link") {
@@ -69,14 +82,15 @@ function applyConfigHeadersToResponse(responseHeaders, options) {
 			const postConfigLink = options.appendToPostConfigLink ? responseHeaders.get(lowerName) : null;
 			responseHeaders.set(header.key, postConfigLink ? `${header.value}, ${postConfigLink}` : header.value);
 		} else if (!ADDITIVE_CONFIG_HEADER_NAMES.has(lowerName) && options.middlewareHeaders?.has(lowerName)) continue;
+		else if (lowerName === "vary") mergeVaryHeader(responseHeaders, header.value);
 		else if (ADDITIVE_CONFIG_HEADER_NAMES.has(lowerName)) responseHeaders.append(header.key, header.value);
-		else if (options.overwriteExisting?.has(lowerName) || !responseHeaders.has(lowerName)) responseHeaders.set(header.key, header.value);
+		else if ((typeof options.overwriteExisting === "function" ? options.overwriteExisting(lowerName) : options.overwriteExisting?.has(lowerName)) || !responseHeaders.has(lowerName)) responseHeaders.set(header.key, header.value);
 	}
 }
 /** Apply matched next.config.js headers to an early response header record. */
 function applyConfigHeadersToHeaderRecord(headers, options) {
-	const matched = retainLastSingularConfigValues(matchHeaders(options.pathname, options.configHeaders, options.requestContext, options.basePathState, markConditionalConfigHeaderCacheability));
-	markExplicitConfigResponseVeto(matched);
+	const matched = retainLastSingularConfigValues(matchHeaders(options.pathname, options.configHeaders, options.requestContext, options.basePathState, options.recordCacheability === false ? void 0 : markConditionalConfigHeaderCacheability));
+	if (options.recordCacheability !== false) markExplicitConfigResponseVeto(matched);
 	for (const header of matched) {
 		const lowerName = header.key.toLowerCase();
 		if (lowerName === "set-cookie") appendHeaderRecord(headers, lowerName, header.value);
@@ -85,4 +99,4 @@ function applyConfigHeadersToHeaderRecord(headers, options) {
 	}
 }
 //#endregion
-export { applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse };
+export { applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, resolveResponseStageCachePolicy };

package/dist/server/cookie-utils.d.ts

@@ -7,6 +7,5 @@
  * `=`. Returns null when the line is not parseable (defensive — callers keep
  * unparseable entries verbatim so they don't drop user-supplied cookies).
  */
-declare function getSetCookieName(cookie: string): string | null;
-//#endregion
-export { getSetCookieName };
+export declare function getSetCookieName(cookie: string): string | null;
+//#endregion

package/dist/server/csp.d.ts

@@ -1,9 +1,8 @@
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from "node:http";
 //#region src/server/csp.d.ts
 type NodeHeaders = IncomingHttpHeaders | OutgoingHttpHeaders;
-declare function getScriptNonceFromHeader(cspHeaderValue: string): string | undefined;
-declare function getScriptNonceFromHeaders(headers: Headers | null | undefined): string | undefined;
-declare function getScriptNonceFromNodeHeaderSources(...headersList: readonly (NodeHeaders | null | undefined)[]): string | undefined;
-declare function getScriptNonceFromHeaderSources(...headersList: readonly (Headers | null | undefined)[]): string | undefined;
-//#endregion
-export { getScriptNonceFromHeader, getScriptNonceFromHeaderSources, getScriptNonceFromHeaders, getScriptNonceFromNodeHeaderSources };
+export declare function getScriptNonceFromHeader(cspHeaderValue: string): string | undefined;
+export declare function getScriptNonceFromHeaders(headers: Headers | null | undefined): string | undefined;
+export declare function getScriptNonceFromNodeHeaderSources(...headersList: readonly (NodeHeaders | null | undefined)[]): string | undefined;
+export declare function getScriptNonceFromHeaderSources(...headersList: readonly (Headers | null | undefined)[]): string | undefined;
+//#endregion

package/dist/server/default-global-error-module.d.ts

@@ -13,8 +13,7 @@ import DefaultGlobalError from "../shims/default-global-error.js";
  * automatically when the user has not supplied a custom global error file:
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack/loaders/next-app-loader/index.ts
  */
-declare const DEFAULT_GLOBAL_ERROR_MODULE: {
+export declare const DEFAULT_GLOBAL_ERROR_MODULE: {
   readonly default: typeof DefaultGlobalError;
 };
-//#endregion
-export { DEFAULT_GLOBAL_ERROR_MODULE };
+//#endregion

package/dist/server/default-global-not-found-module.d.ts

@@ -6,8 +6,7 @@ declare function DefaultGlobalNotFound(): React.ReactElement;
  * Unlike the regular default not-found boundary, this component owns the
  * document shell because global not-found responses skip the root layout.
  */
-declare const DEFAULT_GLOBAL_NOT_FOUND_MODULE: {
+export declare const DEFAULT_GLOBAL_NOT_FOUND_MODULE: {
   readonly default: typeof DefaultGlobalNotFound;
 };
-//#endregion
-export { DEFAULT_GLOBAL_NOT_FOUND_MODULE };
+//#endregion

package/dist/server/default-not-found-module.d.ts

@@ -13,8 +13,7 @@ import DefaultNotFound from "../shims/default-not-found.js";
  * automatically when the user has not supplied a custom not-found file:
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack/loaders/next-app-loader/index.ts
  */
-declare const DEFAULT_NOT_FOUND_MODULE: {
+export declare const DEFAULT_NOT_FOUND_MODULE: {
   readonly default: typeof DefaultNotFound;
 };
-//#endregion
-export { DEFAULT_NOT_FOUND_MODULE };
+//#endregion

package/dist/server/defer-until-stream-consumed.d.ts

@@ -2,6 +2,5 @@
 /**
  * Defers cleanup until the downstream consumer drains or cancels the stream.
  */
-declare function deferUntilStreamConsumed(stream: ReadableStream<Uint8Array>, onFlush: () => void): ReadableStream<Uint8Array>;
-//#endregion
-export { deferUntilStreamConsumed };
+export declare function deferUntilStreamConsumed(stream: ReadableStream<Uint8Array>, onFlush: () => void, onError?: (error: unknown) => void): ReadableStream<Uint8Array>;
+//#endregion

package/dist/server/defer-until-stream-consumed.js

@@ -2,7 +2,7 @@
 /**
 * Defers cleanup until the downstream consumer drains or cancels the stream.
 */
-function deferUntilStreamConsumed(stream, onFlush) {
+function deferUntilStreamConsumed(stream, onFlush, onError) {
 	let called = false;
 	const once = () => {
 		if (!called) {
@@ -20,6 +20,7 @@ function deferUntilStreamConsumed(stream, onFlush) {
 				if (done) controller.close();
 				else controller.enqueue(value);
 			}, (error) => {
+				onError?.(error);
 				once();
 				controller.error(error);
 			});

package/dist/server/dev-initial-server-error.d.ts

@@ -1,9 +1,8 @@
 //#region src/server/dev-initial-server-error.d.ts
-type InitialDevServerErrorPayload = {
+export type InitialDevServerErrorPayload = {
   message: string;
   name?: string;
   stack?: string;
 };
-declare function createInitialDevServerErrorScript(error: unknown, scriptNonce?: string, nodeEnv?: "development" | "production" | "test"): string;
-//#endregion
-export { InitialDevServerErrorPayload, createInitialDevServerErrorScript };
+export declare function createInitialDevServerErrorScript(error: unknown, scriptNonce?: string, nodeEnv?: "development" | "production" | "test"): string;
+//#endregion

package/dist/server/dev-initial-server-error.js

@@ -20,7 +20,8 @@ function createInitialDevServerErrorPayload(error) {
 function createInitialDevServerErrorScript(error, scriptNonce, nodeEnv = process.env.NODE_ENV) {
 	if (error == null || nodeEnv === "production") return "";
 	const globalRef = "self[" + safeJsonStringify(INITIAL_DEV_SERVER_ERRORS_GLOBAL) + "]";
-	return createInlineScriptTag(`${globalRef}=${globalRef}||[];${globalRef}.push(${safeJsonStringify(createInitialDevServerErrorPayload(error))})`, scriptNonce);
+	const payload = safeJsonStringify(createInitialDevServerErrorPayload(error));
+	return createInlineScriptTag(`${globalRef}=${globalRef}||[];${globalRef}.push(${payload})`, scriptNonce);
 }
 //#endregion
 export { createInitialDevServerErrorScript };

package/dist/server/dev-lockfile.d.ts

@@ -27,7 +27,7 @@
 /**
  * Information about a running dev server, stored inside the lock file itself.
  */
-type DevServerInfo = {
+export type DevServerInfo = {
   pid: number;
   port: number;
   hostname: string;
@@ -47,12 +47,12 @@ type DevLockfile = {
 /**
  * Returns the absolute path to the lock file for a given project root.
  */
-declare function getLockfilePath(root: string): string;
+export declare function getLockfilePath(root: string): string;
 /**
  * Reads and parses the lock file at the given path. Returns `undefined` if the
  * file doesn't exist or can't be parsed.
  */
-declare function readLockfile(lockfilePath: string): DevServerInfo | undefined;
+export declare function readLockfile(lockfilePath: string): DevServerInfo | undefined;
 /**
  * Returns true if a process with the given PID is running.
  *
@@ -61,7 +61,7 @@ declare function readLockfile(lockfilePath: string): DevServerInfo | undefined;
  * doesn't exist, or `EPERM` if it exists but we don't have permission to
  * signal it (in which case it's still running, just owned by someone else).
  */
-declare function isPidAlive(pid: number): boolean;
+export declare function isPidAlive(pid: number): boolean;
 type FormatErrorOptions = {
   /** Existing server info from the lock file, if readable. */
   existing: DevServerInfo | undefined;
@@ -80,7 +80,7 @@ type FormatErrorOptions = {
  * currently only returns `ok: false` with a defined `existing`, but the
  * formatter is exported and unit-tested separately, so it handles both shapes.
  */
-declare function formatAlreadyRunningError(opts: FormatErrorOptions): string;
+export declare function formatAlreadyRunningError(opts: FormatErrorOptions): string;
 type AcquireOptions = {
   /** Project root. Lock file goes in `<root>/.vinext/dev/lock.json`. */
   root: string;
@@ -116,6 +116,5 @@ type AcquireResult = AcquireSuccess | AcquireFailure;
  * Returns `{ ok: false, existing, lockfilePath }` if another live dev server
  * already holds the lock.
  */
-declare function tryAcquireLockfile(opts: AcquireOptions): AcquireResult;
-//#endregion
-export { DevLockfile, DevServerInfo, formatAlreadyRunningError, getLockfilePath, isPidAlive, readLockfile, tryAcquireLockfile };
+export declare function tryAcquireLockfile(opts: AcquireOptions): AcquireResult;
+//#endregion

package/dist/server/dev-lockfile.js

@@ -99,7 +99,7 @@ function formatAlreadyRunningError(opts) {
 		"Another vinext dev server appears to be running in this directory.",
 		"",
 		`Stale lock file: ${path.relative(cwd, lockfilePath)}`,
-		"Remove it manually if no server is running, then re-run `vinext dev`."
+		"Remove it manually if no server is running, then re-run `vite dev`."
 	].join("\n");
 	const killCommand = process.platform === "win32" ? `taskkill /PID ${existing.pid} /F` : `kill ${existing.pid}`;
 	return [
@@ -160,7 +160,10 @@ function tryAcquireLockfile(opts) {
 		lockfile: {
 			path: lockfilePath,
 			update(next) {
+				if (released) return;
 				try {
+					const current = readLockfile(lockfilePath);
+					if (!current || current.pid !== ownerPid) return;
 					writeLockfile(lockfilePath, next);
 				} catch {}
 			},

package/dist/server/dev-module-runner.d.ts

@@ -24,6 +24,5 @@ type DevEnvironmentLike = {
  * @param environment - Any Vite DevEnvironment (or duck-typed equivalent).
  *   Typically `server.environments["ssr"]`.
  */
-declare function createDirectRunner(environment: DevEnvironmentLike | DevEnvironment): ModuleRunner;
-//#endregion
-export { createDirectRunner };
+export declare function createDirectRunner(environment: DevEnvironmentLike | DevEnvironment): ModuleRunner;
+//#endregion

package/dist/server/dev-origin-check.d.ts

@@ -25,7 +25,7 @@
  * @param host - The Host header value for same-origin comparison
  * @param allowedDevOrigins - Additional allowed origins from config
  */
-declare function isAllowedDevOrigin(origin: string | null | undefined, host: string | null | undefined, allowedDevOrigins?: string[]): boolean;
+export declare function isAllowedDevOrigin(origin: string | null | undefined, host: string | null | undefined, allowedDevOrigins?: string[]): boolean;
 /**
  * Check if a cross-origin request should be blocked based on Sec-Fetch headers.
  *
@@ -36,14 +36,14 @@ declare function isAllowedDevOrigin(origin: string | null | undefined, host: str
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Sec-Fetch-Site
  */
-declare function isCrossSiteNoCorsRequest(secFetchSite: string | null | undefined, secFetchMode: string | null | undefined): boolean;
+export declare function isCrossSiteNoCorsRequest(secFetchSite: string | null | undefined, secFetchMode: string | null | undefined): boolean;
 /**
  * Validate a dev server request from a Node.js IncomingMessage.
  *
  * Returns null if the request is allowed, or a reason string if it should be blocked.
  * This is used by the Pages Router connect middleware.
  */
-declare function validateDevRequest(headers: {
+export declare function validateDevRequest(headers: {
   origin?: string;
   host?: string;
   "x-forwarded-host"?: string;
@@ -57,6 +57,5 @@ declare function validateDevRequest(headers: {
  * Web API Request objects (not Node.js IncomingMessage). This generates inline
  * code that performs the same checks as validateDevRequest().
  */
-declare function generateDevOriginCheckCode(allowedDevOrigins?: string[]): string;
-//#endregion
-export { generateDevOriginCheckCode, isAllowedDevOrigin, isCrossSiteNoCorsRequest, validateDevRequest };
+export declare function generateDevOriginCheckCode(allowedDevOrigins?: string[]): string;
+//#endregion

package/dist/server/dev-route-files.d.ts

@@ -1,5 +1,4 @@
 import { ValidFileMatcher } from "../routing/file-matcher.js";
 //#region src/server/dev-route-files.d.ts
-declare function shouldInvalidateAppRouteFile(appDir: string, filePath: string, matcher: ValidFileMatcher): boolean;
-//#endregion
-export { shouldInvalidateAppRouteFile };
+export declare function shouldInvalidateAppRouteFile(appDir: string, filePath: string, matcher: ValidFileMatcher): boolean;
+//#endregion

package/dist/server/dev-server.d.ts

@@ -10,7 +10,7 @@ import { IncomingMessage, ServerResponse } from "node:http";
  * e.g. /fr/about -> { locale: "fr", url: "/about", hadPrefix: true }
  *      /about    -> { locale: "en", url: "/about", hadPrefix: false } (defaultLocale)
  */
-declare function extractLocaleFromUrl(url: string, i18nConfig: NextI18nConfig): {
+export declare function extractLocaleFromUrl(url: string, i18nConfig: NextI18nConfig): {
   locale: string;
   url: string;
   hadPrefix: boolean;
@@ -25,7 +25,7 @@ declare function extractLocaleFromUrl(url: string, i18nConfig: NextI18nConfig):
  * 4. Render the component to HTML
  * 5. Wrap in _document shell and send response
  */
-declare function createSSRHandler(server: ViteDevServer, runner: ModuleImporter, routes: Route[], pagesDir: string, i18nConfig?: NextI18nConfig | null, fileMatcher?: ValidFileMatcher, basePath?: string, trailingSlash?: boolean, hasMiddleware?: boolean, hasRewrites?: boolean,
+export declare function createSSRHandler(server: ViteDevServer, runner: ModuleImporter, routes: Route[], pagesDir: string, i18nConfig?: NextI18nConfig | null, fileMatcher?: ValidFileMatcher, basePath?: string, trailingSlash?: boolean, hasMiddleware?: boolean, hasRewrites?: boolean,
 /**
  * Allow-list of OpenTelemetry propagation keys to emit as `<meta>` tags
  * in the SSR head. Sourced from `experimental.clientTraceMetadata` in
@@ -44,7 +44,7 @@ reactStrictMode?: boolean,
 /** Next.js `expireTime`, used when formatting terminal GSP responses. */
 expireTime?: number, crossOrigin?: string,
 /** Resolved Pages Router build ID shared with the dev data-route parser. */
-buildId?: string): (req: IncomingMessage, res: ServerResponse, url: string,
+buildId?: string, clientMiddlewareMatcher?: unknown, classifyPageRoute?: (route: Route) => "static" | "server" | "none"): (req: IncomingMessage, res: ServerResponse, url: string,
 /** Status code override — propagated from middleware rewrite status. */
 statusCode?: number,
 /**
@@ -54,5 +54,4 @@ statusCode?: number,
  * client-side navigations in the Pages Router.
  */
 isDataReq?: boolean, originalUrl?: string) => Promise<void>;
-//#endregion
-export { createSSRHandler, extractLocaleFromUrl };
+//#endregion