vinext 1.0.0-beta.2 → 1.0.0-beta.3

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

@@ -1,12 +1,13 @@
-import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import { VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
+import { VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import { ACTION_REVALIDATED_HEADER } from "./headers.js";
 import { requestContextFromRequest } from "../config/request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, resolvePublicFileRoute } from "./request-pipeline.js";
+import { isOnDemandRevalidateRequest } from "./isr-cache.js";
 import { headersContextFromRequest } from "../shims/headers.js";
 import { ensureFetchPatch, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { mergeRewriteQuery } from "../utils/query.js";
@@ -190,8 +191,9 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	};
 	let didMiddlewareRewrite = false;
 	let didMiddlewareRewritePathname = false;
-	if (options.runMiddleware) {
-		const middlewareResult = await options.runMiddleware({
+	const runMiddleware = isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) ? void 0 : options.runMiddleware;
+	if (runMiddleware) {
+		const middlewareResult = await runMiddleware({
 			cleanPathname,
 			context: middlewareContext,
 			hadBasePath,
@@ -480,7 +482,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	}
 	if (pagesDataRequest) {
 		options.clearRequestContext();
-		if (options.runMiddleware && (middlewareContext.status === null || middlewareContext.status === 200 || middlewareContext.status === 404)) {
+		if (runMiddleware && (middlewareContext.status === null || middlewareContext.status === 200 || middlewareContext.status === 404)) {
 			const response = buildNextDataNotFoundResponse();
 			const headers = new Headers(response.headers);
 			headers.set("x-nextjs-matched-path", matchPathname(canonicalPathname));
@@ -632,9 +634,11 @@ function createAppRscHandler(options) {
 		const pagesDataNormalization = options.renderPagesFallback && pagesDataCandidate ? normalizePagesDataRequest(pagesDataCandidate, options.buildId, "", typeof options.runMiddleware === "function" && options.trailingSlash) : null;
 		if (pagesDataNormalization?.notFoundResponse) return pagesDataNormalization.notFoundResponse;
 		const isPagesDataRequest = pagesDataNormalization?.isDataReq === true;
+		const executionContext = isExecutionContextLike(ctx) ? ctx : getRequestExecutionContext() ?? null;
 		const prerenderRouteParamsPayload = readTrustedPrerenderRouteParams(rawRequest);
 		const isTrustedSpeculativePrerender = process.env.VINEXT_PRERENDER === "1" && rawRequest.headers.get("x-vinext-prerender-secret") !== null && rawRequest.headers.get("x-vinext-prerender-speculative") === "1";
-		const filteredHeaders = filterInternalHeaders(rawRequest.headers);
+		const filteredHeaders = executionContext?.isInternalPagesRevalidation ? new Headers(rawRequest.headers) : filterInternalHeaders(rawRequest.headers);
+		filteredHeaders.delete(VINEXT_REVALIDATE_HOST_HEADER);
 		if (mwCtx !== null) filteredHeaders.set(VINEXT_MW_CTX_HEADER, mwCtx);
 		const prerenderRouteParamsHeader = serializePrerenderRouteParamsHeader(prerenderRouteParamsPayload);
 		if (prerenderRouteParamsHeader !== null) filteredHeaders.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
@@ -647,12 +651,12 @@ function createAppRscHandler(options) {
 		}
 		const request = cloneRequestWithHeaders(appRequest, filteredHeaders);
 		const pagesDataRequest = pagesDataNormalization?.isDataReq ? cloneRequestWithHeaders(pagesDataCandidate, filteredHeaders) : null;
-		const executionContext = isExecutionContextLike(ctx) ? ctx : getRequestExecutionContext() ?? null;
-		return runWithRequestContext(createRequestContext({
+		const requestContext = createRequestContext({
 			headersContext: headersContextFromRequest(request, { draftModeSecret: options.draftModeSecret }),
 			executionContext,
 			unstableCacheRevalidation: "background"
-		}), () => runWithPrerenderWorkUnit(async () => {
+		});
+		const responsePromise = runWithRequestContext(requestContext, () => runWithPrerenderWorkUnit(async () => {
 			ensureFetchPatch();
 			const preMiddlewareRequestContext = requestContextFromRequest(request);
 			let response;
@@ -669,6 +673,14 @@ function createAppRscHandler(options) {
 				requestContext: preMiddlewareRequestContext
 			});
 		}, { route: () => new URL(request.url).pathname }));
+		let response;
+		try {
+			response = await responsePromise;
+		} catch (error) {
+			await closeAfterResponse(requestContext);
+			throw error;
+		}
+		return closeAfterResponseWithBody(response, requestContext);
 	};
 }
 //#endregion

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

@@ -33,8 +33,11 @@ type AppRscInterceptForMatching = {
   interceptLayouts: readonly unknown[];
   interceptLayoutSegments?: readonly (readonly string[])[];
   interceptBranchSegments?: readonly string[];
+  interceptLoadings?: readonly unknown[];
+  interceptLoadingTreePositions?: readonly number[];
   interceptNotFoundBranchSegments?: readonly string[];
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
+  __loadInterceptLoadings?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
   notFound?: unknown;
@@ -54,8 +57,11 @@ type AppRscSiblingInterceptForMatching = {
   interceptLayouts: readonly unknown[];
   interceptLayoutSegments?: readonly (readonly string[])[];
   interceptBranchSegments?: readonly string[];
+  interceptLoadings?: readonly unknown[];
+  interceptLoadingTreePositions?: readonly number[];
   interceptNotFoundBranchSegments?: readonly string[];
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
+  __loadInterceptLoadings?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
   notFound?: unknown;
@@ -93,8 +99,11 @@ type AppRscInterceptLookupEntry = {
   interceptLayouts: readonly unknown[];
   interceptLayoutSegments?: readonly (readonly string[])[];
   interceptBranchSegments?: readonly string[];
+  interceptLoadings?: readonly unknown[];
+  interceptLoadingTreePositions?: readonly number[];
   interceptNotFoundBranchSegments?: readonly string[];
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
+  __loadInterceptLoadings?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
   notFound: unknown;

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

@@ -170,8 +170,11 @@ function createInterceptLookup(routes) {
 					interceptLayouts: intercept.interceptLayouts,
 					interceptLayoutSegments: intercept.interceptLayoutSegments,
 					interceptBranchSegments: intercept.interceptBranchSegments,
+					interceptLoadings: intercept.interceptLoadings,
+					interceptLoadingTreePositions: intercept.interceptLoadingTreePositions,
 					interceptNotFoundBranchSegments: intercept.interceptNotFoundBranchSegments,
 					__loadInterceptLayouts: intercept.__loadInterceptLayouts,
+					__loadInterceptLoadings: intercept.__loadInterceptLoadings,
 					page: intercept.page,
 					__pageLoader: intercept.__pageLoader,
 					notFound: intercept.notFound,
@@ -203,8 +206,11 @@ function createInterceptLookup(routes) {
 				interceptLayouts: intercept.interceptLayouts,
 				interceptLayoutSegments: intercept.interceptLayoutSegments,
 				interceptBranchSegments: intercept.interceptBranchSegments,
+				interceptLoadings: intercept.interceptLoadings,
+				interceptLoadingTreePositions: intercept.interceptLoadingTreePositions,
 				interceptNotFoundBranchSegments: intercept.interceptNotFoundBranchSegments,
 				__loadInterceptLayouts: intercept.__loadInterceptLayouts,
+				__loadInterceptLoadings: intercept.__loadInterceptLoadings,
 				page: intercept.page,
 				__pageLoader: intercept.__pageLoader,
 				notFound: intercept.notFound,

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

@@ -6,13 +6,12 @@ import "./app-elements.js";
 import { isPprFallbackShellAbortError } from "../shims/ppr-fallback-shell.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
-import { ServerInsertedHTMLContext, clearServerInsertedHTML, getBfcacheIdMapContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "../shims/navigation-context-state.js";
-import "../shims/navigation-server.js";
-import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonStringify } from "./html.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 import { setPagesClientAssets } from "./pages-client-assets.js";
+import { ServerInsertedHTMLContext, clearServerInsertedHTML, getBfcacheIdMapContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "../shims/navigation-context-state.js";
+import "../shims/navigation-server.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
@@ -22,6 +21,7 @@ import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { runWithRootParamsScope } from "../shims/root-params.js";
+import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { renderBeforeInteractiveInlineScripts } from "./before-interactive-head.js";
 import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js";
@@ -123,7 +123,7 @@ function renderFontHtml(fontData, nonce, options = {}) {
 	const nonceAttr = createNonceAttribute(nonce);
 	const includeStyles = options.includeStyles ?? true;
 	for (const url of fontData.links ?? []) fontHTML += `<link rel="stylesheet"${nonceAttr} href="${escapeHtmlAttr(appendAssetDeploymentIdQuery(url))}" />\n`;
-	for (const preload of fontData.preloads ?? []) fontHTML += `<link rel="preload"${nonceAttr} href="${escapeHtmlAttr(appendAssetDeploymentIdQuery(preload.href))}" as="font" type="${escapeHtmlAttr(preload.type)}" crossorigin />\n`;
+	for (const preload of fontData.preloads ?? []) fontHTML += `<link rel="preload"${nonceAttr} href="${escapeHtmlAttr(preload.href)}" as="font" type="${escapeHtmlAttr(preload.type)}" crossorigin />\n`;
 	if (includeStyles && fontData.styles && fontData.styles.length > 0) fontHTML += `<style data-vinext-fonts${nonceAttr}>${fontData.styles.join("\n")}</style>\n`;
 	return fontHTML;
 }

package/dist/server/cache-control.d.ts

@@ -26,7 +26,7 @@ declare function applyCdnResponseHeaders(headers: Headers, input: CdnCacheableHe
  * Next.js source:
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/lib/cache-control.ts
  */
-declare function buildRevalidateCacheControl(revalidateSeconds: number, expireSeconds?: number): string;
+declare function buildRevalidateCacheControl(revalidateSeconds: number | false, expireSeconds?: number): string;
 /**
  * Builds Cache-Control for ISR cache reads. HIT responses and STALE responses
  * with stored expire metadata use the same route policy because Next.js derives
@@ -34,6 +34,6 @@ declare function buildRevalidateCacheControl(revalidateSeconds: number, expireSe
  * STALE entries without expire metadata keep vinext's legacy `s-maxage=0`
  * fallback so older cache entries are not treated as newly fresh downstream.
  */
-declare function buildCachedRevalidateCacheControl(cacheState: "HIT" | "STALE", revalidateSeconds: number, expireSeconds?: number): string;
+declare function buildCachedRevalidateCacheControl(cacheState: "HIT" | "STALE", revalidateSeconds: number | false, expireSeconds?: number): string;
 //#endregion
 export { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl, buildRevalidateCacheControl, shouldUseNextDeployCacheControl };

package/dist/server/cache-control.js

@@ -48,6 +48,7 @@ function applyCdnResponseHeaders(headers, input) {
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/lib/cache-control.ts
 */
 function buildRevalidateCacheControl(revalidateSeconds, expireSeconds) {
+	if (revalidateSeconds === false) return STATIC_CACHE_CONTROL;
 	if (expireSeconds === void 0) return `s-maxage=${revalidateSeconds}, stale-while-revalidate`;
 	if (revalidateSeconds >= expireSeconds) return `s-maxage=${revalidateSeconds}`;
 	return `s-maxage=${revalidateSeconds}, stale-while-revalidate=${expireSeconds - revalidateSeconds}`;
@@ -60,7 +61,7 @@ function buildRevalidateCacheControl(revalidateSeconds, expireSeconds) {
 * fallback so older cache entries are not treated as newly fresh downstream.
 */
 function buildCachedRevalidateCacheControl(cacheState, revalidateSeconds, expireSeconds) {
-	if (revalidateSeconds === Infinity) return STATIC_CACHE_CONTROL;
+	if (revalidateSeconds === false || revalidateSeconds === Infinity) return STATIC_CACHE_CONTROL;
 	if (cacheState === "STALE" && expireSeconds === void 0) return STALE_REVALIDATE_CACHE_CONTROL;
 	return buildRevalidateCacheControl(revalidateSeconds, expireSeconds);
 }

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

@@ -53,7 +53,9 @@ clientTraceMetadata?: readonly string[], htmlLimitedBots?: string,
  * `nextConfig?.reactStrictMode === true`.
  */
 
-reactStrictMode?: boolean): (req: IncomingMessage, res: ServerResponse, url: string, /** Status code override — propagated from middleware rewrite status. */
+reactStrictMode?: boolean, /** Next.js `expireTime`, used when formatting terminal GSP responses. */
+
+expireTime?: number): (req: IncomingMessage, res: ServerResponse, url: string, /** Status code override — propagated from middleware rewrite status. */
 
 statusCode?: number,
 /**