vinext 1.0.0-beta.12 → 1.0.0-beta.13

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

@@ -1,7 +1,7 @@
 import { isPromiseLike } from "../utils/promise.js";
 import { isNextRouterError } from "../shims/navigation-errors.js";
 import "../shims/navigation-server.js";
-import { markAppPagePropsForUseCache } from "../shims/internal/app-page-props-cache-key.js";
+import { markAppPagePropsForUseCache, withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { probeAppPageComponent, probeAppPageLayouts } from "./app-page-execution.js";
 import { collectAppPageSearchParams } from "./app-page-head.js";
 import { makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
@@ -153,10 +153,10 @@ function probeAppPage(options) {
 	if (typeof pageComponent !== "function") return null;
 	const { pageSearchParams } = collectAppPageSearchParams(searchParams);
 	const asyncSearchParams = makeObservedAppPageSearchParamsThenable(pageSearchParams, { observeReactPromiseStatus: true });
-	const result = pageComponent(markAppPagePropsForUseCache({
+	const result = pageComponent(markAppPagePropsForUseCache(withUseCachePageMarker(pageComponent, {
 		params: asyncRouteParams,
 		searchParams: asyncSearchParams
-	}));
+	})));
 	if (isPromiseLike(result)) return result.then(async (resolved) => {
 		await probeReactServerSubtreeForDynamicUsage(resolved);
 		return resolved;

package/dist/server/app-request-stage-independent-entry.js

@@ -1,6 +1,7 @@
+import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
 import "./server-globals.js";
-import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import "./app-rsc-vary.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "./headers.js";
 import { badRequestResponse, notFoundResponse } from "./http-error-responses.js";
@@ -8,7 +9,6 @@ import { isOpenRedirectShaped } from "./open-redirect.js";
 import { cloneRequestWithHeaders, filterInternalHeaders } from "./request-pipeline.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
 import { registerLazyDataCacheHandler } from "../shims/cache-handler.js";
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { getImageOptimizer, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { consumeFrameworkRequestRoute, traceFrameworkRequest } from "./request-tracing.js";
 import { createStaticAssetRequest, finalizeMissingStaticAssetResponse, resolveStaticAssetSignal } from "./worker-utils.js";

package/dist/server/app-route-handler-dispatch.js

@@ -1,6 +1,6 @@
 import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import "../utils/protocol-headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
 import { beginRouteCacheability, getRouteCacheabilityDynamicReason } from "../shims/cacheability-classification.js";
 import { applyCdnResponseBuildIdentityHeaders } from "./cache-control.js";

package/dist/server/app-route-handler-runtime.js

@@ -1,5 +1,5 @@
-import { addBasePathToPathname } from "../utils/base-path.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
+import { addBasePathToPathname } from "../utils/base-path.js";
 import { NextRequest, RequestCookies, sealRequestCookies, sealRequestHeaders } from "../shims/server.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl } from "./request-pipeline.js";
 import { BUILT_IN_REQUEST_PROPERTIES } from "./app-route-request-built-ins.js";

package/dist/server/app-router-entry.js

@@ -1,6 +1,7 @@
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
 import "./server-globals.js";
-import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import "./app-rsc-vary.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM } from "./headers.js";
 import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
@@ -8,7 +9,6 @@ import { isOpenRedirectShaped } from "./open-redirect.js";
 import { cloneRequestWithHeaders, filterInternalHeaders } from "./request-pipeline.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { getImageOptimizer, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { traceFrameworkRequest } from "./request-tracing.js";
 import { createStaticAssetRequest, finalizeMissingStaticAssetResponse, resolveStaticAssetSignal } from "./worker-utils.js";

package/dist/server/app-rsc-handler.d.ts

@@ -1,5 +1,5 @@
-import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "../config/next-config.js";
 import { VinextCacheabilityProbeMode } from "./multi-stage.js";
+import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "../config/next-config.js";
 import { ImageConfig } from "./image-optimization.js";
 import { AppMiddlewareContext, ApplyAppMiddlewareResult } from "./app-middleware.js";
 import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";

package/dist/server/app-rsc-handler.js

@@ -1,16 +1,16 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { PRERENDER_REVALIDATE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { hasMiddlewareRequestHeaderOverrides } from "../utils/middleware-request-headers.js";
+import { requestContextFromRequest } from "../config/request-context.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import { requestContextFromRequest } from "../config/request-context.js";
-import { PRERENDER_REVALIDATE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import "./app-rsc-vary.js";
 import { ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
-import { hasMiddlewareRequestHeaderOverrides } from "../utils/middleware-request-headers.js";
 import { isInterceptionMatchedUrlPath, normalizePath } from "./normalize-path.js";
-import { isExternalUrl } from "../utils/external-url.js";
 import { badRequestResponse, notFoundResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, resolvePublicFileRoute } from "./request-pipeline.js";
 import { normalizeDefaultLocalePathname } from "./pages-i18n.js";

package/dist/server/app-rsc-response-stage.js

@@ -1,7 +1,7 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import "./headers.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders } from "./request-pipeline.js";
 import { applyEffectiveRequestCookieHeader, getDraftModeCookieHeader, headersContextFromRequest, restoreDraftModeTransition } from "../shims/headers.js";

package/dist/server/app-rsc-route-matching.js

@@ -1,6 +1,6 @@
 import { decodeMatchedParams, splitPathSegments, splitPathnameForRouteMatch } from "../routing/utils.js";
-import { buildRouteTrie, trieMatchRaw } from "../routing/route-trie.js";
 import { createAppRouteGraphInterceptionId } from "../routing/app-route-graph.js";
+import { buildRouteTrie, trieMatchRaw } from "../routing/route-trie.js";
 import { extractRawRoutePatternParams, matchRoutePatternPrefix, matchRoutePatternRaw } from "../routing/route-pattern.js";
 import { canonicalizeAppPageParams } from "./app-page-segment-state.js";
 //#region src/server/app-rsc-route-matching.ts

package/dist/server/app-server-action-execution.js

@@ -1,11 +1,11 @@
+import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
+import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
+import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { splitPathSegments } from "../routing/utils.js";
 import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
-import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
-import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
 import { NEXT_ROUTER_STATE_TREE_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER } from "./headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
-import { isExternalUrl } from "../utils/external-url.js";
 import { internalServerErrorResponse, payloadTooLargeResponse } from "./http-error-responses.js";
 import { attachRequestCfMetadata, validateCsrfOrigin, validateServerActionPayload } from "./request-pipeline.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";

package/dist/server/artifact-compatibility.js

@@ -1,5 +1,5 @@
-import { fnv1a64 } from "../utils/hash.js";
 import { isUnknownRecord } from "../utils/record.js";
+import { fnv1a64 } from "../utils/hash.js";
 //#region src/server/artifact-compatibility.ts
 const ARTIFACT_COMPATIBILITY_SCHEMA_VERSION = 1;
 const APP_ELEMENTS_SCHEMA_VERSION = 1;

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

@@ -1,6 +1,6 @@
+import { isUnknownRecord } from "../utils/record.js";
 import { fnv1a64 } from "../utils/hash.js";
 import { parseAppElementsWireElementKey } from "./app-elements-wire-key.js";
-import { isUnknownRecord } from "../utils/record.js";
 import { parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { isNonNegativeSafeInteger } from "../utils/number.js";
 //#region src/server/client-reuse-manifest.ts

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

@@ -36,7 +36,7 @@ export type DevServerInfo = {
   /** Project directory the server is running in. Used to detect stale entries. */
   cwd: string;
 };
-export type DevLockfile = {
+type DevLockfile = {
   /** Update the lock file contents (e.g. once the port is known after listen). */
   update(info: DevServerInfo): void;
   /** Release the lock — deletes the file. Safe to call multiple times. */

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-server.d.ts

@@ -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,
 /**

package/dist/server/dev-server.js

@@ -1,11 +1,12 @@
 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 { sanitizeDestination } from "../config/config-matchers.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { matchRoute } from "../routing/pages-router.js";
-import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
 import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { isDangerousScheme } from "../shims/url-safety.js";
-import { sanitizeDestination } from "../config/config-matchers.js";
 import { extractLocaleFromUrl as extractLocaleFromUrl$1, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
 import { NEVER_CACHE_CONTROL } from "./cache-control.js";
@@ -26,7 +27,6 @@ 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 { isBotUserAgent } from "../utils/html-limited-bots.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";
@@ -315,9 +315,20 @@ function extractLocaleFromUrl(url, i18nConfig) {
 * 4. Render the component to HTML
 * 5. Wrap in _document shell and send response
 */
-function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false, hasMiddleware = false, hasRewrites = false, clientTraceMetadata, htmlLimitedBots, reactStrictMode = false, expireTime = PAGES_CACHE_ONE_YEAR_SECONDS, crossOrigin, buildId = process.env.__VINEXT_BUILD_ID ?? "development") {
+function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false, hasMiddleware = false, hasRewrites = false, clientTraceMetadata, htmlLimitedBots, reactStrictMode = false, expireTime = PAGES_CACHE_ONE_YEAR_SECONDS, crossOrigin, buildId = process.env.__VINEXT_BUILD_ID ?? "development", clientMiddlewareMatcher, classifyPageRoute) {
 	const matcher = fileMatcher ?? createValidFileMatcher();
 	const pagePatterns = routes.map((r) => patternToNextFormat(r.pattern));
+	const pageLoaders = routes.map((route) => ({
+		pattern: patternToNextFormat(route.pattern),
+		moduleSource: createPagesDevModuleUrl(server.config.root, route.filePath, "/"),
+		dataKind: classifyPageRoute?.(route) ?? "none"
+	}));
+	const errorFile = findFileWithExts(pagesDir, "_error", matcher);
+	pageLoaders.push({
+		pattern: "/_error",
+		moduleSource: errorFile ? createPagesDevModuleUrl(server.config.root, errorFile, "/") : "next/error",
+		dataKind: "none"
+	});
 	const _alsRegistration = Promise.all([runner.import("vinext/head-state"), runner.import("vinext/router-state")]);
 	_alsRegistration.catch(() => {});
 	return async (req, res, url, statusCode, isDataReq = false, originalUrl = url) => {
@@ -357,6 +368,9 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 			basePath,
 			buildId,
 			clientTraceMetadata,
+			pageLoaders,
+			hasMiddleware,
+			clientMiddlewareMatcher,
 			locale: locale ?? currentDefaultLocale,
 			locales: i18nConfig?.locales,
 			defaultLocale: currentDefaultLocale,
@@ -798,12 +812,14 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						pageModuleUrl,
 						appModuleUrl,
 						hasMiddleware,
-						routeUrl: requestAsPath
+						routeUrl: requestAsPath,
+						clientMiddlewareMatcher
 					}
 				};
 				const hydrationScript = createPagesDevHydrationScript({
 					appModuleSource,
 					pageModuleSource,
+					pageLoaders,
 					reactStrictMode: reactStrictMode === true,
 					replaceFallbackRoute: true,
 					scriptNonce
@@ -1037,16 +1053,22 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 				query: parseQueryString(url),
 				buildId: context.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development",
 				isFallback: false,
+				locale: context.locale,
+				locales: context.locales,
+				defaultLocale: context.defaultLocale,
 				notFoundSrcPage: context.notFoundSrcPage,
 				__vinext: {
 					pageModuleUrl: errorModuleUrl ?? void 0,
-					appModuleUrl: appModuleUrl ?? void 0
+					appModuleUrl: appModuleUrl ?? void 0,
+					hasMiddleware: context.hasMiddleware,
+					clientMiddlewareMatcher: context.clientMiddlewareMatcher
 				}
 			})}<\/script>`}\n${createPagesDevHydrationScript({
 				appModuleSource,
 				forceRouterReady: true,
 				normalizePageProps: false,
 				pageModuleSource: errorModuleSource,
+				pageLoaders: context.pageLoaders,
 				reactStrictMode: reactStrictMode === true,
 				scriptNonce,
 				setPagePatternsFromNextData: true

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

@@ -1,7 +1,7 @@
 import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcemap-endpoint.js";
-import { readFile } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { readFile } from "node:fs/promises";
 //#region 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*)$/;

package/dist/server/isr-cache.js

@@ -1,5 +1,5 @@
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER } from "../utils/protocol-headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { fnv1a64 } from "../utils/hash.js";

package/dist/server/metadata-route-response.js

@@ -4,6 +4,8 @@ import { decodeMatchedParams } from "../routing/utils.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_METADATA_ROUTE_CACHE_HEADER } from "./headers.js";
 import { notFoundResponse } from "./http-error-responses.js";
+import { beginRouteCacheability, markRouteCacheabilityExplicitResponsePolicy } from "../shims/cacheability-classification.js";
+import { hasCdnResponsePolicy, hasExplicitNonCacheableResponsePolicy } from "./cache-control.js";
 import { isrCacheControl } from "./isr-cache.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
 import { _consumeRequestScopedCacheLife, cacheLifeProfiles } from "../shims/cache-request-state.js";
@@ -52,6 +54,7 @@ function metadataRouteCacheHeader(route) {
 	return CACHE_HEADERS.revalidate;
 }
 function withMetadataRouteCacheHeader(response, route) {
+	if (hasCdnResponsePolicy(response.headers) && !hasExplicitNonCacheableResponsePolicy(response.headers)) markRouteCacheabilityExplicitResponsePolicy();
 	const headers = new Headers(response.headers);
 	if (!headers.has("Cache-Control")) headers.set("Cache-Control", metadataRouteCacheHeader(route));
 	return new Response(response.body, {
@@ -60,6 +63,9 @@ function withMetadataRouteCacheHeader(response, route) {
 		statusText: response.statusText
 	});
 }
+function beginMetadataRouteCacheability(route) {
+	beginRouteCacheability("app-route", route.patternParts ? `/${route.patternParts.join("/")}` : route.servedUrl);
+}
 function getMetadataRouteFunctions(route) {
 	const cached = routeFunctionCache.get(route);
 	if (cached) return cached;
@@ -423,6 +429,7 @@ async function handleMetadataRouteRequest(options) {
 		if (route.type === "sitemap" && route.isDynamic) {
 			if (functions.generateSitemaps) {
 				if (isGeneratedSitemapPath(route, options.cleanPathname)) {
+					beginMetadataRouteCacheability(route);
 					const render = async () => {
 						setCurrentFetchSoftTags(buildMetadataRouteTags(route, options.cleanPathname, []));
 						const response = await handleGeneratedSitemap(route, options.cleanPathname, functions);
@@ -441,6 +448,7 @@ async function handleMetadataRouteRequest(options) {
 		}
 		const match = matchMetadataRoute(route, options.cleanPathname, functions, getUrlParts);
 		if (!match) continue;
+		beginMetadataRouteCacheability(route);
 		const rawParams = route.patternParts ? metadataRouteRawParams(route, match, options.routePathname ?? options.cleanPathname) : Object.create(null);
 		if (route.patternParts) {
 			const runtimeParams = { ...rawParams };

package/dist/server/middleware-runtime.js

@@ -1,12 +1,12 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import "../utils/protocol-headers.js";
+import { shouldKeepMiddlewareHeader } from "../utils/middleware-request-headers.js";
+import { normalizeHost } from "../config/request-context.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { addBasePathToPathname, hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { getRequestExecutionContext, runWithExecutionContext } from "../shims/request-context.js";
 import "./server-globals.js";
-import { normalizeHost } from "../config/request-context.js";
-import "../utils/protocol-headers.js";
 import { MIDDLEWARE_REWRITE_HEADER } from "./headers.js";
-import { shouldKeepMiddlewareHeader } from "../utils/middleware-request-headers.js";
 import { NextFetchEvent, NextRequest } from "../shims/server.js";
 import { normalizePath } from "./normalize-path.js";
 import { matchesMiddleware, matchesMiddlewarePathname } from "./middleware-matcher.js";

package/dist/server/pages-data-route.js

@@ -1,5 +1,5 @@
-import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { MIDDLEWARE_SKIP_HEADER } from "../utils/protocol-headers.js";
+import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 //#region src/server/pages-data-route.ts
 /**

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

@@ -4,6 +4,12 @@ export type PagesDevHydrationOptions = {
   forceRouterReady?: boolean;
   normalizePageProps?: boolean;
   pageModuleSource: string;
+  /** Lazily importable page routes, matching the production client manifest. */
+  pageLoaders?: readonly {
+    pattern: string;
+    moduleSource: string;
+    dataKind?: "static" | "server" | "none";
+  }[];
   reactStrictMode: boolean;
   replaceFallbackRoute?: boolean;
   scriptNonce?: string;

package/dist/server/pages-dev-hydration.js

@@ -1,11 +1,17 @@
 import { resolveClientRuntimeModule } from "../entries/runtime-entry-module.js";
-import { createNonceAttribute } from "./html.js";
+import { createNonceAttribute, safeJsonStringify } from "./html.js";
 //#region src/server/pages-dev-hydration.ts
 function createPagesDevHydrationScript(options) {
 	const nonceAttr = createNonceAttribute(options.scriptNonce);
 	const reactInstanceBootstrapPath = resolveClientRuntimeModule("react-instance-bootstrap");
 	const initializeRouter = options.forceRouterReady ? "_initializePagesRouterReadyFromNextData(nextData, true);" : "_initializePagesRouterReadyFromNextData(nextData);";
-	const pagePatterns = options.setPagePatternsFromNextData ? "window.__VINEXT_PAGE_PATTERNS__ = [nextData.page];" : "";
+	const pagePatterns = options.setPagePatternsFromNextData ? options.pageLoaders ? "window.__VINEXT_PAGE_PATTERNS__ = Object.keys(window.__VINEXT_PAGE_LOADERS__);" : "window.__VINEXT_PAGE_PATTERNS__ = [nextData.page];" : "";
+	const pageLoaders = `{ ${[...options.pageLoaders?.map(({ pattern, moduleSource }) => {
+		const importer = moduleSource === "next/error" ? "import(\"next/error\")" : `loadDevPage(import.meta.env.BASE_URL + ${safeJsonStringify(moduleSource.slice(1))})`;
+		return `${safeJsonStringify(pattern)}: () => ${importer}`;
+	}) ?? [], `[nextData.page]: () => import(${safeJsonStringify(options.pageModuleSource)})`].join(", ")} }`;
+	const ssgPatterns = options.pageLoaders?.filter((route) => route.dataKind === "static").map((route) => route.pattern);
+	const sspPatterns = options.pageLoaders?.filter((route) => route.dataKind === "server").map((route) => route.pattern);
 	const pageProps = options.normalizePageProps === false ? "const pageProps = rawPageProps ?? {};" : "const pageProps = rawPageProps && typeof rawPageProps === \"object\" ? rawPageProps : {};";
 	const hydrationQueryUpdate = options.replaceFallbackRoute ? `
   const initialMatchesMiddleware =
@@ -19,7 +25,7 @@ function createPagesDevHydrationScript(options) {
     await Router.replace(routeUrl || currentUrl, routeUrl ? currentUrl : undefined, { _h: 1, scroll: false, shallow: !nextData.isFallback && !initialMatchesMiddleware });
   }` : "";
 	const createElement = options.appModuleSource ? `
-  const appModule = await import(${JSON.stringify(options.appModuleSource)});
+  const appModule = await import(${safeJsonStringify(options.appModuleSource)});
   const AppComponent = appModule.default;
   window.__VINEXT_APP__ = AppComponent;
   const appRouter = ${options.forceRouterReady ? "{ ...Router, isReady: true }" : "Router"};
@@ -33,7 +39,7 @@ function createPagesDevHydrationScript(options) {
   `;
 	return `
 <script type="module"${nonceAttr}>
-import ${JSON.stringify(reactInstanceBootstrapPath)};
+import ${safeJsonStringify(reactInstanceBootstrapPath)};
 import "vinext/instrumentation-client";
 import React from "react";
 import { hydrateRoot } from "react-dom/client";
@@ -47,13 +53,19 @@ if (nextDataElement?.textContent) {
   window.__VINEXT_DEFAULT_LOCALE__ = window.__NEXT_DATA__.defaultLocale;
 }
 const nextData = window.__NEXT_DATA__;
+window.__VINEXT_MIDDLEWARE_MATCHER__ = nextData.__vinext?.clientMiddlewareMatcher;
 ${initializeRouter}
 const props = nextData.props && typeof nextData.props === "object" ? nextData.props : {};
 const rawPageProps = props.pageProps;
 ${pageProps}
-window.__VINEXT_PAGE_LOADERS__ = { [nextData.page]: () => import(${JSON.stringify(options.pageModuleSource)}) };
+// Other pages must not become static dependencies of this page's HMR proxy.
+// Vite adds ?import to variable imports, so source URLs are bare and base-qualified here.
+const loadDevPage = (source) => import(/* @vite-ignore */ source);
+window.__VINEXT_PAGE_LOADERS__ = ${pageLoaders};
 ${pagePatterns}
-window.__VINEXT_APP_LOADER__ = ${options.appModuleSource ? `() => import(${JSON.stringify(options.appModuleSource)})` : "undefined"};
+${ssgPatterns ? `window.__VINEXT_PAGES_SSG_PATTERNS__ = ${safeJsonStringify(ssgPatterns)};` : ""}
+${sspPatterns ? `window.__VINEXT_PAGES_SSP_PATTERNS__ = ${safeJsonStringify(sspPatterns)};` : ""}
+window.__VINEXT_APP_LOADER__ = ${options.appModuleSource ? `() => import(${safeJsonStringify(options.appModuleSource)})` : "undefined"};
 window.__VINEXT_REACT_STRICT_MODE__ = ${JSON.stringify(options.reactStrictMode)};
 
 async function hydrate() {
@@ -69,7 +81,7 @@ async function hydrate() {
     };
   }
 
-  const pageModule = await import(${JSON.stringify(options.pageModuleSource)});
+  const pageModule = await import(${safeJsonStringify(options.pageModuleSource)});
   const PageComponent = pageModule.default;
   let element;
   ${createElement}

package/dist/server/pages-page-data.js

@@ -1,14 +1,14 @@
+import { isUnknownRecord } from "../utils/record.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { isDangerousScheme } from "../shims/url-safety.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { buildMissIsrCacheControl, decideIsr } from "./isr-decision.js";
-import { isUnknownRecord } from "../utils/record.js";
 import { buildPagesCacheValue, isrCacheControl } from "./isr-cache.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { matchesIfNoneMatch } from "./http-conditional.js";
 import { buildPagesNextDataScript, generatePagesETag, isPagesStreamingBot, requestsNoCache } from "./pages-page-response.js";
 import { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";

package/dist/server/pages-page-handler.js

@@ -1,8 +1,8 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
 import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_CACHE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { extractLocaleFromUrl, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { reportRequestError } from "./instrumentation.js";

package/dist/server/pages-page-response.js

@@ -1,3 +1,4 @@
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { NEXTJS_CACHE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { reportRequestError } from "./instrumentation.js";
@@ -15,7 +16,6 @@ import { setCacheStateHeaders } from "./cache-headers.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { matchesIfNoneMatch } from "./http-conditional.js";
 import React from "react";
 //#region src/server/pages-page-response.ts

package/dist/server/pages-request-pipeline.js

@@ -1,9 +1,9 @@
-import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
-import { patternToNextFormat } from "../routing/route-validation.js";
-import { requestContextFromRequest } from "../config/request-context.js";
 import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
+import { requestContextFromRequest } from "../config/request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
 import { applyMiddlewareRequestHeaders, matchRedirect, matchRewrite, preserveRedirectDestinationQuery, proxyExternalRequest, sanitizeDestination } from "../config/config-matchers.js";
+import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
+import { patternToNextFormat } from "../routing/route-validation.js";
 import { methodNotAllowedResponse, sanitizeMethodNotAllowedHeaders } from "./http-error-responses.js";
 import { cloneRequestWithUrl, normalizeTrailingSlash } from "./request-pipeline.js";
 import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./pages-i18n.js";

package/dist/server/pages-request-stage-entry.js

@@ -1,8 +1,9 @@
+import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { requestContextFromRequest } from "../config/request-context.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
-import { requestContextFromRequest } from "../config/request-context.js";
-import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "./headers.js";
 import { notFoundStaticAssetResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
@@ -11,7 +12,6 @@ import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
 import { CACHEABILITY_REQUEST_STATE } from "../shims/cacheability-classification.js";
 import { applyCdnResponseIdentityHeaders, captureCdnResponsePolicyOverrides, reconcileCdnResponseHeadersAfterOuterPolicy, validateCdnRequest } from "./cache-control.js";
 import { registerLazyDataCacheHandler } from "../shims/cache-handler.js";
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { traceFrameworkRequest } from "./request-tracing.js";
 import { resolveResponseStageCachePolicy } from "./config-headers.js";

package/dist/server/pages-revalidate.js

@@ -1,5 +1,5 @@
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { normalizeDomainHostname } from "../utils/domain-locale.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";

package/dist/server/prerender-route-params.js

@@ -1,6 +1,6 @@
+import { isUnknownRecord } from "../utils/record.js";
 import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
 import "./headers.js";
-import { isUnknownRecord } from "../utils/record.js";
 //#region src/server/prerender-route-params.ts
 function isPrerenderRouteParams(value) {
 	if (!isUnknownRecord(value)) return false;