vinext 0.0.51 → 0.0.53

package/dist/server/dev-server.js

@@ -2,14 +2,14 @@ import { createRequestContext, runWithRequestContext } from "../shims/unified-re
 import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { matchRoute } from "../routing/pages-router.js";
-import { VINEXT_CACHE_HEADER } from "./headers.js";
+import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
+import { buildCacheStateHeaders } from "./cache-headers.js";
 import { _runWithCacheState } from "../shims/cache.js";
 import { buildPagesCacheValue, getRevalidateDuration, isrCacheKey, isrGet, isrSet, setRevalidateDuration, triggerBackgroundRegeneration } from "./isr-cache.js";
 import { runWithPrivateCache } from "../shims/cache-runtime.js";
 import { ensureFetchPatch, runWithFetchCache } from "../shims/fetch-cache.js";
-import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import "../shims/router-state.js";
 import { runWithHeadState } from "../shims/head-state.js";
 import { runWithServerInsertedHTMLState } from "../shims/navigation-state.js";
@@ -18,6 +18,7 @@ import { createInlineScriptTag, createNonceAttribute, safeJsonStringify } from "
 import { getScriptNonceFromNodeHeaderSources } from "./csp.js";
 import { logRequest, now } from "./request-log.js";
 import { detectLocaleFromAcceptLanguage, extractLocaleFromUrl as extractLocaleFromUrl$1, parseCookieLocaleFromHeader, resolvePagesI18nRequest } from "./pages-i18n.js";
+import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import path from "node:path";
 import React from "react";
 import { renderToReadableStream } from "react-dom/server.edge";
@@ -132,11 +133,11 @@ function parseCookieLocale(req, 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) {
+function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false, hasMiddleware = false) {
 	const matcher = fileMatcher ?? createValidFileMatcher();
 	const _alsRegistration = Promise.all([runner.import("vinext/head-state"), runner.import("vinext/router-state")]);
 	_alsRegistration.catch(() => {});
-	return async (req, res, url, statusCode) => {
+	return async (req, res, url, statusCode, isDataReq = false) => {
 		const _reqStart = now();
 		let _compileEnd;
 		let _renderEnd;
@@ -170,10 +171,16 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 		}
 		const match = matchRoute(localeStrippedUrl, routes);
 		if (!match) {
+			if (isDataReq) {
+				res.writeHead(404, { "Content-Type": "application/json" });
+				res.end("{}");
+				return;
+			}
 			await renderErrorPage(server, runner, req, res, url, pagesDir, 404, void 0, matcher);
 			return;
 		}
 		const { route, params } = match;
+		const userFacingParams = route.isDynamic ? params : null;
 		const query = mergeRouteParamsIntoQuery(parseQueryString(url), params);
 		return runWithRequestContext(createRequestContext(), async () => {
 			ensureFetchPatch();
@@ -211,34 +218,53 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				}
 				let pageProps = {};
 				let isrRevalidateSeconds = null;
+				let isFallbackRender = false;
 				if (typeof pageModule.getStaticPaths === "function" && route.isDynamic) {
 					const pathsResult = await pageModule.getStaticPaths({
 						locales: i18nConfig?.locales ?? [],
 						defaultLocale: currentDefaultLocale ?? ""
 					});
-					if ((pathsResult?.fallback ?? false) === false) {
-						const paths = pathsResult?.paths ?? [];
-						const currentPathname = normalizeStaticPathname(url);
-						if (!paths.some((p) => {
-							if (typeof p === "string") return normalizeStaticPathname(p) === currentPathname;
-							const entryParams = p.params;
-							if (entryParams === void 0 || entryParams === null) return false;
-							return Object.entries(entryParams).every(([key, val]) => {
-								const actual = params[key];
-								if (Array.isArray(val)) return Array.isArray(actual) && val.join("/") === actual.join("/");
-								return String(val) === String(actual);
-							});
-						})) {
-							await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, matcher);
+					const fallback = pathsResult?.fallback ?? false;
+					const paths = pathsResult?.paths ?? [];
+					const currentPathname = normalizeStaticPathname(url);
+					const isValidPath = paths.some((p) => {
+						if (typeof p === "string") return normalizeStaticPathname(p) === currentPathname;
+						const entryParams = p.params;
+						if (entryParams === void 0 || entryParams === null) return false;
+						return Object.entries(entryParams).every(([key, val]) => {
+							const actual = params[key];
+							if (Array.isArray(val)) return Array.isArray(actual) && val.join("/") === actual.join("/");
+							return String(val) === String(actual);
+						});
+					});
+					if (fallback === false && !isValidPath) {
+						if (isDataReq) {
+							res.writeHead(404, { "Content-Type": "application/json" });
+							res.end("{}");
 							return;
 						}
+						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, matcher);
+						return;
+					}
+					if (fallback === true && !isValidPath && !isDataReq) {
+						isFallbackRender = true;
+						if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext({
+							pathname: patternToNextFormat(route.pattern),
+							query,
+							asPath: url,
+							locale: locale ?? currentDefaultLocale,
+							locales: i18nConfig?.locales,
+							defaultLocale: currentDefaultLocale,
+							domainLocales,
+							isFallback: true
+						});
 					}
 				}
 				const gsspExtraHeaders = {};
-				if (typeof pageModule.getServerSideProps === "function") {
+				if (typeof pageModule.getServerSideProps === "function" && !isFallbackRender) {
 					const headersBeforeGSSP = new Set(Object.keys(res.getHeaders()));
 					const context = {
-						params,
+						params: userFacingParams,
 						req,
 						res,
 						query,
@@ -249,7 +275,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					};
 					const result = await pageModule.getServerSideProps(context);
 					if (res.writableEnded) return;
-					if (result && "props" in result) pageProps = result.props;
+					if (result && "props" in result) pageProps = await Promise.resolve(result.props);
 					if (result && "redirect" in result) {
 						const { redirect } = result;
 						const status = redirect.statusCode ?? (redirect.permanent ? 308 : 307);
@@ -260,6 +286,11 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
+						if (isDataReq) {
+							res.writeHead(404, { "Content-Type": "application/json" });
+							res.end("{}");
+							return;
+						}
 						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext);
 						return;
 					}
@@ -271,6 +302,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						if (Array.isArray(val)) gsspExtraHeaders[key] = val.map(String);
 						else gsspExtraHeaders[key] = String(val);
 					}
+					if (!Object.keys(gsspExtraHeaders).some((k) => k.toLowerCase() === "cache-control")) gsspExtraHeaders["Cache-Control"] = "private, no-cache, no-store, max-age=0, must-revalidate";
 				}
 				const responseHeaders = typeof res.getHeaders === "function" ? res.getHeaders() : void 0;
 				const scriptNonce = getScriptNonceFromNodeHeaderSources(req.headers, responseHeaders);
@@ -283,16 +315,16 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					if (typeof fontLocalEarly.getSSRFontPreloads === "function") earlyPreloads.push(...fontLocalEarly.getSSRFontPreloads());
 					if (earlyPreloads.length > 0) earlyFontLinkHeader = earlyPreloads.map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`).join(", ");
 				} catch {}
-				if (typeof pageModule.getStaticProps === "function") {
+				if (typeof pageModule.getStaticProps === "function" && !isFallbackRender) {
 					const cacheKey = isrCacheKey("pages", url.split("?")[0], process.env.__VINEXT_BUILD_ID);
 					const cached = await isrGet(cacheKey);
-					if (cached && !cached.isStale && cached.value.value?.kind === "PAGES" && !scriptNonce) {
+					if (cached && !cached.isStale && cached.value.value?.kind === "PAGES" && !scriptNonce && !isDataReq) {
 						const cachedHtml = cached.value.value.html;
 						const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
 						const revalidateSecs = getRevalidateDuration(cacheKey) ?? 60;
 						const hitHeaders = {
 							"Content-Type": "text/html",
-							[VINEXT_CACHE_HEADER]: "HIT",
+							...buildCacheStateHeaders("HIT"),
 							"Cache-Control": `s-maxage=${revalidateSecs}, stale-while-revalidate`
 						};
 						if (earlyFontLinkHeader) hitHeaders["Link"] = earlyFontLinkHeader;
@@ -300,17 +332,18 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						res.end(transformedHtml);
 						return;
 					}
-					if (cached && cached.isStale && cached.value.value?.kind === "PAGES" && !scriptNonce) {
+					if (cached && cached.isStale && cached.value.value?.kind === "PAGES" && !scriptNonce && !isDataReq) {
 						const cachedHtml = cached.value.value.html;
 						const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
 						triggerBackgroundRegeneration(cacheKey, async () => {
 							return runWithRequestContext(createRequestContext({ executionContext: null }), async () => {
 								ensureFetchPatch();
 								const freshResult = await pageModule.getStaticProps({
-									params,
+									params: userFacingParams,
 									locale: locale ?? currentDefaultLocale,
 									locales: i18nConfig?.locales,
-									defaultLocale: currentDefaultLocale
+									defaultLocale: currentDefaultLocale,
+									revalidateReason: "stale"
 								});
 								if (freshResult && "props" in freshResult) {
 									const revalidate = typeof freshResult.revalidate === "number" ? freshResult.revalidate : 0;
@@ -362,7 +395,8 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 											domainLocales,
 											__vinext: {
 												pageModuleUrl: regenPageUrl,
-												appModuleUrl: regenAppUrl
+												appModuleUrl: regenAppUrl,
+												hasMiddleware
 											}
 										})}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? currentDefaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(currentDefaultLocale)}` : ""}<\/script>`}\n  ${cachedHtml.match(/<script type="module">[\s\S]*?<\/script>/)?.[0] ?? ""}</body></html>`, freshProps), revalidate);
 										setRevalidateDuration(cacheKey, revalidate);
@@ -377,7 +411,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						const revalidateSecs = getRevalidateDuration(cacheKey) ?? 60;
 						const staleHeaders = {
 							"Content-Type": "text/html",
-							[VINEXT_CACHE_HEADER]: "STALE",
+							...buildCacheStateHeaders("STALE"),
 							"Cache-Control": `s-maxage=${revalidateSecs}, stale-while-revalidate`
 						};
 						if (earlyFontLinkHeader) staleHeaders["Link"] = earlyFontLinkHeader;
@@ -386,10 +420,11 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						return;
 					}
 					const context = {
-						params,
+						params: userFacingParams,
 						locale: locale ?? currentDefaultLocale,
 						locales: i18nConfig?.locales,
-						defaultLocale: currentDefaultLocale
+						defaultLocale: currentDefaultLocale,
+						revalidateReason: "stale"
 					};
 					const result = await pageModule.getStaticProps(context);
 					if (result && "props" in result) pageProps = result.props;
@@ -403,11 +438,24 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
+						if (isDataReq) {
+							res.writeHead(404, { "Content-Type": "application/json" });
+							res.end("{}");
+							return;
+						}
 						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext);
 						return;
 					}
 					if (typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
 				}
+				if (isDataReq) {
+					const dataHeaders = { "Content-Type": "application/json" };
+					if (gsspExtraHeaders) for (const [k, v] of Object.entries(gsspExtraHeaders)) dataHeaders[k] = v;
+					res.writeHead(statusCode ?? 200, dataHeaders);
+					res.end(JSON.stringify({ pageProps }));
+					_renderEnd = now();
+					return;
+				}
 				let AppComponent = null;
 				const appPath = path.join(pagesDir, "_app");
 				if (findFileWithExtensions(appPath, matcher)) try {
@@ -483,7 +531,11 @@ async function hydrate() {
   const root = hydrateRoot(document.getElementById("__next"), element);
   window.__VINEXT_ROOT__ = root;
   installPagesRouterRuntime();
-  window.__VINEXT_HYDRATED_AT = performance.now();
+  const hydratedAt = performance.now();
+  window.__VINEXT_HYDRATED_AT = hydratedAt;
+  window.__NEXT_HYDRATED = true;
+  window.__NEXT_HYDRATED_AT = hydratedAt;
+  window.__NEXT_HYDRATED_CB?.();
 }
 hydrate();
 <\/script>`;
@@ -492,14 +544,15 @@ hydrate();
 					page: patternToNextFormat(route.pattern),
 					query: params,
 					buildId: process.env.__VINEXT_BUILD_ID,
-					isFallback: false,
+					isFallback: isFallbackRender,
 					locale: locale ?? currentDefaultLocale,
 					locales: i18nConfig?.locales,
 					defaultLocale: currentDefaultLocale,
 					domainLocales,
 					__vinext: {
 						pageModuleUrl,
-						appModuleUrl
+						appModuleUrl,
+						hasMiddleware
 					}
 				})}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? currentDefaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(currentDefaultLocale)}` : ""}`, scriptNonce);
 				const docPath = path.join(pagesDir, "_document");
@@ -512,7 +565,7 @@ hydrate();
 				if (isrRevalidateSeconds) if (scriptNonce) extraHeaders["Cache-Control"] = "no-store, must-revalidate";
 				else {
 					extraHeaders["Cache-Control"] = `s-maxage=${isrRevalidateSeconds}, stale-while-revalidate`;
-					extraHeaders[VINEXT_CACHE_HEADER] = "MISS";
+					Object.assign(extraHeaders, buildCacheStateHeaders("MISS"));
 				}
 				if (allFontPreloads.length > 0) extraHeaders["Link"] = allFontPreloads.map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`).join(", ");
 				await streamPageToResponse(res, withScriptNonce(element, scriptNonce), {
@@ -622,8 +675,18 @@ async function renderErrorPage(server, runner, _req, res, url, pagesDir, statusC
 	} catch {
 		continue;
 	}
+	if (statusCode === 404) {
+		const defaultResponse = buildDefaultPagesNotFoundResponse();
+		const headers = {};
+		defaultResponse.headers.forEach((value, key) => {
+			headers[key] = value;
+		});
+		res.writeHead(defaultResponse.status, headers);
+		res.end(await defaultResponse.text());
+		return;
+	}
 	res.writeHead(statusCode, { "Content-Type": "text/plain" });
-	res.end(`${statusCode} - ${statusCode === 404 ? "Page not found" : "Internal Server Error"}`);
+	res.end(`${statusCode} - Internal Server Error`);
 }
 //#endregion
 export { createSSRHandler, detectLocaleFromHeaders, extractLocaleFromUrl, parseCookieLocale };