vinext 0.0.52 → 0.0.54

package/dist/server/client-trace-metadata.d.ts

@@ -0,0 +1,31 @@
+//#region src/server/client-trace-metadata.d.ts
+type ClientTraceDataEntry = {
+  key: string;
+  value: string;
+};
+/**
+ * Filter an entry list against the configured `clientTraceMetadata` allow-list.
+ * Returns `undefined` when the allow-list is unset so callers can skip
+ * rendering altogether.
+ */
+declare function filterClientTraceMetadata(entries: readonly ClientTraceDataEntry[], allowList: readonly string[] | undefined): ClientTraceDataEntry[] | undefined;
+/**
+ * Render the filtered entries as a sequence of self-closing `<meta>` tags.
+ * Names and values are HTML-attribute escaped. Returns an empty string when
+ * `entries` is empty or undefined so callers can append unconditionally.
+ */
+declare function renderClientTraceMetadataTags(entries: readonly ClientTraceDataEntry[] | undefined): string;
+/**
+ * Convenience helper: read OTel propagation data, filter against the
+ * configured allow-list, and render the resulting `<meta>` tags. Returns an
+ * empty string when the allow-list is unset, OTel is not installed, or no
+ * matching keys were emitted by the propagator.
+ *
+ * Safe to call unconditionally on every SSR render — when nothing is
+ * configured/active this is a few `try/catch`-bounded operations and returns
+ * `""`.
+ */
+declare function getClientTraceMetadataHTML(allowList: readonly string[] | undefined): string;
+//#endregion
+export { ClientTraceDataEntry, filterClientTraceMetadata, getClientTraceMetadataHTML, renderClientTraceMetadataTags };
+//# sourceMappingURL=client-trace-metadata.d.ts.map

package/dist/server/client-trace-metadata.js

@@ -0,0 +1,83 @@
+import { escapeHtmlAttr } from "./html.js";
+//#region src/server/client-trace-metadata.ts
+/**
+* Client trace metadata renderer.
+*
+* When `experimental.clientTraceMetadata` is configured in `next.config`,
+* vinext emits `<meta name="..." content="...">` tags in the SSR HTML head
+* for each configured key. The values are sourced from the active
+* OpenTelemetry context via the registered propagator.
+*
+* This mirrors Next.js' implementation:
+*  - packages/next/src/server/lib/trace/utils.ts (getTracedMetadata)
+*  - packages/next/src/server/app-render/make-get-server-inserted-html.tsx (traceMetaTags)
+*
+* OpenTelemetry is an optional peer — we resolve `@opentelemetry/api` at
+* runtime and silently no-op when it is not installed. This matches user
+* expectations: apps that don't configure OTel get no meta tags, and apps
+* that do get the filtered subset they asked for in `clientTraceMetadata`.
+*/
+const carrierSetter = { set(carrier, key, value) {
+	if (typeof key !== "string" || typeof value !== "string") return;
+	carrier.push({
+		key,
+		value
+	});
+} };
+function getOpenTelemetryTraceData() {
+	let api;
+	try {
+		const req = globalThis.require;
+		if (typeof req === "function") api = req("@opentelemetry/api");
+	} catch {
+		return [];
+	}
+	if (!api) return [];
+	try {
+		const activeContext = api.context.active();
+		const entries = [];
+		api.propagation.inject(activeContext, entries, carrierSetter);
+		return entries;
+	} catch {
+		return [];
+	}
+}
+/**
+* Filter an entry list against the configured `clientTraceMetadata` allow-list.
+* Returns `undefined` when the allow-list is unset so callers can skip
+* rendering altogether.
+*/
+function filterClientTraceMetadata(entries, allowList) {
+	if (!allowList || allowList.length === 0) return void 0;
+	const allowSet = new Set(allowList);
+	return entries.filter(({ key }) => allowSet.has(key));
+}
+/**
+* Render the filtered entries as a sequence of self-closing `<meta>` tags.
+* Names and values are HTML-attribute escaped. Returns an empty string when
+* `entries` is empty or undefined so callers can append unconditionally.
+*/
+function renderClientTraceMetadataTags(entries) {
+	if (!entries || entries.length === 0) return "";
+	let html = "";
+	for (const { key, value } of entries) html += `<meta name="${escapeHtmlAttr(key)}" content="${escapeHtmlAttr(value)}"/>`;
+	return html;
+}
+/**
+* Convenience helper: read OTel propagation data, filter against the
+* configured allow-list, and render the resulting `<meta>` tags. Returns an
+* empty string when the allow-list is unset, OTel is not installed, or no
+* matching keys were emitted by the propagator.
+*
+* Safe to call unconditionally on every SSR render — when nothing is
+* configured/active this is a few `try/catch`-bounded operations and returns
+* `""`.
+*/
+function getClientTraceMetadataHTML(allowList) {
+	if (!allowList || allowList.length === 0) return "";
+	return renderClientTraceMetadataTags(filterClientTraceMetadata(getOpenTelemetryTraceData(), allowList));
+}
+//#endregion
+export { filterClientTraceMetadata, getClientTraceMetadataHTML, renderClientTraceMetadataTags };
+
+//# sourceMappingURL=client-trace-metadata.js.map

package/dist/server/client-trace-metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-trace-metadata.js","names":[],"sources":["../../src/server/client-trace-metadata.ts"],"sourcesContent":["/**\n * Client trace metadata renderer.\n *\n * When `experimental.clientTraceMetadata` is configured in `next.config`,\n * vinext emits `<meta name=\"...\" content=\"...\">` tags in the SSR HTML head\n * for each configured key. The values are sourced from the active\n * OpenTelemetry context via the registered propagator.\n *\n * This mirrors Next.js' implementation:\n *  - packages/next/src/server/lib/trace/utils.ts (getTracedMetadata)\n *  - packages/next/src/server/app-render/make-get-server-inserted-html.tsx (traceMetaTags)\n *\n * OpenTelemetry is an optional peer — we resolve `@opentelemetry/api` at\n * runtime and silently no-op when it is not installed. This matches user\n * expectations: apps that don't configure OTel get no meta tags, and apps\n * that do get the filtered subset they asked for in `clientTraceMetadata`.\n */\nimport { escapeHtmlAttr } from \"./html.js\";\n\nexport type ClientTraceDataEntry = {\n  key: string;\n  value: string;\n};\n\ntype TextMapSetter = {\n  set(carrier: ClientTraceDataEntry[], key: string, value: string): void;\n};\n\nconst carrierSetter: TextMapSetter = {\n  set(carrier, key, value) {\n    if (typeof key !== \"string\" || typeof value !== \"string\") return;\n    carrier.push({ key, value });\n  },\n};\n\n/**\n * Pull entries off the active OpenTelemetry context via the registered\n * propagator. Returns an empty array when `@opentelemetry/api` is not\n * installed or when no propagator has been registered.\n *\n * The implementation mirrors Next.js's `NextTracerImpl.getTracePropagationData`:\n * we call `propagation.inject(activeContext, entries, setter)` and let the\n * setter push entries into our carrier array.\n */\ntype OpenTelemetryApi = {\n  context: { active(): unknown };\n  propagation: {\n    inject(context: unknown, carrier: ClientTraceDataEntry[], setter: TextMapSetter): void;\n  };\n};\n\nfunction getOpenTelemetryTraceData(): ClientTraceDataEntry[] {\n  let api: OpenTelemetryApi | undefined;\n  try {\n    // Use require() at runtime so `@opentelemetry/api` is an optional peer.\n    // Bundlers (Vite/esbuild) leave the `require` reference alone, so apps\n    // that don't install the package never hit this branch.\n    const req = (globalThis as { require?: (id: string) => unknown }).require;\n    if (typeof req === \"function\") {\n      api = req(\"@opentelemetry/api\") as OpenTelemetryApi;\n    }\n  } catch {\n    return [];\n  }\n\n  if (!api) return [];\n\n  try {\n    const activeContext = api.context.active();\n    const entries: ClientTraceDataEntry[] = [];\n    api.propagation.inject(activeContext, entries, carrierSetter);\n    return entries;\n  } catch {\n    return [];\n  }\n}\n\n/**\n * Filter an entry list against the configured `clientTraceMetadata` allow-list.\n * Returns `undefined` when the allow-list is unset so callers can skip\n * rendering altogether.\n */\nexport function filterClientTraceMetadata(\n  entries: readonly ClientTraceDataEntry[],\n  allowList: readonly string[] | undefined,\n): ClientTraceDataEntry[] | undefined {\n  if (!allowList || allowList.length === 0) return undefined;\n  const allowSet = new Set(allowList);\n  return entries.filter(({ key }) => allowSet.has(key));\n}\n\n/**\n * Render the filtered entries as a sequence of self-closing `<meta>` tags.\n * Names and values are HTML-attribute escaped. Returns an empty string when\n * `entries` is empty or undefined so callers can append unconditionally.\n */\nexport function renderClientTraceMetadataTags(\n  entries: readonly ClientTraceDataEntry[] | undefined,\n): string {\n  if (!entries || entries.length === 0) return \"\";\n  let html = \"\";\n  for (const { key, value } of entries) {\n    html += `<meta name=\"${escapeHtmlAttr(key)}\" content=\"${escapeHtmlAttr(value)}\"/>`;\n  }\n  return html;\n}\n\n/**\n * Convenience helper: read OTel propagation data, filter against the\n * configured allow-list, and render the resulting `<meta>` tags. Returns an\n * empty string when the allow-list is unset, OTel is not installed, or no\n * matching keys were emitted by the propagator.\n *\n * Safe to call unconditionally on every SSR render — when nothing is\n * configured/active this is a few `try/catch`-bounded operations and returns\n * `\"\"`.\n */\nexport function getClientTraceMetadataHTML(allowList: readonly string[] | undefined): string {\n  if (!allowList || allowList.length === 0) return \"\";\n  const entries = getOpenTelemetryTraceData();\n  const filtered = filterClientTraceMetadata(entries, allowList);\n  return renderClientTraceMetadataTags(filtered);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AA4BA,MAAM,gBAA+B,EACnC,IAAI,SAAS,KAAK,OAAO;CACvB,IAAI,OAAO,QAAQ,YAAY,OAAO,UAAU,UAAU;CAC1D,QAAQ,KAAK;EAAE;EAAK;EAAO,CAAC;GAE/B;AAkBD,SAAS,4BAAoD;CAC3D,IAAI;CACJ,IAAI;EAIF,MAAM,MAAO,WAAqD;EAClE,IAAI,OAAO,QAAQ,YACjB,MAAM,IAAI,qBAAqB;SAE3B;EACN,OAAO,EAAE;;CAGX,IAAI,CAAC,KAAK,OAAO,EAAE;CAEnB,IAAI;EACF,MAAM,gBAAgB,IAAI,QAAQ,QAAQ;EAC1C,MAAM,UAAkC,EAAE;EAC1C,IAAI,YAAY,OAAO,eAAe,SAAS,cAAc;EAC7D,OAAO;SACD;EACN,OAAO,EAAE;;;;;;;;AASb,SAAgB,0BACd,SACA,WACoC;CACpC,IAAI,CAAC,aAAa,UAAU,WAAW,GAAG,OAAO,KAAA;CACjD,MAAM,WAAW,IAAI,IAAI,UAAU;CACnC,OAAO,QAAQ,QAAQ,EAAE,UAAU,SAAS,IAAI,IAAI,CAAC;;;;;;;AAQvD,SAAgB,8BACd,SACQ;CACR,IAAI,CAAC,WAAW,QAAQ,WAAW,GAAG,OAAO;CAC7C,IAAI,OAAO;CACX,KAAK,MAAM,EAAE,KAAK,WAAW,SAC3B,QAAQ,eAAe,eAAe,IAAI,CAAC,aAAa,eAAe,MAAM,CAAC;CAEhF,OAAO;;;;;;;;;;;;AAaT,SAAgB,2BAA2B,WAAkD;CAC3F,IAAI,CAAC,aAAa,UAAU,WAAW,GAAG,OAAO;CAGjD,OAAO,8BADU,0BADD,2BACkC,EAAE,UACP,CAAC"}

package/dist/server/cookie-utils.d.ts

@@ -0,0 +1,13 @@
+//#region src/server/cookie-utils.d.ts
+/**
+ * Parse the cookie name out of a serialised Set-Cookie line.
+ *
+ * Bounded by the first `;` so the attribute portion (e.g. `Path=/`) is never
+ * mistaken for part of the name when the value happens to contain another
+ * `=`. Returns null when the line is not parseable (defensive — callers keep
+ * unparseable entries verbatim so they don't drop user-supplied cookies).
+ */
+declare function getSetCookieName(cookie: string): string | null;
+//#endregion
+export { getSetCookieName };
+//# sourceMappingURL=cookie-utils.d.ts.map

package/dist/server/cookie-utils.js

@@ -0,0 +1,20 @@
+//#region src/server/cookie-utils.ts
+/**
+* Parse the cookie name out of a serialised Set-Cookie line.
+*
+* Bounded by the first `;` so the attribute portion (e.g. `Path=/`) is never
+* mistaken for part of the name when the value happens to contain another
+* `=`. Returns null when the line is not parseable (defensive — callers keep
+* unparseable entries verbatim so they don't drop user-supplied cookies).
+*/
+function getSetCookieName(cookie) {
+	const equalsIndex = cookie.indexOf("=");
+	if (equalsIndex <= 0) return null;
+	const semicolonIndex = cookie.indexOf(";");
+	const end = semicolonIndex === -1 ? equalsIndex : Math.min(equalsIndex, semicolonIndex);
+	return cookie.slice(0, end);
+}
+//#endregion
+export { getSetCookieName };
+
+//# sourceMappingURL=cookie-utils.js.map

package/dist/server/cookie-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cookie-utils.js","names":[],"sources":["../../src/server/cookie-utils.ts"],"sourcesContent":["/**\n * Parse the cookie name out of a serialised Set-Cookie line.\n *\n * Bounded by the first `;` so the attribute portion (e.g. `Path=/`) is never\n * mistaken for part of the name when the value happens to contain another\n * `=`. Returns null when the line is not parseable (defensive — callers keep\n * unparseable entries verbatim so they don't drop user-supplied cookies).\n */\nexport function getSetCookieName(cookie: string): string | null {\n  const equalsIndex = cookie.indexOf(\"=\");\n  if (equalsIndex <= 0) {\n    return null;\n  }\n  const semicolonIndex = cookie.indexOf(\";\");\n  const end = semicolonIndex === -1 ? equalsIndex : Math.min(equalsIndex, semicolonIndex);\n  return cookie.slice(0, end);\n}\n"],"mappings":";;;;;;;;;AAQA,SAAgB,iBAAiB,QAA+B;CAC9D,MAAM,cAAc,OAAO,QAAQ,IAAI;CACvC,IAAI,eAAe,GACjB,OAAO;CAET,MAAM,iBAAiB,OAAO,QAAQ,IAAI;CAC1C,MAAM,MAAM,mBAAmB,KAAK,cAAc,KAAK,IAAI,aAAa,eAAe;CACvF,OAAO,OAAO,MAAM,GAAG,IAAI"}

package/dist/server/default-not-found-module.d.ts

@@ -0,0 +1,20 @@
+//#region src/server/default-not-found-module.d.ts
+/**
+ * Module-shaped wrapper around vinext's built-in default not-found component.
+ * Used as the fallback when an app does not define its own `app/not-found.tsx`
+ * (and has not opted into `app/global-not-found.tsx`). The runtime treats any
+ * `{ default: Component }` record as a "not-found module", so wrapping the
+ * component this way lets us thread the default through the existing
+ * `rootNotFoundModule` plumbing without introducing a parallel code path.
+ *
+ * Mirrors Next.js's `defaultNotFoundPath`
+ * (`next/dist/client/components/builtin/not-found.js`), which is selected
+ * automatically when the user has not supplied a custom not-found file:
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack/loaders/next-app-loader/index.ts
+ */
+declare const DEFAULT_NOT_FOUND_MODULE: {
+  readonly default: any;
+};
+//#endregion
+export { DEFAULT_NOT_FOUND_MODULE };
+//# sourceMappingURL=default-not-found-module.d.ts.map

package/dist/server/default-not-found-module.js

@@ -0,0 +1,20 @@
+import DefaultNotFound from "../shims/default-not-found.js";
+//#region src/server/default-not-found-module.ts
+/**
+* Module-shaped wrapper around vinext's built-in default not-found component.
+* Used as the fallback when an app does not define its own `app/not-found.tsx`
+* (and has not opted into `app/global-not-found.tsx`). The runtime treats any
+* `{ default: Component }` record as a "not-found module", so wrapping the
+* component this way lets us thread the default through the existing
+* `rootNotFoundModule` plumbing without introducing a parallel code path.
+*
+* Mirrors Next.js's `defaultNotFoundPath`
+* (`next/dist/client/components/builtin/not-found.js`), which is selected
+* automatically when the user has not supplied a custom not-found file:
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack/loaders/next-app-loader/index.ts
+*/
+const DEFAULT_NOT_FOUND_MODULE = { default: DefaultNotFound };
+//#endregion
+export { DEFAULT_NOT_FOUND_MODULE };
+
+//# sourceMappingURL=default-not-found-module.js.map

package/dist/server/default-not-found-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"default-not-found-module.js","names":[],"sources":["../../src/server/default-not-found-module.ts"],"sourcesContent":["import DefaultNotFound from \"vinext/shims/default-not-found\";\n\n/**\n * Module-shaped wrapper around vinext's built-in default not-found component.\n * Used as the fallback when an app does not define its own `app/not-found.tsx`\n * (and has not opted into `app/global-not-found.tsx`). The runtime treats any\n * `{ default: Component }` record as a \"not-found module\", so wrapping the\n * component this way lets us thread the default through the existing\n * `rootNotFoundModule` plumbing without introducing a parallel code path.\n *\n * Mirrors Next.js's `defaultNotFoundPath`\n * (`next/dist/client/components/builtin/not-found.js`), which is selected\n * automatically when the user has not supplied a custom not-found file:\n * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack/loaders/next-app-loader/index.ts\n */\nexport const DEFAULT_NOT_FOUND_MODULE = {\n  default: DefaultNotFound,\n} as const;\n"],"mappings":";;;;;;;;;;;;;;;AAeA,MAAa,2BAA2B,EACtC,SAAS,iBACV"}

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

@@ -36,7 +36,14 @@ declare function parseCookieLocale(req: IncomingMessage, i18nConfig: NextI18nCon
  * 4. Render the component to HTML
  * 5. Wrap in _document shell and send response
  */
-declare function createSSRHandler(server: ViteDevServer, runner: ModuleImporter, routes: Route[], pagesDir: string, i18nConfig?: NextI18nConfig | null, fileMatcher?: ValidFileMatcher, basePath?: string, trailingSlash?: boolean): (req: IncomingMessage, res: ServerResponse, url: string, /** Status code override — propagated from middleware rewrite status. */
+declare function createSSRHandler(server: ViteDevServer, runner: ModuleImporter, routes: Route[], pagesDir: string, i18nConfig?: NextI18nConfig | null, fileMatcher?: ValidFileMatcher, basePath?: string, trailingSlash?: boolean, hasMiddleware?: boolean,
+/**
+ * Allow-list of OpenTelemetry propagation keys to emit as `<meta>` tags
+ * in the SSR head. Sourced from `experimental.clientTraceMetadata` in
+ * `next.config`. When undefined or empty, no meta tags are emitted.
+ */
+
+clientTraceMetadata?: readonly string[]): (req: IncomingMessage, res: ServerResponse, url: string, /** Status code override — propagated from middleware rewrite status. */
 
 statusCode?: number,
 /**

package/dist/server/dev-server.js

@@ -2,7 +2,6 @@ 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 { 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";
@@ -10,14 +9,20 @@ 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";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, safeJsonStringify } from "./html.js";
+import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 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 { resolvePagesPageMethodResponse } from "./pages-page-method.js";
+import { isSerializableProps } from "./pages-serializable-props.js";
+import { loadUserDocumentInitialProps } from "./pages-document-initial-props.js";
 import path from "node:path";
 import React from "react";
 import { renderToReadableStream } from "react-dom/server.edge";
@@ -58,7 +63,8 @@ async function streamPageToResponse(res, element, options) {
 	const headHTML = getHeadHTML();
 	let shellTemplate;
 	if (DocumentComponent) {
-		let docHtml = await renderToStringAsync(React.createElement(DocumentComponent));
+		const docProps = await loadUserDocumentInitialProps(DocumentComponent);
+		let docHtml = await renderToStringAsync(docProps ? React.createElement(DocumentComponent, docProps) : React.createElement(DocumentComponent));
 		docHtml = docHtml.replace("__NEXT_MAIN__", STREAM_BODY_MARKER);
 		if (headHTML || fontHeadHTML) docHtml = docHtml.replace("</head>", `  ${fontHeadHTML}${headHTML}\n</head>`);
 		docHtml = docHtml.replace("<!-- __NEXT_SCRIPTS__ -->", scripts);
@@ -132,7 +138,7 @@ 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, clientTraceMetadata) {
 	const matcher = fileMatcher ?? createValidFileMatcher();
 	const _alsRegistration = Promise.all([runner.import("vinext/head-state"), runner.import("vinext/router-state")]);
 	_alsRegistration.catch(() => {});
@@ -215,6 +221,23 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					res.end("Page has no default export");
 					return;
 				}
+				{
+					const routePattern = patternToNextFormat(route.pattern);
+					if (!isDataReq && routePattern !== "/_error" && routePattern !== "/404" && routePattern !== "/500" && statusCode === void 0) {
+						const methodResponse = resolvePagesPageMethodResponse({
+							hasGetServerSideProps: typeof pageModule.getServerSideProps === "function",
+							method: req.method ?? "GET"
+						});
+						if (methodResponse) {
+							res.statusCode = methodResponse.status;
+							const allow = methodResponse.headers.get("allow");
+							if (allow) res.setHeader("Allow", allow);
+							res.setHeader("Content-Type", "text/plain;charset=UTF-8");
+							res.end(await methodResponse.text());
+							return;
+						}
+					}
+				}
 				let pageProps = {};
 				let isrRevalidateSeconds = null;
 				let isFallbackRender = false;
@@ -274,7 +297,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);
@@ -293,6 +316,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext);
 						return;
 					}
+					if (result && "props" in result) isSerializableProps(patternToNextFormat(route.pattern), "getServerSideProps", pageProps);
 					if (!statusCode && res.statusCode !== 200) statusCode = res.statusCode;
 					const headersAfterGSSP = res.getHeaders();
 					for (const [key, val] of Object.entries(headersAfterGSSP)) {
@@ -301,6 +325,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);
@@ -340,7 +365,8 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 									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;
@@ -392,7 +418,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);
@@ -419,7 +446,8 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						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;
@@ -441,6 +469,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext);
 						return;
 					}
+					if (result && "props" in result) isSerializableProps(patternToNextFormat(route.pattern), "getStaticProps", pageProps);
 					if (typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
 				}
 				if (isDataReq) {
@@ -546,7 +575,8 @@ hydrate();
 					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");
@@ -570,7 +600,11 @@ hydrate();
 					DocumentComponent,
 					statusCode,
 					extraHeaders,
-					getHeadHTML: () => typeof headShim.getSSRHeadHTML === "function" ? headShim.getSSRHeadHTML() : ""
+					getHeadHTML: () => {
+						const headHTML = typeof headShim.getSSRHeadHTML === "function" ? headShim.getSSRHeadHTML() : "";
+						const traceHTML = getClientTraceMetadataHTML(clientTraceMetadata);
+						return traceHTML ? `${headHTML}\n  ${traceHTML}` : headHTML;
+					}
 				});
 				_renderEnd = now();
 				if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext(null);
@@ -648,7 +682,8 @@ async function renderErrorPage(server, runner, _req, res, url, pagesDir, statusC
 			DocumentComponent = (await importModule(runner, docPathErr)).default ?? null;
 		} catch {}
 		if (DocumentComponent) {
-			let docHtml = await renderToStringAsync(createElement(DocumentComponent));
+			const docProps = await loadUserDocumentInitialProps(DocumentComponent);
+			let docHtml = await renderToStringAsync(docProps ? createElement(DocumentComponent, docProps) : createElement(DocumentComponent));
 			docHtml = docHtml.replace("__NEXT_MAIN__", bodyHtml);
 			docHtml = docHtml.replace("<!-- __NEXT_SCRIPTS__ -->", "");
 			html = docHtml;
@@ -669,8 +704,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 };