vinext 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/server/pages-i18n.js

@@ -93,23 +93,71 @@ function stripI18nLocaleForApiRoute(url, i18nConfig) {
 */
 function detectLocaleFromAcceptLanguage(acceptLang, i18nConfig) {
 	if (!acceptLang) return null;
-	const langs = acceptLang.split(",").map((part) => {
-		const [lang, qPart] = part.trim().split(";");
-		const q = qPart ? parseFloat(qPart.replace("q=", "")) : 1;
-		return {
-			lang: lang.trim().toLowerCase(),
-			q
-		};
-	}).sort((a, b) => b.q - a.q);
-	for (const { lang } of langs) {
-		const exactMatch = i18nConfig.locales.find((locale) => locale.toLowerCase() === lang);
-		if (exactMatch) return exactMatch;
-		const prefix = lang.split("-")[0];
-		const prefixMatch = i18nConfig.locales.find((locale) => {
-			const lowered = locale.toLowerCase();
-			return lowered === prefix || lowered.startsWith(prefix + "-");
+	const configured = /* @__PURE__ */ new Map();
+	let position = 0;
+	for (const locale of i18nConfig.locales) {
+		const lower = locale.toLowerCase();
+		configured.set(lower, {
+			locale,
+			position: position++
 		});
-		if (prefixMatch) return prefixMatch;
+		const parts = lower.split("-");
+		while (parts.length > 1) {
+			parts.pop();
+			const prefix = parts.join("-");
+			if (!configured.has(prefix)) configured.set(prefix, {
+				locale,
+				position: position++
+			});
+		}
+	}
+	const selections = [];
+	const listedTokens = /* @__PURE__ */ new Set();
+	try {
+		const parts = acceptLang.replace(/[ \t]/g, "").split(",");
+		for (let headerPosition = 0; headerPosition < parts.length; headerPosition++) {
+			const part = parts[headerPosition];
+			if (!part) continue;
+			const params = part.split(";");
+			if (params.length > 2) throw new Error("Invalid Accept-Language header");
+			const token = params[0].toLowerCase();
+			if (!token) throw new Error("Invalid Accept-Language header");
+			const selection = {
+				token,
+				headerPosition,
+				quality: 1
+			};
+			const configuredMatch = configured.get(token);
+			if (configuredMatch) selection.preference = configuredMatch.position;
+			listedTokens.add(token);
+			if (params.length === 2) {
+				const [key, value] = params[1].split("=");
+				if (!value || key !== "q" && key !== "Q") throw new Error("Invalid Accept-Language header");
+				const quality = parseFloat(value);
+				if (quality === 0) continue;
+				if (Number.isFinite(quality) && quality >= .001 && quality <= 1) selection.quality = quality;
+			}
+			selections.push(selection);
+		}
+	} catch {
+		return null;
+	}
+	selections.sort((a, b) => {
+		if (b.quality !== a.quality) return b.quality - a.quality;
+		if (a.preference !== b.preference) {
+			if (a.preference === void 0) return 1;
+			if (b.preference === void 0) return -1;
+			return a.preference - b.preference;
+		}
+		return a.headerPosition - b.headerPosition;
+	});
+	for (const { token } of selections) {
+		if (token === "*") {
+			for (const [preference, { locale }] of configured) if (!listedTokens.has(preference)) return locale;
+			continue;
+		}
+		const match = configured.get(token);
+		if (match) return match.locale;
 	}
 	return null;
 }

package/dist/server/pages-node-compat.d.ts

@@ -49,9 +49,11 @@ type PagesRequestCookiesCarrier = {
   cookies?: unknown;
 };
 type CreatePagesReqResOptions = {
+  allowedRevalidateHeaderKeys?: readonly string[];
   body: unknown;
   query: PagesRequestQuery;
   request: Request;
+  trustedRevalidateOrigin?: string;
   url: string;
 };
 type CreatePagesReqResResult = {

package/dist/server/pages-node-compat.js

@@ -121,6 +121,8 @@ var PagesResponseStream = class extends Writable {
 	resolveResponse;
 	rejectResponse;
 	requestHeaders;
+	trustedRevalidateOrigin;
+	allowedRevalidateHeaderKeys;
 	resStatusCode = 200;
 	resHeaders = {};
 	setCookieHeaders = [];
@@ -128,11 +130,13 @@ var PagesResponseStream = class extends Writable {
 	controller = null;
 	bufferedChunks = [];
 	streamEnded = false;
-	constructor(resolveResponse, rejectResponse, requestHeaders) {
+	constructor(resolveResponse, rejectResponse, requestHeaders, trustedRevalidateOrigin, allowedRevalidateHeaderKeys = []) {
 		super();
 		this.resolveResponse = resolveResponse;
 		this.rejectResponse = rejectResponse;
 		this.requestHeaders = requestHeaders;
+		this.trustedRevalidateOrigin = trustedRevalidateOrigin;
+		this.allowedRevalidateHeaderKeys = allowedRevalidateHeaderKeys;
 		this.once("error", (err) => {
 			if (!this.resolved) {
 				this.resolved = true;
@@ -151,7 +155,7 @@ var PagesResponseStream = class extends Writable {
 	}
 	writeHead(code, headers) {
 		this.resStatusCode = code;
-		if (headers) for (const [key, value] of Object.entries(headers)) this.setHeaderValue(key, value, { replaceSetCookie: false });
+		if (headers) for (const [key, value] of Object.entries(headers)) this.setHeaderValue(key, value, { replaceSetCookie: true });
 		return this;
 	}
 	setHeader(name, value) {
@@ -202,7 +206,7 @@ var PagesResponseStream = class extends Writable {
 		return headers;
 	}
 	async revalidate(urlPath, opts) {
-		await performOnDemandRevalidate(this.requestHeaders, urlPath, opts);
+		await performOnDemandRevalidate(this.requestHeaders, urlPath, opts, this.trustedRevalidateOrigin, this.allowedRevalidateHeaderKeys);
 	}
 	setPreviewData(data, options = {}) {
 		setPagesPreviewData(this, data, options);
@@ -247,9 +251,9 @@ var PagesResponseStream = class extends Writable {
 	}
 	setHeaderValue(name, value, options) {
 		if (name.toLowerCase() === "set-cookie") {
+			const values = Array.isArray(value) ? value.map(String) : [String(value)];
 			if (options.replaceSetCookie) this.setCookieHeaders.length = 0;
-			if (Array.isArray(value)) this.setCookieHeaders.push(...value.map(String));
-			else this.setCookieHeaders.push(String(value));
+			this.setCookieHeaders.push(...values);
 			return;
 		}
 		this.resHeaders[name.toLowerCase()] = Array.isArray(value) ? value.join(", ") : value;
@@ -299,7 +303,7 @@ function createPagesReqRes(options) {
 		resolveResponse = resolve;
 		rejectResponse = reject;
 	});
-	const res = new PagesResponseStream(resolveResponse, rejectResponse, options.request.headers);
+	const res = new PagesResponseStream(resolveResponse, rejectResponse, options.request.headers, options.trustedRevalidateOrigin ?? new URL(options.request.url).origin, options.allowedRevalidateHeaderKeys);
 	attachPagesPreviewApi(req, res);
 	return {
 		req,

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

@@ -1,6 +1,6 @@
 import { Route } from "../routing/pages-router.js";
 import { VinextNextData } from "../client/vinext-next-data.js";
-import { CachedPagesValue } from "../shims/cache-handler.js";
+import { CachedPagesValue, CachedRedirectValue } from "../shims/cache-handler.js";
 import { ISRCacheEntry } from "./isr-cache.js";
 import { PagesPreviewData } from "./pages-preview.js";
 import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
@@ -12,6 +12,12 @@ type PagesRedirectResult = {
   destination: string;
   permanent?: boolean;
   statusCode?: number;
+  basePath?: boolean;
+};
+type ResolvedPagesRedirect = {
+  destination: string;
+  statusCode: number;
+  basePath?: boolean;
 };
 type PagesStaticPathsEntry = string | {
   params?: Record<string, unknown>;
@@ -22,11 +28,23 @@ type PagesStaticPathsResult = {
   paths?: PagesStaticPathsEntry[];
 };
 type PagesPagePropsResult = {
-  props?: Record<string, unknown>;
+  props?: Record<string, unknown> | Promise<Record<string, unknown>>;
   redirect?: PagesRedirectResult;
   notFound?: boolean;
-  revalidate?: number;
+  revalidate?: unknown;
 };
+declare function assertPages404DoesNotReturnNotFound(routePattern: string, result: Pick<PagesPagePropsResult, "notFound"> | null | undefined): void;
+/**
+ * Next.js preserves an omitted/false Pages `revalidate` result as an indefinite
+ * cache lifetime. The one-year sentinel is only an HTTP Cache-Control detail;
+ * storing it as a revalidation deadline would incorrectly regenerate static
+ * pages after one year.
+ *
+ * Next.js source:
+ * - packages/next/src/server/render.tsx (`metadata.cacheControl`)
+ * - packages/next/src/server/route-modules/pages/pages-handler.ts
+ */
+declare function resolvePagesRevalidateSeconds(result: PagesPagePropsResult, routeUrl?: string): number | false;
 type PagesMutableGsspResponse = {
   headersSent: boolean;
 } & PagesGsspResponse;
@@ -36,8 +54,16 @@ type PagesGsspContextResponse = {
   responsePromise: Promise<Response>;
 };
 type PagesRenderProps = Record<string, unknown> & {
-  pageProps: unknown;
+  pageProps?: unknown;
 };
+/**
+ * Merge gSP/gSSP data into the custom App's raw pageProps value.
+ *
+ * Next.js deliberately uses Object.assign rather than object spread, so
+ * enumerable keys from arrays and primitive wrapper objects are retained.
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/render.tsx
+ */
+declare function mergePagesDataProps(appPageProps: unknown, dataProps: unknown): Record<string, unknown>;
 type PagesPageModule = {
   default?: unknown;
   getStaticPaths?: (context: {
@@ -106,6 +132,7 @@ type RenderPagesIsrHtmlOptions = {
 };
 type ResolvePagesPageDataOptions = {
   applyRequestContexts: () => void;
+  basePath?: string;
   buildId: string | null;
   /**
    * When true, this is a `/_next/data/<buildId>/<page>.json` request. Callers
@@ -124,7 +151,7 @@ type ResolvePagesPageDataOptions = {
   i18n: PagesI18nRenderContext;
   isrCacheKey: (router: string, pathname: string) => string;
   isrGet: (key: string) => Promise<ISRCacheEntry | null>;
-  isrSet: (key: string, data: CachedPagesValue, revalidateSeconds: number, tags?: string[], expireSeconds?: number) => Promise<void>;
+  isrSet: (key: string, data: CachedPagesValue | CachedRedirectValue | null, revalidateSeconds: number | false, tags?: string[], expireSeconds?: number) => Promise<void>;
   expireSeconds?: number;
   /**
    * When true, this dispatch corresponds to a build-time prerender (the
@@ -152,6 +179,12 @@ type ResolvePagesPageDataOptions = {
    * presence — see the security note in `isr-cache.ts`.
    */
   isOnDemandRevalidate?: boolean;
+  /**
+   * When true alongside an authenticated on-demand request, return a
+   * successful 404 no-op if no cache entry exists instead of generating a new
+   * fallback path. Mirrors Next.js `unstable_onlyGenerated`.
+   */
+  revalidateOnlyGenerated?: boolean;
   previewData?: PagesPreviewData | false;
   /**
    * The deployment ID used for deployment-skew protection. When set, it is
@@ -171,6 +204,12 @@ type ResolvePagesPageDataOptions = {
   route: Pick<Route, "isDynamic">;
   routePattern: string;
   routeUrl: string;
+  /**
+   * Filesystem-route identity used for Pages ISR reads and writes. Error pages
+   * render against the original request URL but cache under /404, /500, or
+   * /_error, matching Next.js's error-page cache-key override.
+   */
+  isrCachePathname?: string;
   runInFreshUnifiedContext: <T>(callback: () => Promise<T>) => Promise<T>;
   safeJsonStringify: (value: unknown) => string;
   sanitizeDestination: (destination: string) => string;
@@ -210,7 +249,8 @@ type ResolvePagesPageDataRenderResult = {
   kind: "render";
   documentReqRes: PagesGsspContextResponse | null;
   gsspRes: PagesGsspResponse | null;
-  isrRevalidateSeconds: number | null;
+  isrRevalidateSeconds: number | false | null;
+  isrExpireSeconds?: number;
   pageProps: Record<string, unknown>;
   props: PagesRenderProps;
   /**
@@ -223,12 +263,24 @@ type ResolvePagesPageDataRenderResult = {
 };
 type ResolvePagesPageDataResponseResult = {
   kind: "response";
-  response: Response;
+  response: Response; /** False when an on-demand request must be reported as a failed revalidation. */
+  onDemandRevalidateSuccess?: boolean;
 };
 type ResolvePagesPageDataNotFoundResult = {
-  kind: "notFound";
+  kind: "notFound"; /** Current getStaticProps cache lifetime, when this is an SSG result. */
+  revalidateSeconds?: number | false;
+  expireSeconds?: number;
+  cacheState?: "MISS" | "HIT" | "STALE";
 };
 type ResolvePagesPageDataResult = ResolvePagesPageDataRenderResult | ResolvePagesPageDataResponseResult | ResolvePagesPageDataNotFoundResult;
+/** Validate and normalize the redirect metadata returned by gSP/gSSP. */
+declare function resolvePagesRedirect(redirect: PagesRedirectResult, options: {
+  method: "getStaticProps" | "getServerSideProps";
+  routeUrl: string;
+  sanitizeDestination: (destination: string) => string;
+}): ResolvedPagesRedirect;
+declare function resolvePagesRedirectLocation(redirect: ResolvedPagesRedirect, configuredBasePath?: string): string;
+declare function buildPagesRedirectProps(redirect: ResolvedPagesRedirect, props: PagesRenderProps): PagesRenderProps;
 /**
  * Compare a `getStaticPaths` entry against the actual request params.
  *
@@ -254,4 +306,4 @@ declare function matchesPagesStaticPath(pathEntry: PagesStaticPathsEntry, params
 declare function renderPagesIsrHtml(options: RenderPagesIsrHtmlOptions): Promise<string>;
 declare function resolvePagesPageData(options: ResolvePagesPageDataOptions): Promise<ResolvePagesPageDataResult>;
 //#endregion
-export { PagesPageModule, PagesRouteParam, PagesStaticPathsEntry, ResolvePagesPageDataOptions, getPagesRouteParams, matchesPagesStaticPath, renderPagesIsrHtml, resolvePagesPageData };
+export { PagesPageModule, PagesRedirectResult, PagesRouteParam, PagesStaticPathsEntry, ResolvePagesPageDataOptions, ResolvedPagesRedirect, assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, renderPagesIsrHtml, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds };