vinext 0.1.2 → 0.1.4

package/dist/server/pages-document-initial-props.js

@@ -19,19 +19,19 @@ import React from "react";
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/render.tsx
 * (search for `loadDocumentInitialProps` and `documentElement`).
 *
-* vinext only forwards `docProps`. The full `DocumentContext`
-* (`renderPage`, `defaultGetInitialProps`, `pathname`, `query`, `req`, `res`,
-* `err`, `asPath`) is not yet plumbed through. The common upstream pattern
+* `runDocumentRenderPage()` supplies `renderPage`, `defaultGetInitialProps`,
+* and the request pathname/query/asPath fields needed by the common upstream
+* pattern:
 *
 *   static async getInitialProps(ctx) {
 *     const initialProps = await Document.getInitialProps(ctx)
 *     return { ...initialProps, docValue }
 *   }
 *
-* works because the base `Document.getInitialProps` shim in
-* `shims/document.tsx` returns `{ html: "" }` and ignores `ctx`. User
-* overrides that *only* read `ctx` will see `undefined` fields — that is a
-* separate gap tracked alongside the shim TODO.
+* The standalone `loadUserDocumentInitialProps()` compatibility path supplies
+* an empty default render result because it is only used after the body has
+* already been produced. Request-only fields such as req/res remain outside
+* that compatibility helper.
 *
 * Returns `null` when the user did not override the base shim (the static
 * `getInitialProps` reference still points at the shim's stub) so callers
@@ -47,7 +47,7 @@ async function loadUserDocumentInitialProps(DocumentComponent) {
 	const getInitialProps = DocumentComponent.getInitialProps;
 	if (typeof getInitialProps !== "function") return null;
 	if (getInitialProps === BASE_GET_INITIAL_PROPS) return null;
-	const result = await getInitialProps({});
+	const result = await getInitialProps({ defaultGetInitialProps: async () => ({ html: "" }) });
 	return result && typeof result === "object" ? result : null;
 }
 /**
@@ -60,11 +60,10 @@ async function loadUserDocumentInitialProps(DocumentComponent) {
 * prod (`pages-page-response.ts`) and dev (`dev-server.ts`) SSR pipelines so
 * the `getInitialProps` + `renderPage` contract lives in one place.
 *
-* `getInitialProps` is invoked at most once here. When this returns `consumed`
-* or `rendered`, callers MUST treat that as the single invocation and must not
-* call `loadUserDocumentInitialProps` (which would invoke it again — and, for a
-* throwing override, surface the error as a 500 rather than the clean fallback
-* this contract guarantees).
+* `getInitialProps` is invoked at most once here. When this returns `rendered`,
+* callers MUST treat that as the single invocation and must not call
+* `loadUserDocumentInitialProps` again. Errors intentionally propagate to the
+* Pages Router's normal error-page pipeline, matching Next.js.
 *
 * @see .nextjs-ref/packages/next/src/server/render.tsx (search `renderPage`)
 */
@@ -74,58 +73,30 @@ async function runDocumentRenderPage(input) {
 	if (DocCtor.getInitialProps === BASE_GET_INITIAL_PROPS) return { status: "skipped" };
 	if (!input.enhancePageElement) return { status: "skipped" };
 	const enhancePageElement = input.enhancePageElement;
-	let renderPageCalled = false;
 	const renderPage = async (opts = {}) => {
-		renderPageCalled = true;
-		const wrapped = withScriptNonce(enhancePageElement(opts), input.scriptNonce);
+		const wrapped = withScriptNonce(enhancePageElement(typeof opts === "function" ? { enhanceComponent: opts } : opts), input.scriptNonce);
 		return {
 			html: await readStreamAsText(await input.renderToReadableStream(wrapped)),
 			head: []
 		};
 	};
-	let docInitialProps;
-	try {
-		docInitialProps = await DocCtor.getInitialProps({
-			renderPage,
-			defaultGetInitialProps: async (ctx) => {
-				const result = await (ctx.renderPage ?? renderPage)({ enhanceApp: (App) => (props) => React.createElement(App, props) });
-				return {
-					html: result.html,
-					head: result.head ?? [],
-					styles: void 0
-				};
-			},
-			...input.context
-		});
-	} catch (err) {
-		console.error("[vinext] _document.getInitialProps() threw:", err);
-		return {
-			status: "consumed",
-			docProps: {},
-			head: []
-		};
-	}
+	const docInitialProps = await DocCtor.getInitialProps({
+		renderPage,
+		defaultGetInitialProps: async (ctx) => {
+			const result = await ctx.renderPage({ enhanceApp: (App) => (props) => React.createElement(App, props) });
+			return {
+				html: result.html,
+				head: result.head ?? [],
+				styles: void 0
+			};
+		},
+		...input.context
+	});
 	const { html: _html, head: rawHead, styles: _styles, ...docProps } = docInitialProps ?? {};
 	const head = Array.isArray(rawHead) ? rawHead : [];
-	if (!renderPageCalled) return {
-		status: "consumed",
-		docProps,
-		head
-	};
-	if (!docInitialProps || typeof docInitialProps.html !== "string") {
-		console.error(`[vinext] "${DocCtor.displayName ?? DocCtor.name ?? "Document"}.getInitialProps()" did not return an object with a string "html" prop`);
-		return {
-			status: "consumed",
-			docProps,
-			head
-		};
-	}
+	if (!docInitialProps || typeof docInitialProps.html !== "string") throw new Error(`"${DocCtor.displayName ?? DocCtor.name ?? "Document"}.getInitialProps()" should resolve to an object with a "html" prop set with a valid html string`);
 	let stylesHTML = "";
-	if (docInitialProps.styles != null) try {
-		stylesHTML = await input.renderStylesToString(React.createElement(React.Fragment, null, docInitialProps.styles));
-	} catch (err) {
-		console.error("[vinext] Failed to render _document.getInitialProps() styles:", err);
-	}
+	if (docInitialProps.styles != null) stylesHTML = await input.renderStylesToString(React.createElement(React.Fragment, null, docInitialProps.styles));
 	return {
 		status: "rendered",
 		bodyHtml: docInitialProps.html,

package/dist/server/pages-get-initial-props.d.ts

@@ -3,6 +3,48 @@ type PagesGetInitialPropsContext = {
   req?: unknown;
   res?: unknown;
   err?: unknown;
+  pathname?: string;
+  query?: Record<string, unknown>;
+  asPath?: string;
+  locale?: string;
+  locales?: string[];
+  defaultLocale?: string;
+} & Record<string, unknown>;
+declare function hasPagesGetInitialProps(component: unknown): boolean;
+declare function isResponseSent(res: unknown): boolean;
+declare function loadPagesGetInitialProps(component: unknown, context: PagesGetInitialPropsContext): Promise<Record<string, unknown> | null>;
+/**
+ * Decision returned by {@link loadDevAppInitialProps}.
+ *
+ * - `skip`: the custom `App` has no `getInitialProps`; the caller renders with
+ *   its existing props unchanged.
+ * - `response-sent`: `_app.getInitialProps` ended the response itself (wrote
+ *   headers / body); the caller must stop and not render.
+ * - `render`: the caller should render with the returned `pageProps` /
+ *   `renderProps`.
+ */
+type DevAppInitialPropsResult = {
+  kind: "skip";
+} | {
+  kind: "response-sent";
+} | {
+  kind: "render";
+  pageProps: Record<string, unknown>;
+  renderProps: Record<string, unknown> & {
+    pageProps: unknown;
+  };
+};
+type DevAppInitialPropsContext = {
+  appComponent: unknown;
+  /**
+   * Builds the `AppTree` element passed to `getInitialProps`. Injected so this
+   * module stays free of React; the dev SSR handler supplies the real
+   * `React.createElement` closure.
+   */
+  appTree: (appTreeProps: Record<string, unknown>) => unknown;
+  component: unknown;
+  req: unknown;
+  res: unknown;
   pathname: string;
   query: Record<string, unknown>;
   asPath: string;
@@ -10,8 +52,16 @@ type PagesGetInitialPropsContext = {
   locales?: string[];
   defaultLocale?: string;
 };
-declare function hasPagesGetInitialProps(component: unknown): boolean;
-declare function isResponseSent(res: unknown): boolean;
-declare function loadPagesGetInitialProps(component: unknown, context: PagesGetInitialPropsContext): Promise<Record<string, unknown> | null>;
+/**
+ * Run the custom `App`'s `getInitialProps` for the dev SSR render path and
+ * return a decision the caller applies.
+ *
+ * This is the dev-server counterpart to the production page-data resolver's
+ * app-initial-props loading. It is invoked lazily — only when a request is
+ * actually going to render (cache miss / on-demand revalidation), never on an
+ * ISR cache HIT/STALE that serves cached HTML verbatim — so userland `App`
+ * data code does not run on the cache hot path.
+ */
+declare function loadDevAppInitialProps(ctx: DevAppInitialPropsContext): Promise<DevAppInitialPropsResult>;
 //#endregion
-export { hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps };
+export { DevAppInitialPropsContext, DevAppInitialPropsResult, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };

package/dist/server/pages-get-initial-props.js

@@ -46,5 +46,47 @@ async function loadPagesGetInitialProps(component, context) {
 	if (!isPropsObject(result)) throw new Error(`"${getDisplayName(component)}.getInitialProps()" should resolve to an object. But found "${describeInitialPropsValue(result)}" instead.`);
 	return result;
 }
+/**
+* Run the custom `App`'s `getInitialProps` for the dev SSR render path and
+* return a decision the caller applies.
+*
+* This is the dev-server counterpart to the production page-data resolver's
+* app-initial-props loading. It is invoked lazily — only when a request is
+* actually going to render (cache miss / on-demand revalidation), never on an
+* ISR cache HIT/STALE that serves cached HTML verbatim — so userland `App`
+* data code does not run on the cache hot path.
+*/
+async function loadDevAppInitialProps(ctx) {
+	if (!hasPagesGetInitialProps(ctx.appComponent)) return { kind: "skip" };
+	const initialProps = await loadPagesGetInitialProps(ctx.appComponent, {
+		AppTree: ctx.appTree,
+		Component: ctx.component,
+		router: {
+			pathname: ctx.pathname,
+			query: ctx.query,
+			asPath: ctx.asPath
+		},
+		ctx: {
+			req: ctx.req,
+			res: ctx.res,
+			pathname: ctx.pathname,
+			query: ctx.query,
+			asPath: ctx.asPath,
+			locale: ctx.locale,
+			locales: ctx.locales,
+			defaultLocale: ctx.defaultLocale
+		}
+	});
+	if (isResponseSent(ctx.res)) return { kind: "response-sent" };
+	const initialPageProps = isPropsObject(initialProps) ? initialProps.pageProps : void 0;
+	return {
+		kind: "render",
+		pageProps: isPropsObject(initialPageProps) ? initialPageProps : {},
+		renderProps: isPropsObject(initialProps) ? {
+			...initialProps,
+			pageProps: initialPageProps
+		} : { pageProps: initialPageProps }
+	};
+}
 //#endregion
-export { hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps };
+export { hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };

package/dist/server/pages-i18n.js

@@ -127,8 +127,8 @@ function parseCookieLocaleFromHeader(cookieHeader, i18nConfig) {
 	} catch {
 		return null;
 	}
-	if (i18nConfig.locales.includes(value)) return value;
-	return null;
+	const lowerValue = value.toLowerCase();
+	return i18nConfig.locales.find((locale) => locale.toLowerCase() === lowerValue) ?? null;
 }
 function formatLocalizedRootPath(locale, defaultLocale, basePath = "", trailingSlash = false, search = "") {
 	if (locale.toLowerCase() === defaultLocale.toLowerCase()) return void 0;

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

@@ -1,4 +1,4 @@
-import { parseCookies } from "../config/config-matchers.js";
+import { parseCookieHeader } from "../utils/parse-cookie.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { PagesBodyParseError, getMediaType, isJsonMediaType } from "./pages-media-type.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT } from "./pages-body-parser-config.js";
@@ -217,7 +217,7 @@ function createPagesReqRes(options) {
 		headers: headersObj,
 		query: options.query,
 		body: options.body,
-		cookies: parseCookies(options.request.headers.get("cookie"))
+		cookies: parseCookieHeader(options.request.headers.get("cookie"))
 	});
 	let resolveResponse;
 	let rejectResponse;

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

@@ -33,6 +33,9 @@ type PagesGsspContextResponse = {
   res: PagesMutableGsspResponse;
   responsePromise: Promise<Response>;
 };
+type PagesRenderProps = Record<string, unknown> & {
+  pageProps: unknown;
+};
 type PagesPageModule = {
   default?: unknown;
   getStaticPaths?: (context: {
@@ -82,9 +85,10 @@ type PagesPageModule = {
 type RenderPagesIsrHtmlOptions = {
   buildId: string | null;
   cachedHtml: string;
-  createPageElement: (pageProps: Record<string, unknown>) => ReactNode;
+  createPageElement: (props: Record<string, unknown>) => ReactNode;
   i18n: PagesI18nRenderContext;
   pageProps: Record<string, unknown>;
+  props?: Record<string, unknown>;
   params: Record<string, unknown>;
   renderIsrPassToStringAsync: (element: ReactNode) => Promise<string>;
   routePattern: string;
@@ -106,7 +110,8 @@ type ResolvePagesPageDataOptions = {
   isDataReq?: boolean;
   err?: unknown;
   createGsspReqRes: () => PagesGsspContextResponse;
-  createPageElement: (pageProps: Record<string, unknown>) => ReactNode;
+  createAppTree?: (props: Record<string, unknown>) => ReactNode;
+  createPageElement: (props: Record<string, unknown>) => ReactNode;
   fontLinkHeader: string;
   i18n: PagesI18nRenderContext;
   isrCacheKey: (router: string, pathname: string) => string;
@@ -145,10 +150,13 @@ type ResolvePagesPageDataOptions = {
    * Typically sourced from `process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID`.
    */
   deploymentId?: string;
+  htmlLimitedBots?: string;
   pageModule: PagesPageModule;
+  AppComponent?: unknown;
   params: Record<string, unknown>;
   query: Record<string, unknown>;
   asPath?: string;
+  resolvedUrl?: string;
   route: Pick<Route, "isDynamic">;
   routePattern: string;
   routeUrl: string;
@@ -192,6 +200,7 @@ type ResolvePagesPageDataRenderResult = {
   gsspRes: PagesGsspResponse | null;
   isrRevalidateSeconds: number | null;
   pageProps: Record<string, unknown>;
+  props: PagesRenderProps;
   /**
    * True when `getStaticPaths` returned `fallback: true` AND the requested path
    * is not in the pre-rendered list. The caller renders a loading shell with