vinext 1.4.3 → 1.4.5

package/dist/server/config-headers.js

@@ -1,9 +1,9 @@
-import "./headers.js";
 import { matchHeaders } from "../config/config-matchers.js";
 import { markRouteCacheabilityConfigCdnCachePolicy, markRouteCacheabilityDynamic, markRouteCacheabilityFinalResponseUncacheable } from "../shims/cacheability-classification.js";
 import { isCdnResponsePolicyHeader, isNonCacheableCdnResponsePolicy } from "./cache-control.js";
+import "./headers.js";
 import { mergeVaryHeader } from "./middleware-response-headers.js";
-//#region src/server/config-headers.ts
+// src/server/config-headers.ts
 const ADDITIVE_CONFIG_HEADER_NAMES = /* @__PURE__ */ new Set(["set-cookie", "vary"]);
 const ROUTE_HANDLER_APPENDED_HEADER_NAMES = /* @__PURE__ */ new Set(["www-authenticate", "proxy-authenticate"]);
 /**
@@ -89,7 +89,7 @@ function applyConfigHeadersToResponse(responseHeaders, options) {
 	const configVary = [];
 	for (const header of matched) {
 		const lowerName = header.key.toLowerCase();
-		if (lowerName === "x-vinext-special-error-status") continue;
+		if (lowerName === "x-vinext-special-error-status" || lowerName === "x-vinext-route-miss") continue;
 		if (lowerName === "set-cookie") configCookies.push(header.value);
 		else if (lowerName === "link") {
 			if (options.middlewareHeaders?.get(lowerName)) continue;
@@ -128,5 +128,4 @@ function applyConfigHeadersToHeaderRecord(headers, options) {
 		else if (findHeaderRecordKey(headers, lowerName) === void 0) headers[lowerName] = header.value;
 	}
 }
-//#endregion
 export { applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, resolveResponseStageCachePolicy };

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

@@ -1,4 +1,3 @@
-//#region src/server/cookie-utils.d.ts
 /**
  * Parse the cookie name out of a serialised Set-Cookie line.
  *
@@ -7,5 +6,4 @@
  * `=`. Returns null when the line is not parseable (defensive — callers keep
  * unparseable entries verbatim so they don't drop user-supplied cookies).
  */
-export declare function getSetCookieName(cookie: string): string | null;
-//#endregion
+export declare function getSetCookieName(cookie: string): string | null;

package/dist/server/cookie-utils.js

@@ -1,4 +1,4 @@
-//#region src/server/cookie-utils.ts
+// src/server/cookie-utils.ts
 /**
 * Parse the cookie name out of a serialised Set-Cookie line.
 *
@@ -14,5 +14,4 @@ function getSetCookieName(cookie) {
 	const end = semicolonIndex === -1 ? equalsIndex : Math.min(equalsIndex, semicolonIndex);
 	return cookie.slice(0, end);
 }
-//#endregion
 export { getSetCookieName };

package/dist/server/csp.d.ts

@@ -1,9 +1,7 @@
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from "node:http";
-//#region src/server/csp.d.ts
 type NodeHeaders = IncomingHttpHeaders | OutgoingHttpHeaders;
 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
 export {};

package/dist/server/csp.js

@@ -1,4 +1,4 @@
-//#region src/server/csp.ts
+// src/server/csp.ts
 const ESCAPE_REGEX = /[&><\u2028\u2029]/;
 function getNodeHeaderValue(headers, key) {
 	const value = headers?.[key];
@@ -37,5 +37,4 @@ function getScriptNonceFromHeaderSources(...headersList) {
 		if (nonce) return nonce;
 	}
 }
-//#endregion
 export { getScriptNonceFromHeader, getScriptNonceFromHeaderSources, getScriptNonceFromHeaders, getScriptNonceFromNodeHeaderSources };

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

@@ -1,5 +1,4 @@
 import DefaultGlobalError from "../shims/default-global-error.js";
-//#region src/server/default-global-error-module.d.ts
 /**
  * Module-shaped wrapper around vinext's built-in default global error
  * component. Used as the fallback when an app does not define its own
@@ -15,5 +14,4 @@ import DefaultGlobalError from "../shims/default-global-error.js";
  */
 export declare const DEFAULT_GLOBAL_ERROR_MODULE: {
   readonly default: typeof DefaultGlobalError;
-};
-//#endregion
+};

package/dist/server/default-global-error-module.js

@@ -1,5 +1,5 @@
 import DefaultGlobalError from "../shims/default-global-error.js";
-//#region src/server/default-global-error-module.ts
+// src/server/default-global-error-module.ts
 /**
 * Module-shaped wrapper around vinext's built-in default global error
 * component. Used as the fallback when an app does not define its own
@@ -14,5 +14,4 @@ import DefaultGlobalError from "../shims/default-global-error.js";
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack/loaders/next-app-loader/index.ts
 */
 const DEFAULT_GLOBAL_ERROR_MODULE = { default: DefaultGlobalError };
-//#endregion
 export { DEFAULT_GLOBAL_ERROR_MODULE };

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

@@ -1,5 +1,4 @@
 import React from "react";
-//#region src/server/default-global-not-found-module.d.ts
 declare function DefaultGlobalNotFound(): React.ReactElement;
 /**
  * Module-shaped wrapper around Next.js's built-in global not-found document.
@@ -9,5 +8,11 @@ declare function DefaultGlobalNotFound(): React.ReactElement;
 export declare const DEFAULT_GLOBAL_NOT_FOUND_MODULE: {
   readonly default: typeof DefaultGlobalNotFound;
 };
-//#endregion
+/**
+ * `app/not-found` inside Next.js' default layout, as its /_not-found page
+ * renders it in an app without `app/layout`.
+ */
+export declare function withDefaultLayout<TModule extends {
+  default?: unknown;
+}>(notFoundModule: TModule): TModule;
 export {};

package/dist/server/default-global-not-found-module.js

@@ -1,6 +1,6 @@
 import DefaultNotFound from "../shims/default-not-found.js";
 import React from "react";
-//#region src/server/default-global-not-found-module.ts
+// src/server/default-global-not-found-module.ts
 function DefaultGlobalNotFound() {
 	return React.createElement("html", null, React.createElement("body", null, React.createElement(DefaultNotFound)));
 }
@@ -10,5 +10,21 @@ function DefaultGlobalNotFound() {
 * document shell because global not-found responses skip the root layout.
 */
 const DEFAULT_GLOBAL_NOT_FOUND_MODULE = { default: DefaultGlobalNotFound };
-//#endregion
-export { DEFAULT_GLOBAL_NOT_FOUND_MODULE };
+function DefaultLayout({ children }) {
+	return React.createElement("html", null, React.createElement("body", null, children));
+}
+/**
+* `app/not-found` inside Next.js' default layout, as its /_not-found page
+* renders it in an app without `app/layout`.
+*/
+function withDefaultLayout(notFoundModule) {
+	const NotFound = notFoundModule.default;
+	if (!NotFound) return notFoundModule;
+	return {
+		...notFoundModule,
+		default: function AppNotFound() {
+			return React.createElement(DefaultLayout, null, React.createElement(NotFound));
+		}
+	};
+}
+export { DEFAULT_GLOBAL_NOT_FOUND_MODULE, withDefaultLayout };

package/dist/server/default-http-access-fallback-modules.d.ts

@@ -1,7 +1,6 @@
 import DefaultForbidden from "../shims/default-forbidden.js";
 import DefaultNotFound from "../shims/default-not-found.js";
 import DefaultUnauthorized from "../shims/default-unauthorized.js";
-//#region src/server/default-http-access-fallback-modules.d.ts
 /**
  * Module-shaped wrappers around vinext's built-in not-found, forbidden and
  * unauthorized components. Used as the fallback when an app does not define
@@ -29,5 +28,4 @@ export declare const DEFAULT_UNAUTHORIZED_MODULE: {
 };
 export declare function getDefaultHttpAccessFallbackModule(statusCode: number): {
   readonly default: typeof DefaultNotFound;
-} | null;
-//#endregion
+} | null;

package/dist/server/default-http-access-fallback-modules.js

@@ -1,7 +1,7 @@
 import DefaultForbidden from "../shims/default-forbidden.js";
 import DefaultNotFound from "../shims/default-not-found.js";
 import DefaultUnauthorized from "../shims/default-unauthorized.js";
-//#region src/server/default-http-access-fallback-modules.ts
+// src/server/default-http-access-fallback-modules.ts
 /**
 * Module-shaped wrappers around vinext's built-in not-found, forbidden and
 * unauthorized components. Used as the fallback when an app does not define
@@ -27,5 +27,4 @@ function getDefaultHttpAccessFallbackModule(statusCode) {
 	if (statusCode === 401) return DEFAULT_UNAUTHORIZED_MODULE;
 	return null;
 }
-//#endregion
 export { DEFAULT_FORBIDDEN_MODULE, DEFAULT_NOT_FOUND_MODULE, DEFAULT_UNAUTHORIZED_MODULE, getDefaultHttpAccessFallbackModule };

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

@@ -1,4 +1,3 @@
-//#region src/server/defer-until-stream-consumed.d.ts
 export type StreamConsumptionCallbacks = {
   /** Runs once when the consumer reads the first chunk. */
   onStart?: () => void;
@@ -37,5 +36,4 @@ export declare function deferUntilStreamConsumed(stream: ReadableStream<Uint8Arr
  * need their request parent, but the consumer (the runtime sending the body)
  * reads from outside that scope.
  */
-export declare function observeStreamConsumption(stream: ReadableStream<Uint8Array>, callbacks: StreamConsumptionCallbacks): ReadableStream<Uint8Array>;
-//#endregion
+export declare function observeStreamConsumption(stream: ReadableStream<Uint8Array>, callbacks: StreamConsumptionCallbacks): ReadableStream<Uint8Array>;

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

@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-//#region src/server/defer-until-stream-consumed.ts
+// src/server/defer-until-stream-consumed.ts
 const UNREAD_WRAPPERS_KEY = Symbol.for("vinext.deferUntilStreamConsumed.unreadWrappers");
 const unreadWrappers = globalThis[UNREAD_WRAPPERS_KEY] ??= /* @__PURE__ */ new WeakMap();
 /**
@@ -166,5 +166,4 @@ function observeStreamConsumption(stream, callbacks) {
 	unreadWrappers.set(wrapped, layers);
 	return wrapped;
 }
-//#endregion
 export { deferUntilStreamConsumed, observeStreamConsumption };

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

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

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

@@ -1,5 +1,5 @@
 import { createInlineScriptTag, safeJsonStringify } from "./html.js";
-//#region src/server/dev-initial-server-error.ts
+// src/server/dev-initial-server-error.ts
 const INITIAL_DEV_SERVER_ERRORS_GLOBAL = "__VINEXT_INITIAL_DEV_ERRORS__";
 function stringifyThrownValue(error) {
 	if (typeof error === "string") return error;
@@ -23,5 +23,4 @@ function createInitialDevServerErrorScript(error, scriptNonce, nodeEnv = process
 	const payload = safeJsonStringify(createInitialDevServerErrorPayload(error));
 	return createInlineScriptTag(`${globalRef}=${globalRef}||[];${globalRef}.push(${payload})`, scriptNonce);
 }
-//#endregion
 export { createInitialDevServerErrorScript };

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

@@ -1,4 +1,3 @@
-//#region src/server/dev-lockfile.d.ts
 /**
  * Dev server lock file.
  *
@@ -146,5 +145,4 @@ type AcquireResult = AcquireSuccess | AcquireFailure;
  * already holds the lock.
  */
 export declare function tryAcquireLockfile(opts: AcquireOptions): AcquireResult;
-//#endregion
 export {};

package/dist/server/dev-lockfile.js

@@ -1,7 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import fs from "node:fs";
 import os from "node:os";
-//#region src/server/dev-lockfile.ts
+// src/server/dev-lockfile.ts
 /**
 * Dev server lock file.
 *
@@ -221,5 +221,4 @@ function tryAcquireLockfile(opts) {
 		}
 	};
 }
-//#endregion
 export { formatAlreadyRunningError, getLockfilePath, isPidAlive, predatesCurrentBoot, readLockfile, tryAcquireLockfile };

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

@@ -1,6 +1,5 @@
 import { DevEnvironment } from "vite";
 import { ModuleRunner } from "vite/module-runner";
-//#region src/server/dev-module-runner.d.ts
 /**
  * A Vite DevEnvironment duck-typed to the minimal surface we need.
  * `DevEnvironment.fetchModule()` is a plain async method available on all
@@ -25,5 +24,4 @@ type DevEnvironmentLike = {
  *   Typically `server.environments["ssr"]`.
  */
 export declare function createDirectRunner(environment: DevEnvironmentLike | DevEnvironment): ModuleRunner;
-//#endregion
 export {};

package/dist/server/dev-module-runner.js

@@ -1,5 +1,5 @@
 import { ESModulesEvaluator, ModuleRunner, createNodeImportMeta } from "vite/module-runner";
-//#region src/server/dev-module-runner.ts
+// src/server/dev-module-runner.ts
 /**
 * dev-module-runner.ts
 *
@@ -87,5 +87,4 @@ function createDirectRunner(environment) {
 		hmr: false
 	}, new ESModulesEvaluator());
 }
-//#endregion
 export { createDirectRunner };

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

@@ -1,4 +1,3 @@
-//#region src/server/dev-origin-check.d.ts
 /**
  * Cross-origin request protection for the dev server.
  *
@@ -58,5 +57,4 @@ export declare function validateDevRequest(headers: {
  * Web API Request objects (not Node.js IncomingMessage). This generates inline
  * code that performs the same checks as validateDevRequest().
  */
-export declare function generateDevOriginCheckCode(allowedDevOrigins?: string[]): string;
-//#endregion
+export declare function generateDevOriginCheckCode(allowedDevOrigins?: string[]): string;

package/dist/server/dev-origin-check.js

@@ -1,4 +1,4 @@
-//#region src/server/dev-origin-check.ts
+// src/server/dev-origin-check.ts
 /**
 * Cross-origin request protection for the dev server.
 *
@@ -153,5 +153,4 @@ function __validateDevRequestOrigin(request) {
 }
 `;
 }
-//#endregion
 export { generateDevOriginCheckCode, isAllowedDevOrigin, isCrossSiteNoCorsRequest, validateDevRequest };

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

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

package/dist/server/dev-route-files.js

@@ -1,7 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { isPathInside } from "../utils/path.js";
 import { METADATA_FILE_MAP, matchMetadataFileBaseName } from "./metadata-routes.js";
-//#region src/server/dev-route-files.ts
+// src/server/dev-route-files.ts
 const APP_ROUTER_STRUCTURE_FILES = [
 	"page",
 	"route",
@@ -68,5 +68,4 @@ function shouldInvalidateAppRouteFile(appDir, filePath, matcher) {
 	if (!fileName) return false;
 	return isAppRouterStructureFile(fileName, matcher) || isRootGlobalError(parts, matcher) || isMetadataRouteFile(parts);
 }
-//#endregion
 export { shouldInvalidateAppRouteFile };

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

@@ -1,10 +1,9 @@
-import { ValidFileMatcher } from "../routing/file-matcher.js";
-import { NextI18nConfig } from "../config/next-config.js";
 import { Route } from "../routing/pages-router.js";
 import { ModuleImporter } from "./instrumentation.js";
+import { NextI18nConfig } from "../config/next-config.js";
+import { ValidFileMatcher } from "../routing/file-matcher.js";
 import { ViteDevServer } from "vite";
 import { IncomingMessage, ServerResponse } from "node:http";
-//#region src/server/dev-server.d.ts
 /**
  * Extract locale prefix from a URL path.
  * e.g. /fr/about -> { locale: "fr", url: "/about", hadPrefix: true }
@@ -53,5 +52,4 @@ statusCode?: number,
  * rendering the React tree to HTML — matching Next.js' behavior for
  * client-side navigations in the Pages Router.
  */
-isDataReq?: boolean, originalUrl?: string) => Promise<void>;
-//#endregion
+isDataReq?: boolean, originalUrl?: string) => Promise<void>;

package/dist/server/dev-server.js

@@ -1,49 +1,49 @@
-import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
-import { createValidFileMatcher, findFileWithExts } from "../routing/file-matcher.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
-import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
-import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
-import { sanitizeDestination } from "../config/config-matchers.js";
-import { patternToNextFormat } from "../routing/route-validation.js";
 import { matchRoute } from "../routing/pages-router.js";
-import { isDangerousScheme } from "../shims/url-safety.js";
-import { extractLocaleFromUrl as extractLocaleFromUrl$1, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
-import { logRequestError } from "./request-error-log.js";
-import { NEVER_CACHE_CONTROL } from "./cache-control.js";
+import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
+import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
-import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
 import "./isr-cache.js";
+import { patternToNextFormat } from "../routing/route-validation.js";
 import { ensureFetchPatch, setCurrentFetchDraftMode } from "../shims/fetch-cache.js";
-import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
+import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import "../shims/router-state.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, safeJsonStringify } from "./html.js";
-import { createDocumentPlaceholderToken, getDocumentHeadOpenMarker } from "../shims/document-placeholders.js";
+import { NEVER_CACHE_CONTROL } from "./cache-control.js";
 import { applyDocumentAssetProps, extractDocumentAssetProps, markDocumentAssetPropsProtectedTags, stripDocumentAssetPropsProtectionMarkers } from "./pages-document-asset-props.js";
+import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
 import { spliceDocumentHeadClose, spliceDocumentHeadOpen, spliceDocumentScripts, splitDocumentAtMain } from "./pages-document-splice.js";
+import { createDocumentPlaceholderToken, getDocumentHeadOpenMarker } from "../shims/document-placeholders.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 import { getScriptNonceFromNodeHeaderSources } from "./csp.js";
+import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import { stripViteModuleQuery } from "../utils/path.js";
 import { logRequest, now } from "./request-log.js";
+import { createValidFileMatcher, findFileWithExts } from "../routing/file-matcher.js";
+import { extractLocaleFromUrl as extractLocaleFromUrl$1, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
-import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
-import { callDocumentGetInitialProps } from "./document-initial-head.js";
-import { hasPagesGetInitialProps, loadDevAppInitialProps, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
-import { isSerializableProps } from "./pages-serializable-props.js";
-import { traceFindPageComponents, tracePagesData, tracePagesDocument, tracePagesDocumentStream } from "./pages-execution-tracing.js";
 import { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds, resolvePagesStatusPageRenderPath } from "./pages-page-data.js";
-import { createPagesDevModuleUrl } from "./pages-dev-module-url.js";
+import { sanitizeDestination } from "../config/config-matchers.js";
 import { collectPagesDevInitialStylesheetHeadHTML } from "./pages-dev-stylesheets.js";
+import { createPagesDevModuleUrl } from "./pages-dev-module-url.js";
 import { createPagesDevHydrationScript } from "./pages-dev-hydration.js";
-import { PAGES_PREVIEW_CACHE_CONTROL, appendPagesPreviewClearCookies, getPagesPreviewState } from "./pages-preview.js";
+import { isSerializableProps } from "./pages-serializable-props.js";
+import { isDangerousScheme } from "../shims/url-safety.js";
+import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
+import { callDocumentGetInitialProps } from "./document-initial-head.js";
+import { hasPagesGetInitialProps, loadDevAppInitialProps, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { attachPagesRequestCookies } from "./pages-node-compat.js";
+import { PAGES_PREVIEW_CACHE_CONTROL, appendPagesPreviewClearCookies, getPagesPreviewState } from "./pages-preview.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { traceFindPageComponents, tracePagesData, tracePagesDocument, tracePagesDocumentStream } from "./pages-execution-tracing.js";
+import { logRequestError } from "./request-error-log.js";
 import { randomUUID } from "node:crypto";
 import React from "react";
 import { renderToReadableStream } from "react-dom/server";
-//#region src/server/dev-server.ts
+// src/server/dev-server.ts
 /**
 * Render a React element to a string using renderToReadableStream.
 *
@@ -417,6 +417,10 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 			return;
 		}
 		const { route, params } = match;
+		if (statusCode === void 0) {
+			if (route.pattern === "/404" && !isDataReq) res.statusCode = 404;
+			else if (route.pattern === "/500") res.statusCode = 500;
+		}
 		req.url = originalUrl;
 		const parsedResolvedUrl = new URL(localeStrippedUrl, "http://vinext.local");
 		const originalRequestSearch = new URL(originalUrl, "http://vinext.local").search;
@@ -765,7 +769,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						};
 					}
 				}
-				if (isDataReq) {
+				if (isDataReq && route.pattern !== "/500") {
 					const dataHeaders = { "Content-Type": "application/json" };
 					if (typeof pageModule.getStaticProps === "function") {
 						dataHeaders["Cache-Control"] = DEV_PAGES_CACHE_CONTROL;
@@ -775,8 +779,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					if (gsspExtraHeaders) for (const [k, v] of Object.entries(gsspExtraHeaders)) dataHeaders[k] = v;
 					dataHeaders["Cache-Control"] = DEV_PAGES_CACHE_CONTROL;
 					applyDevPagesPreviewHeaders(dataHeaders, requestPreview);
-					const dataRoutePattern = patternToNextFormat(route.pattern);
-					if (dataRoutePattern !== "/_error" && dataRoutePattern !== "/500") {
+					if (patternToNextFormat(route.pattern) !== "/_error") {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 						if (deploymentId) dataHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
 					}
@@ -1189,5 +1192,4 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 	res.writeHead(statusCode, { "Content-Type": "text/plain" });
 	res.end(`${statusCode} - Internal Server Error`);
 }
-//#endregion
 export { createSSRHandler, extractLocaleFromUrl };

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

@@ -1,6 +1,5 @@
 import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcemap-endpoint.js";
 import { ViteDevServer } from "vite";
-//#region src/server/dev-stack-sourcemap.d.ts
 export type SourceMapPayload = {
   version?: number;
   sources: string[];
@@ -37,5 +36,4 @@ export declare function mapStackLineWithMetadata(server: ViteDevServer, line: st
 export declare function originalPositionFor(sourceMap: SourceMapPayload, generatedLine: number, generatedColumn: number): SourceMapPosition | null;
 export declare function decodeVlqSegment(segment: string): number[];
 export declare function resolveSourceFile(source: string, sourceMap: SourceMapPayload, generatedUrl: URL): string;
-//#endregion
 export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT };

package/dist/server/dev-stack-sourcemap.js

@@ -2,7 +2,7 @@ import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist
 import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcemap-endpoint.js";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { isFileLoadingAllowed } from "vite";
-//#region src/server/dev-stack-sourcemap.ts
+// src/server/dev-stack-sourcemap.ts
 const MAX_ORIGINAL_STACK_TRACE_BODY_BYTES = 1048576;
 const V8_PAREN_STACK_LINE = /^(\s*at\s+.*?\()(.+):(\d+):(\d+)(\)\s*)$/;
 const V8_BARE_STACK_LINE = /^(\s*at\s+)(.+):(\d+):(\d+)(\s*)$/;
@@ -432,5 +432,4 @@ function resolveSourceFile(source, sourceMap, generatedUrl) {
 		return source;
 	}
 }
-//#endregion
 export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT, decodeVlqSegment, installDevStackSourcemapMiddleware, mapStackLineWithMetadata, originalPositionFor, resolveSourceFile };

package/dist/server/document-initial-head.d.ts

@@ -1,4 +1,2 @@
 import React from "react";
-//#region src/server/document-initial-head.d.ts
-export declare function callDocumentGetInitialProps(DocumentComponent: React.ComponentType | null | undefined, setDocumentInitialHead: ((head: React.ReactNode[]) => void) | undefined): Promise<void>;
-//#endregion
+export declare function callDocumentGetInitialProps(DocumentComponent: React.ComponentType | null | undefined, setDocumentInitialHead: ((head: React.ReactNode[]) => void) | undefined): Promise<void>;

package/dist/server/document-initial-head.js

@@ -1,5 +1,5 @@
 import Document from "../shims/document.js";
-//#region src/server/document-initial-head.ts
+// src/server/document-initial-head.ts
 /**
 * Reference to the unmodified `Document.getInitialProps` static. Used to
 * detect when a user `_document.tsx` did NOT override the method (i.e. they
@@ -44,5 +44,4 @@ async function callDocumentGetInitialProps(DocumentComponent, setDocumentInitial
 		console.error("[vinext] _document.getInitialProps() threw:", err);
 	}
 }
-//#endregion
 export { callDocumentGetInitialProps };

package/dist/server/edge-api-runtime.d.ts

@@ -1,12 +1,14 @@
-//#region src/server/edge-api-runtime.d.ts
 export declare function isEdgeApiRuntime(runtime: string | undefined): boolean;
 export type EdgeApiExecutionRuntime = "node" | "worker";
 /**
  * Remove wire-level body headers after Node's fetch implementation has decoded
  * an Edge API response. Next.js applies the same boundary in its edge sandbox.
  *
- * Workers keep the original response untouched: workerd preserves the encoded
- * body/header pair and can stream it directly to the client.
+ * Workers otherwise keep the original response untouched: workerd preserves
+ * the encoded body/header pair and can stream it directly to the client.
+ *
+ * Both runtimes drop `x-middleware-set-cookie`, the internal copy of the
+ * cookies that `NextResponse.cookies` keeps for middleware. Next.js's
+ * send-response never writes it to the client.
  */
-export declare function finalizeEdgeApiResponse(response: Response, runtime: EdgeApiExecutionRuntime): Response;
-//#endregion
+export declare function finalizeEdgeApiResponse(response: Response, runtime: EdgeApiExecutionRuntime): Response;

package/dist/server/edge-api-runtime.js

@@ -1,4 +1,6 @@
-//#region src/server/edge-api-runtime.ts
+import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
+import "./headers.js";
+// src/server/edge-api-runtime.ts
 function isEdgeApiRuntime(runtime) {
 	return runtime === "edge" || runtime === "experimental-edge";
 }
@@ -11,13 +13,28 @@ const NODE_EDGE_RESPONSE_FORBIDDEN_HEADERS = [
 * Remove wire-level body headers after Node's fetch implementation has decoded
 * an Edge API response. Next.js applies the same boundary in its edge sandbox.
 *
-* Workers keep the original response untouched: workerd preserves the encoded
-* body/header pair and can stream it directly to the client.
+* Workers otherwise keep the original response untouched: workerd preserves
+* the encoded body/header pair and can stream it directly to the client.
+*
+* Both runtimes drop `x-middleware-set-cookie`, the internal copy of the
+* cookies that `NextResponse.cookies` keeps for middleware. Next.js's
+* send-response never writes it to the client.
 */
 function finalizeEdgeApiResponse(response, runtime) {
-	if (runtime === "worker") return response;
+	if (runtime === "worker") {
+		if (!response.headers.has("x-middleware-set-cookie")) return response;
+		try {
+			response.headers.delete(MIDDLEWARE_SET_COOKIE_HEADER);
+			return response;
+		} catch {
+			const copy = new Response(response.body, response);
+			copy.headers.delete(MIDDLEWARE_SET_COOKIE_HEADER);
+			return copy;
+		}
+	}
 	const headers = new Headers(response.headers);
-	let changed = false;
+	let changed = headers.has(MIDDLEWARE_SET_COOKIE_HEADER);
+	headers.delete(MIDDLEWARE_SET_COOKIE_HEADER);
 	for (const name of NODE_EDGE_RESPONSE_FORBIDDEN_HEADERS) {
 		if (!headers.has(name)) continue;
 		headers.delete(name);
@@ -30,5 +47,4 @@ function finalizeEdgeApiResponse(response, runtime) {
 		statusText: response.statusText
 	});
 }
-//#endregion
 export { finalizeEdgeApiResponse, isEdgeApiRuntime };

package/dist/server/file-based-metadata.d.ts

@@ -1,6 +1,5 @@
-import { MetadataFileRoute } from "./metadata-routes.js";
 import { Metadata } from "../shims/metadata.js";
-//#region src/server/file-based-metadata.d.ts
+import { MetadataFileRoute } from "./metadata-routes.js";
 type AppPageParams = Record<string, string | string[]>;
 type FileBasedMetadataSource = {
   routeSegments: readonly string[];
@@ -24,5 +23,4 @@ type FileBasedMetadataOptions = {
   basePath?: string;
 };
 export declare function applyFileBasedMetadata(metadata: Metadata | null, routePath: string, params: AppPageParams, metadataRoutes: readonly MetadataFileRoute[] | null | undefined, options?: FileBasedMetadataOptions): Promise<Metadata | null>;
-//#endregion
 export {};

package/dist/server/file-based-metadata.js

@@ -1,8 +1,8 @@
-import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
+import { makeThenableParams } from "../shims/thenable-params.js";
 import { fillRoutePatternSegments, routePattern } from "../routing/route-pattern.js";
+import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
 import { getMetadataImageRouteKind, getMetadataRouteKind, isValidMetadataImageId } from "./metadata-routes.js";
-import { makeThenableParams } from "../shims/thenable-params.js";
-//#region src/server/file-based-metadata.ts
+// src/server/file-based-metadata.ts
 function routeApplies(routePath, routePrefix) {
 	if (!routePrefix) return true;
 	return routePath === routePrefix || routePath.startsWith(`${routePrefix}/`);
@@ -397,5 +397,4 @@ async function applyFileBasedMetadata(metadata, routePath, params, metadataRoute
 	if (manifestHeadData.length > 0 && manifestHeadData[0].kind === "manifest") nextMetadata.manifest = manifestHeadData[0].href;
 	return nextMetadata;
 }
-//#endregion
 export { applyFileBasedMetadata };

package/dist/server/forwarded-middleware-context.d.ts

@@ -1,5 +1,3 @@
-//#region src/server/forwarded-middleware-context.d.ts
 export declare function sealForwardedMiddlewareContext(key: string, context: string): string;
 /** Returns the forwarded context JSON, or null unless it carries `key`. */
-export declare function openForwardedMiddlewareContext(value: string | null, key: string | null | undefined): string | null;
-//#endregion
+export declare function openForwardedMiddlewareContext(value: string | null, key: string | null | undefined): string | null;