This page could not be found.
", { + status: 404, + headers: notFoundHeaders, + }); } const { route, params } = match; @@ -2284,6 +2325,30 @@ async function _handleRequest(request, __reqCtx, _mwCtx) { // force-dynamic: set no-store Cache-Control const isForceDynamic = dynamicConfig === "force-dynamic"; + if (isRscRequest && request.headers.get("x-vinext-loading-payload") === "1") { + const __loadingElement = __buildAppPageLoadingElements({ + interceptionContext: interceptionContextHeader, + route, + routePath: cleanPathname, + }); + if (__loadingElement) { + const __loadingOnError = createRscOnErrorHandler(request, cleanPathname, route.pattern); + const __loadingStream = renderToReadableStream(__loadingElement, { + onError: __loadingOnError, + }); + const __loadingHeaders = new Headers({ + "Content-Type": "text/x-component; charset=utf-8", + "Vary": "RSC, Accept", + }); + __mergeMiddlewareResponseHeaders(__loadingHeaders, _mwCtx.headers); + return new Response(__loadingStream, { + status: _mwCtx.status ?? 200, + headers: __loadingHeaders, + }); + } + return new Response(null, { status: 204 }); + } + // ── ISR cache read (production only) ───────────────────────────────────── // Read from cache BEFORE generateStaticParams and all rendering work. // This is the critical performance optimization: on a cache hit we skip @@ -2368,6 +2433,9 @@ async function _handleRequest(request, __reqCtx, _mwCtx) { scheduleBackgroundRegeneration: __triggerBackgroundRegeneration, }); if (__cachedPageResponse) { + if (isRscRequest && route.loading && route.loading.default) { + __cachedPageResponse.headers.set("X-Vinext-Route-Loading", "1"); + } return __cachedPageResponse; } } @@ -2514,6 +2582,7 @@ async function _handleRequest(request, __reqCtx, _mwCtx) { const _asyncLayoutParams = makeThenableParams(params); return __renderAppPageLifecycle({ cleanPathname, + clientTraceMetadata: ${JSON.stringify(clientTraceMetadata)}, clearRequestContext() { setHeadersContext(null); setNavigationContext(null); diff --git a/packages/vinext/src/entries/pages-client-entry.ts b/packages/vinext/src/entries/pages-client-entry.ts index 5c3bfff66..64ba68360 100644 --- a/packages/vinext/src/entries/pages-client-entry.ts +++ b/packages/vinext/src/entries/pages-client-entry.ts @@ -14,6 +14,8 @@ import { patternToNextFormat as pagesPatternToNextFormat, type Route, } from "../routing/pages-router.js"; +import fs from "node:fs/promises"; +import { hasNamedExport } from "../build/report.js"; import { createValidFileMatcher } from "../routing/file-matcher.js"; import { type ResolvedNextConfig } from "../config/next-config.js"; import { findFileWithExts } from "./pages-entry-helpers.js"; @@ -40,6 +42,19 @@ export async function generateClientEntry( return ` ${JSON.stringify(nextFormatPattern)}: () => import(${JSON.stringify(absPath)})`; }); + const ssgRoutes: string[] = []; + for (const route of pageRoutes) { + try { + const source = await fs.readFile(route.filePath, "utf-8"); + if (hasNamedExport(source, "getStaticProps")) { + ssgRoutes.push(pagesPatternToNextFormat(route.pattern)); + } + } catch { + // If source analysis fails, skip data prefetch for this route. Navigation + // still loads data on demand, which is safer than executing GSSP early. + } + } + const appFileBase = appFilePath?.replace(/\\/g, "/"); return ` @@ -55,6 +70,8 @@ const pageLoaders = { ${loaderEntries.join(",\n")} }; +window.__VINEXT_PAGES_SSG_ROUTES__ = new Set(${JSON.stringify(ssgRoutes)}); + async function hydrate() { const nextData = window.__NEXT_DATA__; if (!nextData) { @@ -62,7 +79,7 @@ async function hydrate() { return; } - const { pageProps } = nextData.props; + const { pageProps, ...appProps } = nextData.props; const loader = pageLoaders[nextData.page]; if (!loader) { console.error("[vinext] No page loader for route:", nextData.page); @@ -84,7 +101,7 @@ async function hydrate() { const appModule = await import(${JSON.stringify(appFileBase!)}); const AppComponent = appModule.default; window.__VINEXT_APP__ = AppComponent; - element = React.createElement(AppComponent, { Component: PageComponent, pageProps }); + element = React.createElement(AppComponent, { Component: PageComponent, pageProps, ...appProps }); } catch { element = React.createElement(PageComponent, pageProps); } @@ -107,6 +124,23 @@ async function hydrate() { const root = hydrateRoot(container, element); window.__VINEXT_ROOT__ = root; window.__VINEXT_HYDRATED_AT = performance.now(); + window.__NEXT_HYDRATED = true; + window.__NEXT_HYDRATED_AT = window.__VINEXT_HYDRATED_AT; + if (typeof window.__NEXT_HYDRATED_CB === "function") { + window.__NEXT_HYDRATED_CB(); + } + + if (nextData.isFallback === true) { + const Router = (await import("next/router")).default; + window.__VINEXT_SUPPRESS_DATA_NAVIGATION_FAILURE = true; + Router.replace(window.location.pathname + window.location.search) + .catch((error) => { + console.error("[vinext] Failed to resolve fallback page data", error); + }) + .finally(() => { + window.__VINEXT_SUPPRESS_DATA_NAVIGATION_FAILURE = false; + }); + } } hydrate(); diff --git a/packages/vinext/src/entries/pages-server-entry.ts b/packages/vinext/src/entries/pages-server-entry.ts index c062484f5..0bf9559c7 100644 --- a/packages/vinext/src/entries/pages-server-entry.ts +++ b/packages/vinext/src/entries/pages-server-entry.ts @@ -32,6 +32,10 @@ const _pagesNodeCompatPath = resolveEntryPath("../server/pages-node-compat.js", const _pagesApiRoutePath = resolveEntryPath("../server/pages-api-route.js", import.meta.url); const _isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url); const _cspPath = resolveEntryPath("../server/csp.js", import.meta.url); +const _edgeRuntimeGlobalsPath = resolveEntryPath( + "../server/edge-runtime-globals.js", + import.meta.url, +); /** * Generate the virtual SSR server entry module. @@ -43,9 +47,12 @@ export async function generateServerEntry( fileMatcher: ReturnTypeThis page could not be found.
", { status: 404, headers: { "Content-Type": "text/html" } }); } @@ -586,11 +903,45 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { ensureFetchPatch(); try { const routePattern = patternToNextFormat(route.pattern); + const requestUrl = request.headers.get("x-vinext-original-url") || requestPathAndSearch(request); + const asPath = isDataRequest ? routeUrl : requestUrl; + const routeUrlObject = new URL(routeUrl, "http://vinext.local"); + const requestUrlObject = new URL(requestUrl, "http://vinext.local"); + const routePathname = normalizeRevalidatePath(routeUrlObject.pathname); + const hasOnDemandRevalidate = __onDemandRevalidatePaths.delete(routePathname); + const revalidateReason = hasOnDemandRevalidate + ? "on-demand" + : process.env.VINEXT_PRERENDER === "1" + ? "build" + : undefined; + const resolvedUrl = isDataRequest + ? routeUrl + : routeUrlObject.pathname + requestUrlObject.search; + const pageModule = route.module; + const isGsspPage = typeof pageModule.getServerSideProps === "function"; + const isGspPage = typeof pageModule.getStaticProps === "function"; + const routeSearchWasRewritten = + routeUrlObject.search !== "" && routeUrlObject.search !== requestUrlObject.search; + const query = isGsspPage + ? mergeRouteQuery(params, routeUrl) + : isGspPage + ? routeSearchWasRewritten + ? mergeRouteQuery(params, routeUrl) + : { ...params } + : mergeRouteQuery(params, requestUrl); + if (!isGsspPage && request.method !== "GET" && request.method !== "HEAD") { + return new Response("Method Not Allowed", { + status: 405, + headers: { Allow: "GET, HEAD" }, + }); + } + if (typeof setSSRContext === "function") { setSSRContext({ pathname: routePattern, - query: { ...params, ...parseQuery(routeUrl) }, - asPath: routeUrl, + query, + asPath, + isFallback: false, locale: locale, locales: i18nConfig ? i18nConfig.locales : undefined, defaultLocale: currentDefaultLocale, @@ -608,12 +959,13 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { }); } - const pageModule = route.module; const PageComponent = pageModule.default; if (!PageComponent) { return new Response("Page has no default export", { status: 500 }); } const scriptNonce = __getScriptNonceFromHeaderSources(request.headers, middlewareHeaders); + const shouldBufferResponse = true; + const isCrawlerRequest = __isPagesHtmlBotUserAgent(request.headers.get("user-agent") || ""); // Build font Link header early so it's available for ISR cached responses too. // Font preloads are module-level state populated at import time and persist across requests. var _fontLinkHeader = ""; @@ -626,14 +978,14 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { _fontLinkHeader = _allFp.map(function(p) { return "<" + p.href + ">; rel=preload; as=font; type=" + p.type + "; crossorigin"; }).join(", "); } } catch (e) { /* font preloads not available */ } - const query = parseQuery(routeUrl); const pageDataResult = await __resolvePagesPageData({ applyRequestContexts() { if (typeof setSSRContext === "function") { setSSRContext({ pathname: routePattern, - query: { ...params, ...query }, - asPath: routeUrl, + query, + asPath, + isFallback: false, locale: locale, locales: i18nConfig ? i18nConfig.locales : undefined, defaultLocale: currentDefaultLocale, @@ -652,7 +1004,7 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { }, buildId, createGsspReqRes() { - return __createPagesReqRes({ body: undefined, query, request, url: routeUrl }); + return __createPagesReqRes({ body: undefined, query, request, url: requestUrl }); }, createPageElement(currentPageProps) { var currentElement = AppComponent @@ -673,6 +1025,11 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { pageModule, params, query, + hasGeneratedFallbackPath: __generatedFallbackPaths.has(routeUrlObject.pathname), + isCrawlerRequest, + isDataRequest, + revalidateReason, + resolvedUrl, renderIsrPassToStringAsync, route: { isDynamic: route.isDynamic, @@ -696,29 +1053,208 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { if (pageDataResult.kind === "response") { return pageDataResult.response; } + if (pageDataResult.kind === "notFound") { + const notFoundResponse = await renderStatusPage({ + request, + manifest, + middlewareHeaders, + statusCode: 404, + locale, + defaultLocale: currentDefaultLocale, + domainLocales, + }); + if (notFoundResponse) return notFoundResponse; + return new Response("This page could not be found.
", + { status: 404, headers: { "Content-Type": "text/html" } }); + } let pageProps = pageDataResult.pageProps; var gsspRes = pageDataResult.gsspRes; let isrRevalidateSeconds = pageDataResult.isrRevalidateSeconds; + const isFallback = pageDataResult.isFallback === true; + if (typeof setSSRContext === "function") { + setSSRContext({ + pathname: routePattern, + query, + asPath, + isFallback, + locale: locale, + locales: i18nConfig ? i18nConfig.locales : undefined, + defaultLocale: currentDefaultLocale, + domainLocales: domainLocales, + }); + } + let appInitialProps = {}; + const documentQuery = query; + if (AppComponent && typeof AppComponent.getInitialProps === "function") { + const appReqRes = __createPagesReqRes({ body: undefined, query: documentQuery, request, url: requestUrl }); + const appCtx = { + Component: PageComponent, + router: { + pathname: routePattern, + route: routePattern, + query: documentQuery, + asPath, + }, + ctx: { + req: appReqRes.req, + res: appReqRes.res, + pathname: routePattern, + query: documentQuery, + asPath, + locale: locale, + locales: i18nConfig ? i18nConfig.locales : undefined, + defaultLocale: currentDefaultLocale, + }, + }; + const nextAppProps = await AppComponent.getInitialProps(appCtx); + if (appReqRes.res.headersSent) { + return await appReqRes.responsePromise; + } + if (nextAppProps && typeof nextAppProps === "object") { + const { pageProps: appPageProps, ...restAppProps } = nextAppProps; + appInitialProps = restAppProps; + if (appPageProps && typeof appPageProps === "object") { + pageProps = { ...appPageProps, ...pageProps }; + } + } + } + + function normalizeDocumentRenderPageOptions(renderOptions) { + if (!renderOptions) return null; + if (typeof renderOptions === "function") { + return { enhanceComponent: renderOptions }; + } + return renderOptions; + } + + function createPageElementWithOptions(currentPageProps, renderOptions) { + var normalizedRenderOptions = normalizeDocumentRenderPageOptions(renderOptions); + var RenderPageComponent = PageComponent; + var RenderAppComponent = AppComponent; + if (normalizedRenderOptions && typeof normalizedRenderOptions.enhanceComponent === "function") { + RenderPageComponent = normalizedRenderOptions.enhanceComponent(RenderPageComponent); + } + + var currentElement; + if (RenderAppComponent) { + if (normalizedRenderOptions && typeof normalizedRenderOptions.enhanceApp === "function") { + RenderAppComponent = normalizedRenderOptions.enhanceApp(RenderAppComponent); + } + currentElement = React.createElement(RenderAppComponent, { Component: RenderPageComponent, pageProps: currentPageProps, ...appInitialProps }); + } else if (normalizedRenderOptions && typeof normalizedRenderOptions.enhanceApp === "function") { + var DefaultApp = function DefaultApp(props) { + return React.createElement(props.Component, props.pageProps); + }; + RenderAppComponent = normalizedRenderOptions.enhanceApp(DefaultApp); + currentElement = React.createElement(RenderAppComponent, { Component: RenderPageComponent, pageProps: currentPageProps }); + } else { + currentElement = React.createElement(RenderPageComponent, currentPageProps); + } + return wrapWithRouterContext(currentElement); + } + + let documentInitialProps = {}; + let documentRenderPageOptions = null; + if (DocumentComponent && typeof DocumentComponent.getInitialProps === "function") { + const documentReqRes = __createPagesReqRes({ body: undefined, query: documentQuery, request, url: requestUrl }); + const documentCtx = { + pathname: routePattern, + query: documentQuery, + asPath, + locale: locale, + locales: i18nConfig ? i18nConfig.locales : undefined, + defaultLocale: currentDefaultLocale, + req: documentReqRes.req, + res: documentReqRes.res, + renderPage: async function renderDocumentPage(renderOptions) { + documentRenderPageOptions = normalizeDocumentRenderPageOptions(renderOptions); + const html = await renderToStringAsync( + createPageElementWithOptions(pageProps, documentRenderPageOptions), + ); + return { html, head: [], styles: [] }; + }, + }; + const nextDocumentProps = await DocumentComponent.getInitialProps(documentCtx); + if (documentReqRes.res.headersSent) { + return await documentReqRes.responsePromise; + } + if (nextDocumentProps && typeof nextDocumentProps === "object") { + documentInitialProps = nextDocumentProps; + } + } + + const pageModuleUrl = findModuleJsAsset(manifest, route.filePath); + const appModuleUrl = findModuleJsAsset(manifest, appModuleFilePath); + + if (isDataRequest) { + var dataHeaders = new Headers({ "Content-Type": "application/json" }); + if (process.env.NEXT_DEPLOYMENT_ID) { + dataHeaders.set("x-nextjs-deployment-id", process.env.NEXT_DEPLOYMENT_ID); + } + if (gsspRes && typeof gsspRes.getHeaders === "function") { + var gsspHeaders = gsspRes.getHeaders(); + for (var hk in gsspHeaders) { + var hv = gsspHeaders[hk]; + if (Array.isArray(hv)) { + for (var hi = 0; hi < hv.length; hi++) dataHeaders.append(hk, String(hv[hi])); + } else if (hv !== undefined) { + dataHeaders.set(hk, String(hv)); + } + } + dataHeaders.set("Content-Type", "application/json"); + } + if (gsspRes && !dataHeaders.has("Cache-Control")) { + dataHeaders.set("Cache-Control", "private, no-cache, no-store, max-age=0, must-revalidate"); + } + if (isGspPage && !dataHeaders.has("Cache-Control")) { + dataHeaders.set("Cache-Control", __buildPagesIsrCacheControl(isrRevalidateSeconds || undefined, "MISS")); + } + if (isGspPage) { + __generatedFallbackPaths.add(routeUrlObject.pathname); + } + return new Response(safeJsonStringify({ + ...appInitialProps, + pageProps, + page: routePattern, + query, + buildId, + isFallback, + ...(i18nConfig ? { + locale, + locales: i18nConfig.locales, + defaultLocale: currentDefaultLocale, + domainLocales, + } : {}), + ...(isGspPage ? { gsp: true } : {}), + ...(gsspRes ? { gssp: true } : {}), + __vinext: { + ...(pageModuleUrl ? { pageModuleUrl } : {}), + ...(appModuleUrl ? { appModuleUrl } : {}), + }, + }), { + status: gsspRes ? gsspRes.statusCode : 200, + headers: dataHeaders, + }); + } const pageModuleIds = route.filePath ? [route.filePath] : []; const assetTags = collectAssetTags(manifest, pageModuleIds, scriptNonce); - return __renderPagesPageResponse({ + return await __renderPagesPageResponse({ assetTags, + appProps: appInitialProps, buildId, + clientTraceMetadata: vinextConfig.clientTraceMetadata, clearSsrContext() { if (typeof setSSRContext === "function") setSSRContext(null); }, createPageElement(currentPageProps) { - var currentElement; - if (AppComponent) { - currentElement = React.createElement(AppComponent, { Component: PageComponent, pageProps: currentPageProps }); - } else { - currentElement = React.createElement(PageComponent, currentPageProps); - } - return wrapWithRouterContext(currentElement); + return createPageElementWithOptions(currentPageProps, documentRenderPageOptions); }, + crossOrigin: vinextConfig.crossOrigin, DocumentComponent, + documentProps: documentInitialProps, + documentRenderPageOptions, flushPreloads: typeof flushPreloads === "function" ? flushPreloads : undefined, fontLinkHeader: _fontLinkHeader, fontPreloads: _allFp, @@ -741,6 +1277,8 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { }, getSSRHeadHTML: typeof getSSRHeadHTML === "function" ? getSSRHeadHTML : undefined, gsspRes, + isFallback, + isGsp: isGspPage, isrCacheKey, isrRevalidateSeconds, isrSet, @@ -751,10 +1289,15 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { domainLocales: domainLocales, }, pageProps, - params, + pageModuleUrl, + appModuleUrl, + params: query, renderDocumentToString(element) { return renderToStringAsync(element); }, + renderHeadPrepassToStringAsync(element) { + return renderToStringAsync(element); + }, renderIsrPassToStringAsync, renderToReadableStream(element) { return renderToReadableStream(element); @@ -764,6 +1307,7 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { routeUrl, safeJsonStringify, scriptNonce, + shouldBufferResponse, }); } catch (e) { console.error("[vinext] SSR error:", e); @@ -772,6 +1316,20 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { { path: url, method: request.method, headers: Object.fromEntries(request.headers.entries()) }, { routerKind: "Pages Router", routePath: route.pattern, routeType: "render" }, ).catch(() => { /* ignore reporting errors */ }); + try { + const errorResponse = await renderStatusPage({ + request, + manifest, + middlewareHeaders, + statusCode: 500, + locale, + defaultLocale: currentDefaultLocale, + domainLocales, + }); + if (errorResponse) return errorResponse; + } catch (_render500Error) { + // Fall through to the generic 500 below. + } return new Response("Internal Server Error", { status: 500 }); } }); @@ -781,6 +1339,9 @@ export async function handleApiRoute(request, url) { const match = matchRoute(url, apiRoutes); return __handlePagesApiRoute({ match, + onRevalidate(urlPath) { + __onDemandRevalidatePaths.add(normalizeRevalidatePath(urlPath)); + }, request, url, reportRequestError(error, routePattern) { diff --git a/packages/vinext/src/global.d.ts b/packages/vinext/src/global.d.ts index 289792e82..86c3246ea 100644 --- a/packages/vinext/src/global.d.ts +++ b/packages/vinext/src/global.d.ts @@ -17,8 +17,10 @@ */ import type { Root } from "react-dom/client"; +import type { VinextNextData } from "./client/vinext-next-data"; import type { OnRequestErrorHandler } from "./server/instrumentation"; import type { CachedRscResponse, PrefetchCacheEntry } from "./shims/navigation"; +import type { NextRouterSingleton } from "./shims/router"; // --------------------------------------------------------------------------- // Window globals — browser-side state shared across module boundaries @@ -42,6 +44,14 @@ declare global { */ __VINEXT_HYDRATED_AT: number | undefined; + /** + * Next.js conventional hydration markers used by upstream test helpers and + * compatibility suites. + */ + __NEXT_HYDRATED: boolean | undefined; + __NEXT_HYDRATED_AT: number | undefined; + __NEXT_HYDRATED_CB: (() => void) | undefined; + /** * The cached `_app` component for Pages Router. * Written and read by `shims/router.ts` to avoid re-importing on every @@ -69,6 +79,27 @@ declare global { */ __VINEXT_DEFAULT_LOCALE__: string | undefined; + /** + * Legacy Next.js browser global used by parts of the upstream Pages Router + * test suite and by older integrations that reach for the Router singleton + * outside the module system. + */ + next: { router?: NextRouterSingleton } | undefined; + + /** + * Suppresses hard navigations when a fallback shell's automatic data fetch + * fails. Next keeps the fallback page mounted for failed fallback data + * loads instead of blowing away page globals with a reload. + */ + __VINEXT_SUPPRESS_DATA_NAVIGATION_FAILURE: boolean | undefined; + + /** + * Pages Router route patterns that are known to use getStaticProps. + * The generated client entry sets this so Link prefetching can avoid + * executing request-specific getServerSideProps routes in the background. + */ + __VINEXT_PAGES_SSG_ROUTES__: SetThis page could not be found.
", + { + status: 404, + headers: { "Content-Type": "text/html" }, + }, + ); } function buildPagesDataNotFoundResponse(): Response { - return new Response("404", { status: 404 }); + return buildPagesNotFoundResponse(); } function resolvePagesRedirectStatus(redirect: PagesRedirectResult): number { @@ -139,7 +173,37 @@ function resolvePagesRedirectStatus(redirect: PagesRedirectResult): number { function matchesPagesStaticPath( pathEntry: PagesStaticPathsEntry, params: Record> = { Component: ComponentType
;
pageProps: P;
};
-// Re-export for named import compatibility
-export type { AppProps as default };
+type AppContext = {
+ Component: ComponentType & {
+ getInitialProps?: (ctx: unknown) => unknown | Promise > extends React.Component > extends React.Component {
+ static async getInitialProps(ctx: DocumentContext): Promise
This page could not be found.
", { status: 404, headers: { "Content-Type": "text/html" } }); } @@ -15163,11 +15657,45 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { ensureFetchPatch(); try { const routePattern = patternToNextFormat(route.pattern); + const requestUrl = request.headers.get("x-vinext-original-url") || requestPathAndSearch(request); + const asPath = isDataRequest ? routeUrl : requestUrl; + const routeUrlObject = new URL(routeUrl, "http://vinext.local"); + const requestUrlObject = new URL(requestUrl, "http://vinext.local"); + const routePathname = normalizeRevalidatePath(routeUrlObject.pathname); + const hasOnDemandRevalidate = __onDemandRevalidatePaths.delete(routePathname); + const revalidateReason = hasOnDemandRevalidate + ? "on-demand" + : process.env.VINEXT_PRERENDER === "1" + ? "build" + : undefined; + const resolvedUrl = isDataRequest + ? routeUrl + : routeUrlObject.pathname + requestUrlObject.search; + const pageModule = route.module; + const isGsspPage = typeof pageModule.getServerSideProps === "function"; + const isGspPage = typeof pageModule.getStaticProps === "function"; + const routeSearchWasRewritten = + routeUrlObject.search !== "" && routeUrlObject.search !== requestUrlObject.search; + const query = isGsspPage + ? mergeRouteQuery(params, routeUrl) + : isGspPage + ? routeSearchWasRewritten + ? mergeRouteQuery(params, routeUrl) + : { ...params } + : mergeRouteQuery(params, requestUrl); + if (!isGsspPage && request.method !== "GET" && request.method !== "HEAD") { + return new Response("Method Not Allowed", { + status: 405, + headers: { Allow: "GET, HEAD" }, + }); + } + if (typeof setSSRContext === "function") { setSSRContext({ pathname: routePattern, - query: { ...params, ...parseQuery(routeUrl) }, - asPath: routeUrl, + query, + asPath, + isFallback: false, locale: locale, locales: i18nConfig ? i18nConfig.locales : undefined, defaultLocale: currentDefaultLocale, @@ -15185,12 +15713,13 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { }); } - const pageModule = route.module; const PageComponent = pageModule.default; if (!PageComponent) { return new Response("Page has no default export", { status: 500 }); } const scriptNonce = __getScriptNonceFromHeaderSources(request.headers, middlewareHeaders); + const shouldBufferResponse = true; + const isCrawlerRequest = __isPagesHtmlBotUserAgent(request.headers.get("user-agent") || ""); // Build font Link header early so it's available for ISR cached responses too. // Font preloads are module-level state populated at import time and persist across requests. var _fontLinkHeader = ""; @@ -15203,14 +15732,14 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { _fontLinkHeader = _allFp.map(function(p) { return "<" + p.href + ">; rel=preload; as=font; type=" + p.type + "; crossorigin"; }).join(", "); } } catch (e) { /* font preloads not available */ } - const query = parseQuery(routeUrl); const pageDataResult = await __resolvePagesPageData({ applyRequestContexts() { if (typeof setSSRContext === "function") { setSSRContext({ pathname: routePattern, - query: { ...params, ...query }, - asPath: routeUrl, + query, + asPath, + isFallback: false, locale: locale, locales: i18nConfig ? i18nConfig.locales : undefined, defaultLocale: currentDefaultLocale, @@ -15229,7 +15758,7 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { }, buildId, createGsspReqRes() { - return __createPagesReqRes({ body: undefined, query, request, url: routeUrl }); + return __createPagesReqRes({ body: undefined, query, request, url: requestUrl }); }, createPageElement(currentPageProps) { var currentElement = AppComponent @@ -15250,6 +15779,11 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { pageModule, params, query, + hasGeneratedFallbackPath: __generatedFallbackPaths.has(routeUrlObject.pathname), + isCrawlerRequest, + isDataRequest, + revalidateReason, + resolvedUrl, renderIsrPassToStringAsync, route: { isDynamic: route.isDynamic, @@ -15273,29 +15807,208 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { if (pageDataResult.kind === "response") { return pageDataResult.response; } + if (pageDataResult.kind === "notFound") { + const notFoundResponse = await renderStatusPage({ + request, + manifest, + middlewareHeaders, + statusCode: 404, + locale, + defaultLocale: currentDefaultLocale, + domainLocales, + }); + if (notFoundResponse) return notFoundResponse; + return new Response("This page could not be found.
", + { status: 404, headers: { "Content-Type": "text/html" } }); + } let pageProps = pageDataResult.pageProps; var gsspRes = pageDataResult.gsspRes; let isrRevalidateSeconds = pageDataResult.isrRevalidateSeconds; + const isFallback = pageDataResult.isFallback === true; + if (typeof setSSRContext === "function") { + setSSRContext({ + pathname: routePattern, + query, + asPath, + isFallback, + locale: locale, + locales: i18nConfig ? i18nConfig.locales : undefined, + defaultLocale: currentDefaultLocale, + domainLocales: domainLocales, + }); + } + let appInitialProps = {}; + const documentQuery = query; + if (AppComponent && typeof AppComponent.getInitialProps === "function") { + const appReqRes = __createPagesReqRes({ body: undefined, query: documentQuery, request, url: requestUrl }); + const appCtx = { + Component: PageComponent, + router: { + pathname: routePattern, + route: routePattern, + query: documentQuery, + asPath, + }, + ctx: { + req: appReqRes.req, + res: appReqRes.res, + pathname: routePattern, + query: documentQuery, + asPath, + locale: locale, + locales: i18nConfig ? i18nConfig.locales : undefined, + defaultLocale: currentDefaultLocale, + }, + }; + const nextAppProps = await AppComponent.getInitialProps(appCtx); + if (appReqRes.res.headersSent) { + return await appReqRes.responsePromise; + } + if (nextAppProps && typeof nextAppProps === "object") { + const { pageProps: appPageProps, ...restAppProps } = nextAppProps; + appInitialProps = restAppProps; + if (appPageProps && typeof appPageProps === "object") { + pageProps = { ...appPageProps, ...pageProps }; + } + } + } + + function normalizeDocumentRenderPageOptions(renderOptions) { + if (!renderOptions) return null; + if (typeof renderOptions === "function") { + return { enhanceComponent: renderOptions }; + } + return renderOptions; + } + + function createPageElementWithOptions(currentPageProps, renderOptions) { + var normalizedRenderOptions = normalizeDocumentRenderPageOptions(renderOptions); + var RenderPageComponent = PageComponent; + var RenderAppComponent = AppComponent; + if (normalizedRenderOptions && typeof normalizedRenderOptions.enhanceComponent === "function") { + RenderPageComponent = normalizedRenderOptions.enhanceComponent(RenderPageComponent); + } + + var currentElement; + if (RenderAppComponent) { + if (normalizedRenderOptions && typeof normalizedRenderOptions.enhanceApp === "function") { + RenderAppComponent = normalizedRenderOptions.enhanceApp(RenderAppComponent); + } + currentElement = React.createElement(RenderAppComponent, { Component: RenderPageComponent, pageProps: currentPageProps, ...appInitialProps }); + } else if (normalizedRenderOptions && typeof normalizedRenderOptions.enhanceApp === "function") { + var DefaultApp = function DefaultApp(props) { + return React.createElement(props.Component, props.pageProps); + }; + RenderAppComponent = normalizedRenderOptions.enhanceApp(DefaultApp); + currentElement = React.createElement(RenderAppComponent, { Component: RenderPageComponent, pageProps: currentPageProps }); + } else { + currentElement = React.createElement(RenderPageComponent, currentPageProps); + } + return wrapWithRouterContext(currentElement); + } + + let documentInitialProps = {}; + let documentRenderPageOptions = null; + if (DocumentComponent && typeof DocumentComponent.getInitialProps === "function") { + const documentReqRes = __createPagesReqRes({ body: undefined, query: documentQuery, request, url: requestUrl }); + const documentCtx = { + pathname: routePattern, + query: documentQuery, + asPath, + locale: locale, + locales: i18nConfig ? i18nConfig.locales : undefined, + defaultLocale: currentDefaultLocale, + req: documentReqRes.req, + res: documentReqRes.res, + renderPage: async function renderDocumentPage(renderOptions) { + documentRenderPageOptions = normalizeDocumentRenderPageOptions(renderOptions); + const html = await renderToStringAsync( + createPageElementWithOptions(pageProps, documentRenderPageOptions), + ); + return { html, head: [], styles: [] }; + }, + }; + const nextDocumentProps = await DocumentComponent.getInitialProps(documentCtx); + if (documentReqRes.res.headersSent) { + return await documentReqRes.responsePromise; + } + if (nextDocumentProps && typeof nextDocumentProps === "object") { + documentInitialProps = nextDocumentProps; + } + } + + const pageModuleUrl = findModuleJsAsset(manifest, route.filePath); + const appModuleUrl = findModuleJsAsset(manifest, appModuleFilePath); + + if (isDataRequest) { + var dataHeaders = new Headers({ "Content-Type": "application/json" }); + if (process.env.NEXT_DEPLOYMENT_ID) { + dataHeaders.set("x-nextjs-deployment-id", process.env.NEXT_DEPLOYMENT_ID); + } + if (gsspRes && typeof gsspRes.getHeaders === "function") { + var gsspHeaders = gsspRes.getHeaders(); + for (var hk in gsspHeaders) { + var hv = gsspHeaders[hk]; + if (Array.isArray(hv)) { + for (var hi = 0; hi < hv.length; hi++) dataHeaders.append(hk, String(hv[hi])); + } else if (hv !== undefined) { + dataHeaders.set(hk, String(hv)); + } + } + dataHeaders.set("Content-Type", "application/json"); + } + if (gsspRes && !dataHeaders.has("Cache-Control")) { + dataHeaders.set("Cache-Control", "private, no-cache, no-store, max-age=0, must-revalidate"); + } + if (isGspPage && !dataHeaders.has("Cache-Control")) { + dataHeaders.set("Cache-Control", __buildPagesIsrCacheControl(isrRevalidateSeconds || undefined, "MISS")); + } + if (isGspPage) { + __generatedFallbackPaths.add(routeUrlObject.pathname); + } + return new Response(safeJsonStringify({ + ...appInitialProps, + pageProps, + page: routePattern, + query, + buildId, + isFallback, + ...(i18nConfig ? { + locale, + locales: i18nConfig.locales, + defaultLocale: currentDefaultLocale, + domainLocales, + } : {}), + ...(isGspPage ? { gsp: true } : {}), + ...(gsspRes ? { gssp: true } : {}), + __vinext: { + ...(pageModuleUrl ? { pageModuleUrl } : {}), + ...(appModuleUrl ? { appModuleUrl } : {}), + }, + }), { + status: gsspRes ? gsspRes.statusCode : 200, + headers: dataHeaders, + }); + } const pageModuleIds = route.filePath ? [route.filePath] : []; const assetTags = collectAssetTags(manifest, pageModuleIds, scriptNonce); - return __renderPagesPageResponse({ + return await __renderPagesPageResponse({ assetTags, + appProps: appInitialProps, buildId, + clientTraceMetadata: vinextConfig.clientTraceMetadata, clearSsrContext() { if (typeof setSSRContext === "function") setSSRContext(null); }, createPageElement(currentPageProps) { - var currentElement; - if (AppComponent) { - currentElement = React.createElement(AppComponent, { Component: PageComponent, pageProps: currentPageProps }); - } else { - currentElement = React.createElement(PageComponent, currentPageProps); - } - return wrapWithRouterContext(currentElement); + return createPageElementWithOptions(currentPageProps, documentRenderPageOptions); }, + crossOrigin: vinextConfig.crossOrigin, DocumentComponent, + documentProps: documentInitialProps, + documentRenderPageOptions, flushPreloads: typeof flushPreloads === "function" ? flushPreloads : undefined, fontLinkHeader: _fontLinkHeader, fontPreloads: _allFp, @@ -15318,6 +16031,8 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { }, getSSRHeadHTML: typeof getSSRHeadHTML === "function" ? getSSRHeadHTML : undefined, gsspRes, + isFallback, + isGsp: isGspPage, isrCacheKey, isrRevalidateSeconds, isrSet, @@ -15328,10 +16043,15 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { domainLocales: domainLocales, }, pageProps, - params, + pageModuleUrl, + appModuleUrl, + params: query, renderDocumentToString(element) { return renderToStringAsync(element); }, + renderHeadPrepassToStringAsync(element) { + return renderToStringAsync(element); + }, renderIsrPassToStringAsync, renderToReadableStream(element) { return renderToReadableStream(element); @@ -15341,6 +16061,7 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { routeUrl, safeJsonStringify, scriptNonce, + shouldBufferResponse, }); } catch (e) { console.error("[vinext] SSR error:", e); @@ -15349,6 +16070,20 @@ async function _renderPage(request, url, manifest, middlewareHeaders) { { path: url, method: request.method, headers: Object.fromEntries(request.headers.entries()) }, { routerKind: "Pages Router", routePath: route.pattern, routeType: "render" }, ).catch(() => { /* ignore reporting errors */ }); + try { + const errorResponse = await renderStatusPage({ + request, + manifest, + middlewareHeaders, + statusCode: 500, + locale, + defaultLocale: currentDefaultLocale, + domainLocales, + }); + if (errorResponse) return errorResponse; + } catch (_render500Error) { + // Fall through to the generic 500 below. + } return new Response("Internal Server Error", { status: 500 }); } }); @@ -15358,6 +16093,9 @@ export async function handleApiRoute(request, url) { const match = matchRoute(url, apiRoutes); return __handlePagesApiRoute({ match, + onRevalidate(urlPath) { + __onDemandRevalidatePaths.add(normalizeRevalidatePath(urlPath)); + }, request, url, reportRequestError(error, routePattern) { @@ -15742,6 +16480,10 @@ async function _runMiddleware(request) { var matcher = config && config.matcher; var url = new URL(request.url); + if (vinextConfig.basePath && matcher !== undefined && request.headers.get("x-vinext-request-had-base-path") === "0") { + return { continue: true }; + } + // Normalize pathname before matching to prevent path-confusion bypasses // (percent-encoding like /%61dmin, double slashes like /dashboard//settings). var decodedPathname; @@ -15758,10 +16500,18 @@ async function _runMiddleware(request) { if (normalizedPathname !== url.pathname) { var mwUrl = new URL(url); mwUrl.pathname = normalizedPathname; - mwRequest = new Request(mwUrl, request); + mwRequest = new Request(mwUrl, request.clone()); } - var __mwNextConfig = (vinextConfig.basePath || i18nConfig) ? { basePath: vinextConfig.basePath, i18n: i18nConfig || undefined } : undefined; + var __mwBasePath = vinextConfig.basePath && request.headers.get("x-vinext-request-had-base-path") !== "0" ? vinextConfig.basePath : ""; + var __mwNextConfig = (__mwBasePath || i18nConfig) ? { basePath: __mwBasePath, i18n: i18nConfig || undefined } : undefined; var nextRequest = mwRequest instanceof NextRequest ? mwRequest : new NextRequest(mwRequest, __mwNextConfig ? { nextConfig: __mwNextConfig } : undefined); + if (mwRequest.headers.get("x-vinext-data-request") === "1") { + Object.defineProperty(nextRequest, "__isData", { + value: true, + enumerable: false, + configurable: true, + }); + } var fetchEvent = new NextFetchEvent({ page: normalizedPathname }); var response; try { response = await middlewareFn(nextRequest, fetchEvent); } @@ -15809,7 +16559,19 @@ async function _runMiddleware(request) { if (!k.startsWith("x-middleware-") || k === "x-middleware-override-headers" || k.startsWith("x-middleware-request-")) rwHeaders.append(k, v); } var rewritePath; - try { var parsed = new URL(rewriteUrl, request.url); rewritePath = parsed.pathname + parsed.search; } + try { + var parsed = new URL(rewriteUrl, request.url); + var current = new URL(request.url); + if (parsed.origin !== current.origin) { + rewritePath = parsed.toString(); + } else { + var parsedPathname = parsed.pathname; + if (__mwBasePath && (parsedPathname === __mwBasePath || parsedPathname.startsWith(__mwBasePath + "/"))) { + parsedPathname = parsedPathname.slice(__mwBasePath.length) || "/"; + } + rewritePath = parsedPathname + parsed.search; + } + } catch { rewritePath = rewriteUrl; } return { continue: true, rewriteUrl: rewritePath, rewriteStatus: response.status !== 200 ? response.status : undefined, responseHeaders: rwHeaders }; } diff --git a/tests/entry-templates.test.ts b/tests/entry-templates.test.ts index 5fbbac7fc..e5d423d4d 100644 --- a/tests/entry-templates.test.ts +++ b/tests/entry-templates.test.ts @@ -332,7 +332,7 @@ describe("Pages Router entry templates", () => { it("server entry seeds the main Pages Router unified context with executionContext", async () => { const code = await getVirtualModuleCode("virtual:vinext-server-entry"); const renderPageIndex = code.indexOf( - "async function _renderPage(request, url, manifest, middlewareHeaders) {", + "async function _renderPage(request, url, manifest, middlewareHeaders", ); const unifiedCtxIndex = code.indexOf("const __uCtx = _createUnifiedCtx({", renderPageIndex); @@ -361,7 +361,7 @@ describe("Pages Router entry templates", () => { const code = await getVirtualModuleCode("virtual:vinext-server-entry"); expect(code).toContain("renderPagesPageResponse as __renderPagesPageResponse"); - expect(code).toContain("return __renderPagesPageResponse({"); + expect(code).toContain("__renderPagesPageResponse({"); expect(code).not.toContain('var BODY_MARKER = "";'); expect(code).not.toContain("var compositeStream = new ReadableStream({"); }); From dcb8062430e4a1ec3951610c5890439c4d39bfaf Mon Sep 17 00:00:00 2001 From: Steve Faulkner