vinext 1.0.1 → 1.2.0

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

@@ -4,17 +4,17 @@ 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 { extractLocaleFromUrl } from "./pages-i18n.js";
+import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
 import { recordRouteCacheability } from "../shims/cacheability-classification.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { buildMissIsrCacheControl, decideIsr } from "./isr-decision.js";
-import { buildPagesCacheValue, isrCacheControl } from "./isr-cache.js";
-import { encodeCacheTag } from "../utils/encode-cache-tag.js";
+import { isrCacheControl } from "./isr-cache.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
-import { matchesIfNoneMatch } from "./http-conditional.js";
-import { buildPagesNextDataScript, generatePagesETag, isPagesStreamingBot, requestsNoCache } from "./pages-page-response.js";
+import { pagesPathCacheTag } from "./pages-cache-tag.js";
+import { isPageNotModified } from "./http-conditional.js";
+import { generatePagesETag, isPagesStreamingBot, rendersPagesNotModified } from "./pages-page-response.js";
 import { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
-import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
 import { tracePagesData, tracePagesDocument } from "./pages-execution-tracing.js";
 //#region src/server/pages-page-data.ts
@@ -43,6 +43,16 @@ function assertPages404DoesNotReturnNotFound(routePattern, result) {
 * - packages/next/src/server/render.tsx (`metadata.cacheControl`)
 * - packages/next/src/server/route-modules/pages/pages-handler.ts
 */
+/**
+* Next.js renders a shared getStaticProps status page (/404, /500) for its own
+* pathname, never for the request that reached it. Only the original
+* request's trailing slash carries over under `trailingSlash`, read before
+* rewrites and locale stripping.
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/server/route-modules/pages/pages-handler.ts
+*/
+function resolvePagesStatusPageRenderPath(statusPathname, trailingSlash, requestPathname) {
+	return trailingSlash && requestPathname.endsWith("/") ? statusPathname + "/" : statusPathname;
+}
 function resolvePagesRevalidateSeconds(result, routeUrl = "") {
 	const revalidate = result.revalidate;
 	if (revalidate === true) return 1;
@@ -103,14 +113,13 @@ function mergePagesNotFoundSourceHeaders(response, sourceHeaders) {
 	});
 }
 function applyPagesTerminalMissHeaders(response, revalidateSeconds, isrCachePathname, expireSeconds) {
-	const stem = isrCachePathname.endsWith("/") ? isrCachePathname.slice(0, -1) : isrCachePathname;
 	recordRouteCacheability({
 		cacheable: revalidateSeconds !== 0,
 		cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds)
 	});
 	applyCdnResponseHeaders(response.headers, {
 		cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds),
-		tags: [encodeCacheTag(`_N_T_${stem || "/"}`)]
+		tags: [pagesPathCacheTag(isrCachePathname)]
 	});
 	for (const [name, value] of Object.entries(buildCacheStateHeaders("MISS"))) response.headers.set(name, value);
 	return response;
@@ -216,7 +225,7 @@ async function loadPagesAppInitialRenderProps(options, getSharedReqRes) {
 			defaultLocale: options.i18n.defaultLocale
 		}
 	});
-	if (isResponseSent(res)) return {
+	if (isResponseSent(res) && typeof options.pageModule.getStaticProps !== "function") return {
 		kind: "response",
 		response: responsePromise
 	};
@@ -367,7 +376,7 @@ function matchesPagesStaticPath(pathEntry, params, routeParams, routeUrl, i18n)
 		const actual = params[key];
 		if (Array.isArray(value)) {
 			if (optional && value.length === 0 && actual === void 0) return true;
-			return Array.isArray(actual) && value.join("/") === actual.join("/");
+			return Array.isArray(actual) && value.length === actual.length && actual.every((part, index) => part === value[index]);
 		}
 		return String(value) === String(actual);
 	});
@@ -408,7 +417,11 @@ function finalizeCachedPagesResponse(response, options, html) {
 	if (html !== void 0 && options.userAgent && isPagesStreamingBot(options.userAgent)) {
 		const etag = generatePagesETag(html);
 		response.headers.set("ETag", etag);
-		if (!requestsNoCache(options.requestCacheControl) && options.ifNoneMatch && matchesIfNoneMatch(options.ifNoneMatch, etag)) response = new Response(null, {
+		if (isPageNotModified({
+			cacheControl: options.requestCacheControl,
+			ifModifiedSince: options.ifModifiedSince,
+			ifNoneMatch: options.ifNoneMatch
+		}, etag) && rendersPagesNotModified(response.status)) response = new Response(null, {
 			status: 304,
 			headers: response.headers
 		});
@@ -418,92 +431,6 @@ function finalizeCachedPagesResponse(response, options, html) {
 		response
 	};
 }
-/**
-* Matches one serialized `next/head` tag. `getSSRHeadHTML()` stamps every tag
-* it emits with `data-next-head=""` (see `shims/head.ts`), which is the same
-* marker Next.js uses to reconcile the head on the client — so it is a stable
-* anchor for finding the collector's output inside an already-rendered shell.
-*
-* Raw-content tags are safe to match non-greedily: `headChildToHTML()` escapes
-* closing-tag sequences in `<style>`/`<script>` bodies, so the first `</style>`
-* encountered is always the real terminator.
-*/
-const SSR_HEAD_TAG_PATTERN = /<(title|meta|link|style|script|base|noscript)\b[^>]*?\sdata-next-head=""[^>]*?(?:\/>|>[\s\S]*?<\/\1>)/g;
-/**
-* Matches a whole head element whose body may contain markup-looking text.
-* Script/style are raw-text elements, title is RCDATA, and noscript is raw
-* text while scripting is enabled. In all four, a literal `</head>` does not
-* close the document head. `headChildToHTML()` only escapes the element's own
-* closing sequence for script/style, while `dangerouslySetInnerHTML` may leave
-* `</head>` intact in any of them.
-*/
-const HEAD_TEXT_ELEMENT_PATTERN = /<(script|style|title|noscript)\b[^>]*>[\s\S]*?<\/\1>/gi;
-/**
-* Replace the `next/head` region of a cached shell with a freshly collected
-* one.
-*
-* ISR regeneration re-renders the page body but reuses the cached shell, so
-* without this the `<head>` stays frozen at whatever the first cache-filling
-* render produced — a page whose `<title>`/meta derive from `getStaticProps`
-* data would serve an updated body under permanently stale metadata.
-*
-* The collector emits its tags as one contiguous run (`ssrHeadHTML` is
-* concatenated ahead of trace meta and `_document` styles in
-* `buildPagesShellHtml`), so replacing first-match-start through
-* last-match-end swaps exactly that run and leaves `_document`-owned head
-* markup either side of it untouched.
-*
-* Only the `next/head` run refreshes. `_document`-rendered head children and
-* CSS-in-JS `styles` still come from the cached shell, because regeneration
-* never re-renders `_document` — refreshing those means running the full
-* document pipeline on regeneration the way Next.js does.
-*/
-function refreshCachedHeadTags(cachedHtml, freshHead) {
-	if (!freshHead) return cachedHtml;
-	const headEnd = cachedHtml.replace(HEAD_TEXT_ELEMENT_PATTERN, (element) => " ".repeat(element.length)).indexOf("</head>");
-	if (headEnd < 0) return cachedHtml;
-	const matches = [...cachedHtml.slice(0, headEnd).matchAll(SSR_HEAD_TAG_PATTERN)];
-	const first = matches[0];
-	const last = matches[matches.length - 1];
-	if (!first || !last || first.index === void 0 || last.index === void 0) return cachedHtml;
-	return cachedHtml.slice(0, first.index) + freshHead + cachedHtml.slice(last.index + last[0].length);
-}
-function rewritePagesCachedHtml(cachedHtml, freshBody, nextDataScript) {
-	const bodyStart = cachedHtml.indexOf("<div id=\"__next\">");
-	const contentStart = bodyStart >= 0 ? bodyStart + 17 : -1;
-	const canonicalNextDataStart = cachedHtml.search(/<script\b(?=[^>]*\bid=["']__NEXT_DATA__["'])(?=[^>]*\btype=["']application\/json["'])[^>]*>/);
-	const legacyNextDataStart = cachedHtml.indexOf("<script>window.__NEXT_DATA__");
-	const nextDataStart = canonicalNextDataStart >= 0 ? canonicalNextDataStart : legacyNextDataStart;
-	if (contentStart >= 0 && nextDataStart >= 0) {
-		const region = cachedHtml.slice(contentStart, nextDataStart);
-		const lastCloseDiv = region.lastIndexOf("</div>");
-		const gap = lastCloseDiv >= 0 ? region.slice(lastCloseDiv + 6) : "";
-		const nextDataEnd = cachedHtml.indexOf("<\/script>", nextDataStart) + 9;
-		const tail = cachedHtml.slice(nextDataEnd);
-		return cachedHtml.slice(0, contentStart) + freshBody + "</div>" + gap + nextDataScript + tail;
-	}
-	return "<!DOCTYPE html>\n<html>\n<head>\n</head>\n<body>\n  <div id=\"__next\">" + freshBody + "</div>\n  " + nextDataScript + "\n</body>\n</html>";
-}
-async function renderPagesIsrHtml(options) {
-	const renderProps = options.props ?? { pageProps: options.pageProps };
-	const collectHead = options.collectIsrHeadHTML;
-	let freshHead = "";
-	const freshBody = await options.renderIsrPassToStringAsync(options.createPageElement(renderProps), collectHead && (async () => {
-		freshHead = collectHead();
-	}));
-	const nextDataScript = buildPagesNextDataScript({
-		buildId: options.buildId,
-		i18n: options.i18n,
-		pageProps: options.pageProps,
-		props: renderProps,
-		params: options.params,
-		routePattern: options.routePattern,
-		safeJsonStringify: options.safeJsonStringify,
-		nextData: options.nextData,
-		vinext: options.vinext
-	});
-	return rewritePagesCachedHtml(refreshCachedHeadTags(options.cachedHtml, freshHead), freshBody, nextDataScript);
-}
 async function resolvePagesPageData(options) {
 	const userFacingParams = options.route.isDynamic ? options.params : null;
 	let isFallback = false;
@@ -515,13 +442,13 @@ async function resolvePagesPageData(options) {
 		const value = cached?.value.value;
 		if (cached && !cached.isStale && !cached.isExpired && value?.kind === "PAGES") return finalizeCachedPagesResponse(options.isDataReq ? applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(value.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "HIT", cached.value, options) : buildPagesCacheResponse(value.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, options.statusCode ?? value.status, value.headers), options, options.isDataReq ? void 0 : value.html);
 	}
-	let hasFreshPrerenderedEntry = false;
-	if (options.hasPrerenderedPages && options.route.isDynamic && typeof options.pageModule.getStaticProps === "function" && typeof options.pageModule.getServerSideProps !== "function" && !options.isOnDemandRevalidate && previewData === false) {
+	let hasStoredEntry = options.regeneratesStoredEntry === true;
+	if (options.route.isDynamic && typeof options.pageModule.getStaticProps === "function" && typeof options.pageModule.getServerSideProps !== "function" && !hasStoredEntry && !options.isOnDemandRevalidate && previewData === false) {
 		previousCacheEntry = await options.isrGet(options.isrCacheKey("pages", options.isrCachePathname ?? options.routeUrl.split("?")[0]));
 		const value = previousCacheEntry?.value.value;
-		hasFreshPrerenderedEntry = !!previousCacheEntry && !previousCacheEntry.isStale && !previousCacheEntry.isExpired && (value === null || value?.kind === "PAGES" || value?.kind === "REDIRECT");
+		hasStoredEntry = !!previousCacheEntry && !previousCacheEntry.isExpired && (value === null || value?.kind === "PAGES" || value?.kind === "REDIRECT");
 	}
-	if (!hasFreshPrerenderedEntry && typeof options.pageModule.getStaticPaths === "function" && options.route.isDynamic) {
+	if (!hasStoredEntry && previewData === false && typeof options.pageModule.getStaticPaths === "function" && options.route.isDynamic) {
 		const staticPathsI18n = {
 			...options.i18n,
 			defaultLocale: options.staticPathsDefaultLocale ?? options.i18n.defaultLocale
@@ -534,7 +461,7 @@ async function resolvePagesPageData(options) {
 		const paths = pathsResult?.paths ?? [];
 		const routeParams = getPagesRouteParams(options.routePattern);
 		const isValidPath = paths.some((pathEntry) => matchesPagesStaticPath(pathEntry, options.params, routeParams, options.routeUrl, staticPathsI18n));
-		if (fallback === false && !isValidPath && previewData === false) {
+		if (fallback === false && !isValidPath) {
 			if (options.isOnDemandRevalidate && !options.revalidateOnlyGenerated) return {
 				kind: "response",
 				response: new Response("This page could not be found", { status: 404 }),
@@ -543,7 +470,7 @@ async function resolvePagesPageData(options) {
 			return buildPagesNotFoundResult(options);
 		}
 		const isBotRequest = !!options.userAgent && isBotUserAgent(options.userAgent, options.htmlLimitedBots);
-		if (fallback === true && !isValidPath && !options.isDataReq && !isBotRequest && previewData === false) isFallback = true;
+		if (fallback === true && !isValidPath && !options.isDataReq && !isBotRequest) isFallback = true;
 		shouldPersistFallbackData = fallback === true && !isValidPath && options.isDataReq === true;
 	}
 	if (typeof options.pageModule.getStaticProps === "function" && options.isOnDemandRevalidate && options.revalidateOnlyGenerated) {
@@ -571,6 +498,13 @@ async function resolvePagesPageData(options) {
 	}
 	let renderProps = { pageProps };
 	if (previewData !== false) renderProps.__N_PREVIEW = true;
+	async function takeSentResponse() {
+		if (options.isOnDemandRevalidate || !sharedReqRes || !isResponseSent(sharedReqRes.res)) return null;
+		return {
+			kind: "response",
+			response: await sharedReqRes.responsePromise
+		};
+	}
 	async function loadForegroundAppInitialRenderProps() {
 		const result = await loadPagesAppInitialRenderProps(options, getSharedReqRes);
 		if (result.kind === "response") return {
@@ -583,7 +517,7 @@ async function resolvePagesPageData(options) {
 	}
 	if (isFallback) {
 		const pathname = options.isrCachePathname ?? options.routeUrl.split("?")[0];
-		if ((await options.isrGet(options.isrCacheKey("pages", pathname)))?.value.value?.kind !== "PAGES") {
+		if ((previousCacheEntry !== void 0 ? previousCacheEntry : await options.isrGet(options.isrCacheKey("pages", pathname)))?.value.value?.kind !== "PAGES") {
 			const appShortCircuit = await loadForegroundAppInitialRenderProps();
 			if (appShortCircuit) return appShortCircuit;
 			pageProps = {};
@@ -656,7 +590,8 @@ async function resolvePagesPageData(options) {
 			options.triggerBackgroundRegeneration(cacheKey, async function() {
 				return options.runInFreshUnifiedContext(async () => {
 					options.applyRequestContexts();
-					const freshAppResult = await loadPagesAppInitialRenderProps(options, () => options.createGsspReqRes());
+					const reqRes = (options.createRegenerationReqRes ?? options.createGsspReqRes)();
+					const freshAppResult = await loadPagesAppInitialRenderProps(options, () => reqRes);
 					if (freshAppResult.kind === "response") return;
 					let freshPageProps = freshAppResult.pageProps;
 					let freshRenderProps = freshAppResult.renderProps;
@@ -696,22 +631,13 @@ async function resolvePagesPageData(options) {
 					};
 					if (options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getStaticProps", freshPageProps);
 					if (cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest) {
-						const freshHtml = await tracePagesDocument(options.routePattern, () => renderPagesIsrHtml({
-							buildId: options.buildId,
-							cachedHtml: cachedValue.html,
-							createPageElement: options.createPageElement,
-							i18n: options.i18n,
+						await tracePagesDocument(options.routePattern, () => options.renderIsrDocument({
+							documentReqRes: reqRes,
+							expireSeconds,
 							pageProps: freshPageProps,
 							props: freshRenderProps,
-							params: options.params,
-							renderIsrPassToStringAsync: options.renderIsrPassToStringAsync,
-							collectIsrHeadHTML: options.collectIsrHeadHTML,
-							routePattern: options.routePattern,
-							safeJsonStringify: options.safeJsonStringify,
-							nextData: options.nextData,
-							vinext: options.vinext
+							revalidateSeconds
 						}));
-						await options.isrSet(cacheKey, buildPagesCacheValue(freshHtml, freshRenderProps, options.statusCode), { cacheControl: isrCacheControl(revalidateSeconds, { expireSeconds }) });
 						return;
 					}
 					await options.isrSet(cacheKey, {
@@ -788,7 +714,7 @@ async function resolvePagesPageData(options) {
 				}, { cacheControl: isrCacheControl(revalidateSeconds, { expireSeconds }) });
 				applyPagesTerminalMissHeaders(response, revalidateSeconds, pathname, expireSeconds);
 			}
-			return {
+			return await takeSentResponse() ?? {
 				kind: "response",
 				response
 			};
@@ -799,7 +725,7 @@ async function resolvePagesPageData(options) {
 			if (previewData === false) await options.isrSet(cacheKey, null, { cacheControl: isrCacheControl(revalidateSeconds, { expireSeconds }) });
 			const notFoundResult = buildPagesNotFoundResult(options, revalidateSeconds, previewData === false ? "MISS" : void 0, expireSeconds);
 			if (notFoundResult.kind === "response" && previewData === false) applyPagesTerminalMissHeaders(notFoundResult.response, revalidateSeconds, pathname, expireSeconds);
-			return notFoundResult;
+			return await takeSentResponse() ?? notFoundResult;
 		}
 		if (result?.props !== void 0 && options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getStaticProps", pageProps);
 		if (previewData === false && result) {
@@ -854,6 +780,10 @@ async function resolvePagesPageData(options) {
 			};
 		}
 	}
+	if (options.isDataReq) {
+		const sentResponse = await takeSentResponse();
+		if (sentResponse) return sentResponse;
+	}
 	return {
 		kind: "render",
 		documentReqRes: sharedReqRes,
@@ -866,4 +796,4 @@ async function resolvePagesPageData(options) {
 	};
 }
 //#endregion
-export { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, mergePagesNotFoundSourceHeaders, renderPagesIsrHtml, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds };
+export { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds, resolvePagesStatusPageRenderPath };

package/dist/server/pages-page-handler.d.ts

@@ -99,12 +99,6 @@ export type CreatePagesPageHandlerOptions = {
   }>;
   /** `renderToReadableStream` from `react-dom/server.edge`. */
   renderToReadableStream: (element: ReactNode) => Promise<ReadableStream<Uint8Array>>;
-  /**
-   * Render a second ISR pass to a string (wraps renderToReadableStream).
-   * `onHeadReady` runs inside the pass's head scope, after the render and
-   * before the scope unwinds, so callers can read the collected `<head>`.
-   */
-  renderIsrPassToStringAsync: (element: ReactNode, onHeadReady?: () => Promise<void>) => Promise<string>;
   /** `safeJsonStringify` from `vinext/html`. */
   safeJsonStringify: (value: unknown) => string;
   /** `sanitizeDestination` from the config-matchers module. */