@qzsy/vinext 0.1.12 → 0.1.122

package/dist/server/app-page-search-params-observation.d.ts

@@ -1,10 +1,12 @@
+import { ThenableParams, ThenableParamsObserver } from "../shims/thenable-params.js";
 import { AppPageSearchParams } from "./app-page-head.js";
-import { ThenableParams } from "../shims/thenable-params.js";
 
 //#region src/server/app-page-search-params-observation.d.ts
 type AppPageSearchParamsObservationOptions = {
+  markDynamic?: boolean;
   observeReactPromiseStatus?: boolean;
 };
+declare function createAppPageSearchParamsObserver(options?: AppPageSearchParamsObservationOptions): ThenableParamsObserver;
 declare function makeObservedAppPageSearchParamsThenable(pageSearchParams: AppPageSearchParams, options?: AppPageSearchParamsObservationOptions): ThenableParams<AppPageSearchParams>;
 //#endregion
-export { makeObservedAppPageSearchParamsThenable };
+export { createAppPageSearchParamsObserver, makeObservedAppPageSearchParamsThenable };

package/dist/server/app-page-search-params-observation.js

@@ -1,15 +1,19 @@
-import { markDynamicUsage, markRenderRequestApiUsage, throwIfInsideCacheScope } from "../shims/headers.js";
+import { markDynamicUsage, markRenderRequestApiUsage, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "../shims/headers.js";
 import { makeThenableParams } from "../shims/thenable-params.js";
 //#region src/server/app-page-search-params-observation.ts
-function markAppPageSearchParamsAccess() {
+function markAppPageSearchParamsAccess(markDynamic) {
+	throwIfStaticGenerationAccessError();
 	throwIfInsideCacheScope("searchParams");
-	markDynamicUsage();
+	if (markDynamic) markDynamicUsage();
 	markRenderRequestApiUsage("searchParams");
 }
-function makeObservedAppPageSearchParamsThenable(pageSearchParams, options = {}) {
-	const observer = { observeParamAccess() {
-		markAppPageSearchParamsAccess();
+function createAppPageSearchParamsObserver(options = {}) {
+	return { observeParamAccess() {
+		markAppPageSearchParamsAccess(options.markDynamic !== false);
 	} };
+}
+function makeObservedAppPageSearchParamsThenable(pageSearchParams, options = {}) {
+	const observer = createAppPageSearchParamsObserver(options);
 	if (options.observeReactPromiseStatus === true) return makeThenableParams(pageSearchParams, {
 		...observer,
 		observeReactPromiseStatus: true
@@ -17,4 +21,4 @@ function makeObservedAppPageSearchParamsThenable(pageSearchParams, options = {})
 	return makeThenableParams(pageSearchParams, observer);
 }
 //#endregion
-export { makeObservedAppPageSearchParamsThenable };
+export { createAppPageSearchParamsObserver, makeObservedAppPageSearchParamsThenable };

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

@@ -24,6 +24,7 @@ function buildRouteHandlerPageCacheTags(pathname, extraTags, routeSegments) {
 async function runInRouteHandlerRevalidationContext(options, renderFn) {
 	await runWithRequestContext(createRequestContext({
 		headersContext: createStaticGenerationHeadersContext({
+			draftModeEnabled: false,
 			draftModeSecret: options.draftModeSecret,
 			dynamicConfig: options.dynamicConfig,
 			routeKind: "route",

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

@@ -1,4 +1,4 @@
-import { setHeadersContext } from "../shims/headers.js";
+import { isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
 import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 import { applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss } from "./app-route-handler-response.js";
 import { createTrackedAppRouteRequest, markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
@@ -8,6 +8,7 @@ import { resolveAppRouteHandlerSpecialError, shouldApplyAppRouteHandlerRevalidat
 function configureAppRouteStaticGenerationContext(options) {
 	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") {
 		setHeadersContext(createStaticGenerationHeadersContext({
+			draftModeEnabled: options.draftModeSecret !== void 0 && isDraftModeRequest(options.request, options.draftModeSecret),
 			draftModeSecret: options.draftModeSecret,
 			dynamicConfig: options.dynamicConfig,
 			routeKind: "route",

package/dist/server/app-route-module-loader.d.ts

@@ -36,11 +36,13 @@ type LazyLoadableSlot = {
   page?: unknown;
   default?: unknown;
   layout?: unknown;
+  configLayouts?: readonly unknown[];
   loading?: unknown;
   error?: unknown;
   __loadPage?: LazyModuleThunk | null;
   __loadDefault?: LazyModuleThunk | null;
   __loadLayout?: LazyModuleThunk | null;
+  __loadConfigLayouts?: LazyModuleLoaderArray | null;
   __loadLoading?: LazyModuleThunk | null;
   __loadError?: LazyModuleThunk | null; /** Hydrated only after an intercept matches, not with the slot's base modules. */
   intercepts?: LazyLoadableIntercept[];

package/dist/server/app-route-module-loader.js

@@ -61,6 +61,7 @@ function ensureAppRouteModulesLoaded(route) {
 		pushFieldLoad(loads, slot, "page", slot.__loadPage);
 		pushFieldLoad(loads, slot, "default", slot.__loadDefault);
 		pushFieldLoad(loads, slot, "layout", slot.__loadLayout);
+		pushArrayLoads(loads, slot.configLayouts, slot.__loadConfigLayouts);
 		pushFieldLoad(loads, slot, "loading", slot.__loadLoading);
 		pushFieldLoad(loads, slot, "error", slot.__loadError);
 	}

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

@@ -5,7 +5,7 @@ import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } fro
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { bufferRequestBodyForHeaderClone, cloneRequestWithHeaders, filterInternalHeaders } from "./request-pipeline.js";
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
-import { resolveStaticAssetSignal } from "./worker-utils.js";
+import { finalizeMissingStaticAssetResponse, resolveStaticAssetSignal } from "./worker-utils.js";
 import { readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import rscHandler, { __assetPrefix, __basePath } from "virtual:vinext-rsc-entry";
 import { registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
@@ -24,7 +24,7 @@ async function handleRequest(request, env, ctx) {
 	} catch {
 		return badRequestResponse();
 	}
-	if (isNextStaticPath(url.pathname, __workerBasePath, __workerAssetPathPrefix)) return notFoundStaticAssetResponse();
+	const missingBuildAsset = isNextStaticPath(url.pathname, __workerBasePath, __workerAssetPathPrefix);
 	{
 		request = await bufferRequestBodyForHeaderClone(request);
 		const prerenderRouteParamsPayload = readTrustedPrerenderRouteParams(request);
@@ -36,14 +36,15 @@ async function handleRequest(request, env, ctx) {
 	const handleFn = () => rscHandler(request, ctx);
 	const result = await (ctx ? runWithExecutionContext(ctx, handleFn) : handleFn());
 	if (result instanceof Response) {
+		let response = result;
 		if (env?.ASSETS) {
 			const assetFetcher = env.ASSETS;
-			const assetResponse = await resolveStaticAssetSignal(result, { fetchAsset: (path) => Promise.resolve(assetFetcher.fetch(new Request(new URL(path, request.url)))) });
-			if (assetResponse) return assetResponse;
+			const assetResponse = await resolveStaticAssetSignal(response, { fetchAsset: (path) => Promise.resolve(assetFetcher.fetch(new Request(new URL(path, request.url)))) });
+			if (assetResponse) response = assetResponse;
 		}
-		return result;
+		return finalizeMissingStaticAssetResponse(response, missingBuildAsset);
 	}
-	if (result === null || result === void 0) return notFoundResponse();
+	if (result === null || result === void 0) return missingBuildAsset ? notFoundStaticAssetResponse() : notFoundResponse();
 	return new Response(String(result), { status: 200 });
 }
 //#endregion

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

@@ -53,7 +53,13 @@ function createRscOnErrorHandler(options) {
 		}
 		if (options.requestInfo && options.errorContext && error) options.reportRequestError(error instanceof Error ? error : new Error(getThrownValueMessage(error)), options.requestInfo, options.errorContext);
 		if (hasDigest(error)) return String(error.digest);
-		if (nodeEnv === "production" && error) return errorDigest(getThrownValueMessage(error) + getThrownValueStack(error));
+		if (error) {
+			const digest = errorDigest(getThrownValueMessage(error) + getThrownValueStack(error));
+			if (error instanceof Error) try {
+				Object.assign(error, { digest });
+			} catch {}
+			return digest;
+		}
 	};
 }
 //#endregion

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

@@ -208,7 +208,10 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	if (isImageOptimizationPath(cleanPathname)) {
 		const imageRedirect = resolveDevImageRedirect(url, [...options.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...options.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES], options.imageConfig?.qualities, { isDev: options.isDev });
 		if (!imageRedirect) return new Response("Invalid image optimization parameters", { status: 400 });
-		return Response.redirect(new URL(imageRedirect, url.origin).href, 302);
+		return new Response(null, {
+			status: 302,
+			headers: { Location: imageRedirect }
+		});
 	}
 	if (options.handleMetadataRouteRequest) {
 		const metadataRouteResponse = await options.handleMetadataRouteRequest(cleanPathname);

package/dist/server/app-rsc-route-matching.d.ts

@@ -31,6 +31,8 @@ type AppRscInterceptForMatching = {
   sourceMatchPattern?: string;
   sourcePageSegments?: readonly string[];
   interceptLayouts: readonly unknown[];
+  interceptLayoutSegments?: readonly (readonly string[])[];
+  interceptBranchSegments?: readonly string[];
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
@@ -46,6 +48,8 @@ type AppRscSiblingInterceptForMatching = {
   sourcePageSegments?: readonly string[];
   slotId: string | null;
   interceptLayouts: readonly unknown[];
+  interceptLayoutSegments?: readonly (readonly string[])[];
+  interceptBranchSegments?: readonly string[];
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
@@ -59,6 +63,7 @@ type AppRscRouteForMatching = {
 };
 type AppRscInterceptMatch = AppRscInterceptLookupEntry & {
   matchedParams: AppRscRouteParams;
+  sourceMatchedParams: AppRscRouteParams;
 };
 type AppRscInterceptLoadState = {
   page: unknown;
@@ -74,6 +79,8 @@ type AppRscInterceptLookupEntry = {
   sourceMatchPatternParts: string[] | null;
   sourcePageSegments: readonly string[] | null;
   interceptLayouts: readonly unknown[];
+  interceptLayoutSegments?: readonly (readonly string[])[];
+  interceptBranchSegments?: readonly string[];
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;

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

@@ -36,12 +36,13 @@ function createAppRscRouteMatcher(routes) {
 				const sourceRoute = routes[concreteSourceRouteIndex];
 				const matchedSourceParams = matchedSourceRoute && entry.sourceMatchPatternParts !== null ? matchedSourceRoute.params : sourceRoute ? matchAppRscRoutePattern(sourceParts, sourceRoute.patternParts) : null;
 				if (matchedSourceParams === null && entry.sourceMatchPatternParts === null) continue;
-				const sourceParams = matchedSourceParams ?? createRouteParams();
+				const sourceParams = matchedSourceParams && entry.sourceMatchPatternParts !== null ? pickPatternParams(matchedSourceParams, entry.sourceMatchPatternParts) : matchedSourceParams ?? createRouteParams();
 				return {
 					...entry,
 					page: entry.__loadState.page,
 					sourceRouteIndex: concreteSourceRouteIndex,
-					matchedParams: mergeMatchedParams(sourceParams, params)
+					matchedParams: mergeMatchedParams(sourceParams, params),
+					sourceMatchedParams: matchedSourceParams ?? createRouteParams()
 				};
 			}
 			return null;
@@ -64,6 +65,24 @@ function matchInterceptSource(sourceParts, entry) {
 	if (patternParts.length === 0) return true;
 	return matchRoutePatternPrefix(sourceParts, patternParts);
 }
+function interceptSegmentPrecedence(segment) {
+	if (!segment.startsWith(":")) return 0;
+	if (segment.endsWith("*")) return 3;
+	if (segment.endsWith("+")) return 2;
+	return 1;
+}
+function compareInterceptTargetPatterns(a, b) {
+	const sharedLength = Math.min(a.targetPatternParts.length, b.targetPatternParts.length);
+	for (let index = 0; index < sharedLength; index++) {
+		const aSegment = a.targetPatternParts[index];
+		const bSegment = b.targetPatternParts[index];
+		const precedence = interceptSegmentPrecedence(aSegment) - interceptSegmentPrecedence(bSegment);
+		if (precedence !== 0) return precedence;
+		if (aSegment !== bSegment) return aSegment.localeCompare(bSegment);
+	}
+	const lengthDifference = a.targetPatternParts.length - b.targetPatternParts.length;
+	return lengthDifference !== 0 ? lengthDifference : a.targetPattern.localeCompare(b.targetPattern);
+}
 function createInterceptLookup(routes) {
 	const patternToIndex = new Map(routes.map((r, i) => [r.pattern, i]));
 	const interceptLookup = [];
@@ -85,6 +104,8 @@ function createInterceptLookup(routes) {
 					sourceMatchPatternParts,
 					sourcePageSegments: intercept.sourcePageSegments ?? null,
 					interceptLayouts: intercept.interceptLayouts,
+					interceptLayoutSegments: intercept.interceptLayoutSegments,
+					interceptBranchSegments: intercept.interceptBranchSegments,
 					__loadInterceptLayouts: intercept.__loadInterceptLayouts,
 					page: intercept.page,
 					__pageLoader: intercept.__pageLoader,
@@ -110,6 +131,8 @@ function createInterceptLookup(routes) {
 				sourceMatchPatternParts,
 				sourcePageSegments: intercept.sourcePageSegments ?? null,
 				interceptLayouts: intercept.interceptLayouts,
+				interceptLayoutSegments: intercept.interceptLayoutSegments,
+				interceptBranchSegments: intercept.interceptBranchSegments,
 				__loadInterceptLayouts: intercept.__loadInterceptLayouts,
 				page: intercept.page,
 				__pageLoader: intercept.__pageLoader,
@@ -122,7 +145,7 @@ function createInterceptLookup(routes) {
 			});
 		}
 	}
-	return interceptLookup;
+	return interceptLookup.sort(compareInterceptTargetPatterns);
 }
 function matchAppRscRoutePattern(urlParts, patternParts) {
 	return matchRoutePattern(urlParts, patternParts);
@@ -130,5 +153,15 @@ function matchAppRscRoutePattern(urlParts, patternParts) {
 function mergeMatchedParams(sourceParams, targetParams) {
 	return Object.assign(createRouteParams(), sourceParams, targetParams);
 }
+function pickPatternParams(params, patternParts) {
+	const picked = createRouteParams();
+	for (const patternPart of patternParts) {
+		if (!patternPart.startsWith(":")) continue;
+		const paramName = patternPart.endsWith("+") || patternPart.endsWith("*") ? patternPart.slice(1, -1) : patternPart.slice(1);
+		const value = params[paramName];
+		if (value !== void 0) picked[paramName] = value;
+	}
+	return picked;
+}
 //#endregion
 export { SIBLING_PAGE_INTERCEPT_SLOT_KEY, createAppRscRouteMatcher, matchAppRscRoutePattern };

package/dist/server/app-segment-config.d.ts

@@ -22,6 +22,7 @@ type ResolveAppPageSegmentConfigOptions = {
   layouts?: readonly (AppRouteSegmentConfigModule | null | undefined)[];
   page?: AppRouteSegmentConfigModule | null;
   parallelPages?: readonly (AppRouteSegmentConfigModule | null | undefined)[];
+  parallelSegments?: readonly (AppRouteSegmentConfigModule | null | undefined)[];
 };
 /**
  * Resolve the route segment config that applies to an App page route.

package/dist/server/app-segment-config.js

@@ -59,9 +59,13 @@ function resolveAppPageSegmentConfig(options) {
 	let hasOnlyCache = false;
 	let hasOnlyNoStore = false;
 	let hasParentDefaultNoStore = false;
+	let hasForceDynamic = false;
 	for (const segment of segments) {
 		if (!segment) continue;
-		if (isRouteSegmentDynamic(segment.dynamic)) config.dynamicConfig = segment.dynamic;
+		if (isRouteSegmentDynamic(segment.dynamic)) {
+			if (segment.dynamic === "force-dynamic") hasForceDynamic = true;
+			config.dynamicConfig = hasForceDynamic ? "force-dynamic" : segment.dynamic;
+		}
 		if (isRouteSegmentRuntime(segment.runtime)) config.runtime = segment.runtime;
 		if (segment.dynamicParams === false) config.dynamicParamsConfig = false;
 		else if (segment.dynamicParams === true && config.dynamicParamsConfig !== false) config.dynamicParamsConfig = true;
@@ -72,7 +76,7 @@ function resolveAppPageSegmentConfig(options) {
 			if (fetchCache === "force-no-store") hasForceNoStore = true;
 			if (fetchCache === "only-cache") hasOnlyCache = true;
 			if (fetchCache === "only-no-store") hasOnlyNoStore = true;
-			if ((hasForceCache || hasOnlyCache) && (hasForceNoStore || hasOnlyNoStore)) throw new Error(describeFetchCacheConflict(fetchCache));
+			if (hasForceCache && hasForceNoStore || !hasForceCache && !hasForceNoStore && hasOnlyCache && hasOnlyNoStore) throw new Error(describeFetchCacheConflict(fetchCache));
 			if (fetchCache === "default-no-store") hasParentDefaultNoStore = true;
 			if (hasForceCache) config.fetchCache = "force-cache";
 			else if (hasForceNoStore) config.fetchCache = "force-no-store";
@@ -82,6 +86,32 @@ function resolveAppPageSegmentConfig(options) {
 		}
 		config.revalidateSeconds = resolveRevalidateSeconds(config.revalidateSeconds, segment.revalidate);
 	}
+	for (const segment of options.parallelSegments ?? []) {
+		if (!segment) continue;
+		if (segment.dynamic === "force-dynamic") {
+			hasForceDynamic = true;
+			config.dynamicConfig = "force-dynamic";
+		} else if (config.dynamicConfig === void 0 && isRouteSegmentDynamic(segment.dynamic)) config.dynamicConfig = segment.dynamic;
+		if (segment.dynamicParams === false) config.dynamicParamsConfig = false;
+		else if (segment.dynamicParams === true && config.dynamicParamsConfig === void 0) config.dynamicParamsConfig = true;
+		if (config.runtime === void 0 && isRouteSegmentRuntime(segment.runtime)) config.runtime = segment.runtime;
+		if (isRouteSegmentFetchCache(segment.fetchCache)) {
+			const fetchCache = segment.fetchCache;
+			if (hasParentDefaultNoStore && (fetchCache === "auto" || isCacheFetchCacheMode(fetchCache))) throw new Error(describeFetchCacheConflict(fetchCache));
+			if (fetchCache === "force-cache") hasForceCache = true;
+			if (fetchCache === "force-no-store") hasForceNoStore = true;
+			if (fetchCache === "only-cache") hasOnlyCache = true;
+			if (fetchCache === "only-no-store") hasOnlyNoStore = true;
+			if (hasForceCache && hasForceNoStore || !hasForceCache && !hasForceNoStore && hasOnlyCache && hasOnlyNoStore) throw new Error(describeFetchCacheConflict(fetchCache));
+			if (fetchCache === "default-no-store") hasParentDefaultNoStore = true;
+			if (hasForceCache) config.fetchCache = "force-cache";
+			else if (hasForceNoStore) config.fetchCache = "force-no-store";
+			else if (hasOnlyCache) config.fetchCache = "only-cache";
+			else if (hasOnlyNoStore) config.fetchCache = "only-no-store";
+			else if (config.fetchCache === void 0) config.fetchCache = fetchCache;
+		}
+		config.revalidateSeconds = resolveRevalidateSeconds(config.revalidateSeconds, segment.revalidate);
+	}
 	for (const segment of [options.page, ...options.parallelPages ?? []]) {
 		if (!segment) continue;
 		config.dynamicStaleTimeSeconds = resolveDynamicStaleTimeSeconds(config.dynamicStaleTimeSeconds, segment.unstable_dynamicStaleTime);

package/dist/server/app-server-action-execution.d.ts

@@ -76,6 +76,7 @@ type AppServerActionMatch<TRoute extends AppServerActionRoute> = {
 };
 type AppServerActionIntercept<TPage = unknown> = {
   matchedParams: AppPageParams;
+  sourceMatchedParams?: AppPageParams;
   page: TPage;
   slotId?: string | null;
   slotKey: string;
@@ -91,6 +92,8 @@ type BuildServerActionPageElementOptions<TRoute extends AppServerActionRoute, TI
   route: TRoute;
   searchParams: URLSearchParams;
   renderMode: AppRscRenderMode;
+  observeMetadataSearchParamsAccess?: boolean;
+  observePageSearchParamsAccess?: boolean;
 };
 type AppServerActionRscModel<TElement> = {
   /**
@@ -148,6 +151,7 @@ type HandleServerActionRscRequestOptions<TElement, TRoute extends AppServerActio
   createRscOnErrorHandler: (request: Request, pathname: string, pattern: string) => (error: unknown) => unknown;
   createTemporaryReferenceSet: () => TTemporaryReferences;
   decodeReply: (body: string | FormData, options: DecodeServerActionReplyOptions<TTemporaryReferences>) => Promise<unknown[]> | unknown[];
+  draftModeSecret: string;
   /**
    * Hydrate a route's lazy page/route-handler modules before reading
    * `route.page` / `route.routeHandler` on action redirect targets and

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

@@ -5,7 +5,7 @@ import { isExternalUrl } from "../config/config-matchers.js";
 import { internalServerErrorResponse, payloadTooLargeResponse } from "./http-error-responses.js";
 import { validateCsrfOrigin, validateServerActionPayload } from "./request-pipeline.js";
 import { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI } from "./app-rsc-render-mode.js";
-import { headersContextFromRequest, setHeadersContext } from "../shims/headers.js";
+import { headersContextFromRequest, isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
 import { getAndClearActionRevalidationKind } from "../shims/cache-request-state.js";
 import { setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault } from "../shims/fetch-cache.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
@@ -20,7 +20,18 @@ import { buildAppPageTags } from "./implicit-tags.js";
 import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
 import { getSetCookieName } from "./cookie-utils.js";
+import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 //#region src/server/app-server-action-execution.ts
+function prepareActionPageRerenderContext(options) {
+	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") setHeadersContext(createStaticGenerationHeadersContext({
+		draftModeEnabled: isDraftModeRequest(options.request, options.draftModeSecret),
+		draftModeSecret: options.draftModeSecret,
+		dynamicConfig: options.dynamicConfig,
+		routeKind: "page",
+		routePattern: options.routePattern
+	}));
+	return options.dynamicConfig === "force-static" ? new URLSearchParams() : options.searchParams;
+}
 /**
 * Matches Next.js' server action argument cap to prevent stack overflow in
 * Function.prototype.apply when decoding hostile action payloads.
@@ -623,14 +634,22 @@ async function handleServerActionRscRequest(options) {
 				url: redirectTarget
 			});
 			setHeadersContext(headersContextFromRequest(redirectRenderRequest));
+			const redirectDynamicConfig = options.resolveRouteDynamicConfig?.(targetMatch.route);
+			const redirectSearchParams = prepareActionPageRerenderContext({
+				draftModeSecret: options.draftModeSecret,
+				dynamicConfig: redirectDynamicConfig,
+				request: redirectRenderRequest,
+				routePattern: targetMatch.route.pattern,
+				searchParams: redirectTarget.searchParams
+			});
 			const redirectNavigationParams = resolveAppPageNavigationParams(targetMatch.route, targetMatch.params, targetPathname, null);
 			options.setNavigationContext({
 				pathname: targetPathname,
-				searchParams: redirectTarget.searchParams,
+				searchParams: redirectSearchParams,
 				params: redirectNavigationParams
 			});
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(targetMatch.route) ?? null);
-			setCurrentForceDynamicFetchDefault(options.resolveRouteDynamicConfig?.(targetMatch.route) === "force-dynamic");
+			setCurrentForceDynamicFetchDefault(redirectDynamicConfig === "force-dynamic");
 			setCurrentFetchSoftTags(buildServerActionPageTags(targetMatch.route, targetPathname));
 			const element = options.buildPageElement({
 				cleanPathname: targetPathname,
@@ -640,8 +659,10 @@ async function handleServerActionRscRequest(options) {
 				params: targetMatch.params,
 				request: redirectRenderRequest,
 				route: targetMatch.route,
-				searchParams: redirectTarget.searchParams,
-				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI
+				searchParams: redirectSearchParams,
+				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,
+				observeMetadataSearchParamsAccess: redirectDynamicConfig !== "force-static",
+				observePageSearchParamsAccess: redirectDynamicConfig !== "force-static"
 			});
 			const onRenderError = options.createRscOnErrorHandler(redirectRenderRequest, targetPathname, targetMatch.route.pattern);
 			return createServerActionRscResponse(await options.renderToReadableStream({
@@ -702,14 +723,22 @@ async function handleServerActionRscRequest(options) {
 				toInterceptOpts: options.toInterceptOpts
 			});
 			const resolvedActionNavigationParams = resolveAppPageNavigationParams(actionRerenderTarget.route, actionRerenderTarget.navigationParams, options.cleanPathname, actionRerenderTarget.interceptOpts);
+			await options.ensureRouteLoaded?.(actionRerenderTarget.route);
+			const actionRerenderDynamicConfig = options.resolveRouteDynamicConfig?.(actionRerenderTarget.route);
+			const actionRerenderSearchParams = prepareActionPageRerenderContext({
+				draftModeSecret: options.draftModeSecret,
+				dynamicConfig: actionRerenderDynamicConfig,
+				request: options.request,
+				routePattern: actionRerenderTarget.route.pattern,
+				searchParams: options.searchParams
+			});
 			options.setNavigationContext({
 				pathname: options.cleanPathname,
-				searchParams: options.searchParams,
+				searchParams: actionRerenderSearchParams,
 				params: resolvedActionNavigationParams
 			});
-			await options.ensureRouteLoaded?.(actionRerenderTarget.route);
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(actionRerenderTarget.route) ?? null);
-			setCurrentForceDynamicFetchDefault(options.resolveRouteDynamicConfig?.(actionRerenderTarget.route) === "force-dynamic");
+			setCurrentForceDynamicFetchDefault(actionRerenderDynamicConfig === "force-dynamic");
 			setCurrentFetchSoftTags(buildServerActionPageTags(actionRerenderTarget.route, options.cleanPathname));
 			element = options.buildPageElement({
 				cleanPathname: options.cleanPathname,
@@ -719,8 +748,10 @@ async function handleServerActionRscRequest(options) {
 				params: actionRerenderTarget.params,
 				request: options.request,
 				route: actionRerenderTarget.route,
-				searchParams: options.searchParams,
-				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI
+				searchParams: actionRerenderSearchParams,
+				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,
+				observeMetadataSearchParamsAccess: actionRerenderDynamicConfig !== "force-static",
+				observePageSearchParamsAccess: actionRerenderDynamicConfig !== "force-static"
 			});
 			errorPattern = actionRerenderTarget.route.pattern;
 		} else {

package/dist/server/app-static-generation.d.ts

@@ -3,6 +3,7 @@ import { HeadersContext } from "../shims/headers.js";
 //#region src/server/app-static-generation.d.ts
 type AppStaticGenerationRouteKind = "page" | "route";
 type CreateStaticGenerationHeadersContextOptions = {
+  draftModeEnabled?: boolean;
   draftModeSecret?: string;
   dynamicConfig?: string;
   routeKind: AppStaticGenerationRouteKind;

package/dist/server/app-static-generation.js

@@ -9,6 +9,7 @@ function createStaticGenerationHeadersContext(options) {
 	const context = {
 		headers: new Headers(),
 		cookies: /* @__PURE__ */ new Map(),
+		draftModeEnabled: options.draftModeEnabled,
 		draftModeSecret: options.draftModeSecret
 	};
 	if (options.dynamicConfig === "force-static") context.forceStatic = true;

package/dist/server/headers.d.ts

@@ -97,6 +97,8 @@ declare const NEXT_ROUTER_STATE_TREE_HEADER = "Next-Router-State-Tree";
 declare const NEXT_ROUTER_PREFETCH_HEADER = "Next-Router-Prefetch";
 declare const NEXT_ROUTER_SEGMENT_PREFETCH_HEADER = "Next-Router-Segment-Prefetch";
 declare const NEXT_URL_HEADER = "Next-Url";
+declare const NEXT_REQUEST_ID_HEADER = "x-nextjs-request-id";
+declare const NEXT_HTML_REQUEST_ID_HEADER = "x-nextjs-html-request-id";
 /** Lowercase flight header variants used in middleware forwarding. */
 declare const FLIGHT_HEADERS: readonly string[];
 /**
@@ -111,4 +113,4 @@ declare const INTERNAL_HEADERS: string[];
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 declare const VINEXT_INTERNAL_HEADERS: string[];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };

package/dist/server/headers.js

@@ -101,6 +101,8 @@ const NEXT_ROUTER_STATE_TREE_HEADER = "Next-Router-State-Tree";
 const NEXT_ROUTER_PREFETCH_HEADER = "Next-Router-Prefetch";
 const NEXT_ROUTER_SEGMENT_PREFETCH_HEADER = "Next-Router-Segment-Prefetch";
 const NEXT_URL_HEADER = "Next-Url";
+const NEXT_REQUEST_ID_HEADER = "x-nextjs-request-id";
+const NEXT_HTML_REQUEST_ID_HEADER = "x-nextjs-html-request-id";
 /** Lowercase flight header variants used in middleware forwarding. */
 const FLIGHT_HEADERS = [
 	"rsc",
@@ -133,4 +135,4 @@ const INTERNAL_HEADERS = [
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 const VINEXT_INTERNAL_HEADERS = [VINEXT_PRERENDER_ROUTE_PARAMS_HEADER];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };

package/dist/server/prod-server.js

@@ -819,13 +819,12 @@ async function startAppRouterServer(options) {
 				return;
 			}
 		}
+		let missingBuildAsset = false;
 		{
 			const assetLookupPath = resolveAppRouterAssetPath(pathname, appAssetPathPrefix, appRouterAssetPrefix);
 			if (assetLookupPath) {
 				if (await tryServeStatic(req, res, clientDir, assetLookupPath, compress, staticCache)) return;
-				res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
-				res.end("Not Found");
-				return;
+				missingBuildAsset = true;
 			}
 		}
 		if (isImageOptimizationPath(pathname)) {
@@ -868,6 +867,12 @@ async function startAppRouterServer(options) {
 				await sendWebResponse(notFoundResponse({ headers: toWebHeaders(staticResponseHeaders) }), req, res, compress);
 				return;
 			}
+			if (missingBuildAsset && response.status === 404) {
+				cancelResponseBody(response);
+				res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
+				res.end("Not Found");
+				return;
+			}
 			await sendWebResponse(response, req, res, compress);
 		} catch (e) {
 			console.error("[vinext] Server error:", e);
@@ -1000,11 +1005,9 @@ async function startPagesRouterServer(options) {
 		}
 		const staticLookupPath = stripBasePath(pathname, basePath);
 		const pagesAssetLookup = resolveAppRouterAssetPath(pathname, pagesAssetPathPrefix, assetPrefix);
+		const missingBuildAsset = pagesAssetLookup !== null;
 		if (pagesAssetLookup) {
 			if (await tryServeStatic(req, res, clientDir, pagesAssetLookup, compress, staticCache)) return;
-			res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
-			res.end("Not Found");
-			return;
 		}
 		if (isImageOptimizationPath(pathname) || isImageOptimizationPath(staticLookupPath)) {
 			const params = parseImageParams(new URL(rawUrl, "http://localhost"), allowedImageWidths, pagesImageConfig?.qualities);
@@ -1089,6 +1092,12 @@ async function startPagesRouterServer(options) {
 			if (result.type === "handled") return;
 			if (result.type === "response") {
 				const { response } = result;
+				if (missingBuildAsset && response.status === 404) {
+					cancelResponseBody(response);
+					res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
+					res.end("Not Found");
+					return;
+				}
 				if (isVinextStreamedHtmlResponse(response) || !response.body || result.defaultContentType === void 0) {
 					await sendWebResponse(response, req, res, compress);
 					return;

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

@@ -1,7 +1,8 @@
 //#region src/server/worker-utils.d.ts
+declare function finalizeMissingStaticAssetResponse(response: Response, missingBuildAsset: boolean): Response;
 declare function mergeHeaders(response: Response, extraHeaders: Record<string, string | string[]>, statusOverride?: number): Response;
 declare function resolveStaticAssetSignal(signalResponse: Response, options: {
   fetchAsset(path: string): Promise<Response>;
 }): Promise<Response | null>;
 //#endregion
-export { mergeHeaders, resolveStaticAssetSignal };
+export { finalizeMissingStaticAssetResponse, mergeHeaders, resolveStaticAssetSignal };

package/dist/server/worker-utils.js

@@ -1,4 +1,5 @@
 import { VINEXT_STATIC_FILE_HEADER } from "./headers.js";
+import { notFoundStaticAssetResponse } from "./http-error-responses.js";
 //#region src/server/worker-utils.ts
 /**
 * Shared utilities for Cloudflare Worker entries.
@@ -29,6 +30,11 @@ function cancelResponseBody(response) {
 	if (!body || body.locked) return;
 	body.cancel().catch(() => {});
 }
+function finalizeMissingStaticAssetResponse(response, missingBuildAsset) {
+	if (!missingBuildAsset || response.status !== 404) return response;
+	cancelResponseBody(response);
+	return notFoundStaticAssetResponse();
+}
 function buildHeaderRecord(response, omitNames = []) {
 	const omitted = new Set(omitNames.map((name) => name.toLowerCase()));
 	const headers = {};
@@ -96,4 +102,4 @@ async function resolveStaticAssetSignal(signalResponse, options) {
 	return mergeHeaders(assetResponse, extraHeaders, assetResponse.ok && signalResponse.status !== 200 ? signalResponse.status : void 0);
 }
 //#endregion
-export { mergeHeaders, resolveStaticAssetSignal };
+export { finalizeMissingStaticAssetResponse, mergeHeaders, resolveStaticAssetSignal };