vinext 0.0.55 → 0.1.0

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

@@ -0,0 +1,9 @@
+//#region src/server/dev-initial-server-error.d.ts
+type InitialDevServerErrorPayload = {
+  message: string;
+  name?: string;
+  stack?: string;
+};
+declare function createInitialDevServerErrorScript(error: unknown, scriptNonce?: string, nodeEnv?: string | undefined): string;
+//#endregion
+export { InitialDevServerErrorPayload, createInitialDevServerErrorScript };

package/dist/server/dev-initial-server-error.js

@@ -0,0 +1,26 @@
+import { createInlineScriptTag, safeJsonStringify } from "./html.js";
+//#region src/server/dev-initial-server-error.ts
+const INITIAL_DEV_SERVER_ERRORS_GLOBAL = "__VINEXT_INITIAL_DEV_ERRORS__";
+function stringifyThrownValue(error) {
+	if (typeof error === "string") return error;
+	try {
+		return String(error);
+	} catch {
+		return Object.prototype.toString.call(error);
+	}
+}
+function createInitialDevServerErrorPayload(error) {
+	if (error instanceof Error) return {
+		message: error.message,
+		name: error.name || void 0,
+		stack: error.stack || void 0
+	};
+	return { message: stringifyThrownValue(error) };
+}
+function createInitialDevServerErrorScript(error, scriptNonce, nodeEnv = process.env.NODE_ENV) {
+	if (error == null || nodeEnv === "production") return "";
+	const globalRef = "self[" + safeJsonStringify(INITIAL_DEV_SERVER_ERRORS_GLOBAL) + "]";
+	return createInlineScriptTag(`${globalRef}=${globalRef}||[];${globalRef}.push(${safeJsonStringify(createInitialDevServerErrorPayload(error))})`, scriptNonce);
+}
+//#endregion
+export { createInitialDevServerErrorScript };

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

@@ -106,5 +106,4 @@ type AcquireResult = AcquireSuccess | AcquireFailure;
  */
 declare function tryAcquireLockfile(opts: AcquireOptions): AcquireResult;
 //#endregion
-export { DevLockfile, DevServerInfo, formatAlreadyRunningError, getLockfilePath, isPidAlive, readLockfile, tryAcquireLockfile };
-//# sourceMappingURL=dev-lockfile.d.ts.map
+export { DevLockfile, DevServerInfo, formatAlreadyRunningError, getLockfilePath, isPidAlive, readLockfile, tryAcquireLockfile };

package/dist/server/dev-lockfile.js

@@ -176,5 +176,3 @@ function tryAcquireLockfile(opts) {
 }
 //#endregion
 export { formatAlreadyRunningError, getLockfilePath, isPidAlive, readLockfile, tryAcquireLockfile };
-
-//# sourceMappingURL=dev-lockfile.js.map

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

@@ -27,5 +27,4 @@ type DevEnvironmentLike = {
  */
 declare function createDirectRunner(environment: DevEnvironmentLike | DevEnvironment): ModuleRunner;
 //#endregion
-export { createDirectRunner };
-//# sourceMappingURL=dev-module-runner.d.ts.map
+export { createDirectRunner };

package/dist/server/dev-module-runner.js

@@ -89,5 +89,3 @@ function createDirectRunner(environment) {
 }
 //#endregion
 export { createDirectRunner };
-
-//# sourceMappingURL=dev-module-runner.js.map

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

@@ -59,5 +59,4 @@ declare function validateDevRequest(headers: {
  */
 declare function generateDevOriginCheckCode(allowedDevOrigins?: string[]): string;
 //#endregion
-export { generateDevOriginCheckCode, isAllowedDevOrigin, isCrossSiteNoCorsRequest, validateDevRequest };
-//# sourceMappingURL=dev-origin-check.d.ts.map
+export { generateDevOriginCheckCode, isAllowedDevOrigin, isCrossSiteNoCorsRequest, validateDevRequest };

package/dist/server/dev-origin-check.js

@@ -154,5 +154,3 @@ function __validateDevRequestOrigin(request) {
 }
 //#endregion
 export { generateDevOriginCheckCode, isAllowedDevOrigin, isCrossSiteNoCorsRequest, validateDevRequest };
-
-//# sourceMappingURL=dev-origin-check.js.map

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

@@ -3,5 +3,4 @@ import { ValidFileMatcher } from "../routing/file-matcher.js";
 //#region src/server/dev-route-files.d.ts
 declare function shouldInvalidateAppRouteFile(appDir: string, filePath: string, matcher: ValidFileMatcher): boolean;
 //#endregion
-export { shouldInvalidateAppRouteFile };
-//# sourceMappingURL=dev-route-files.d.ts.map
+export { shouldInvalidateAppRouteFile };

package/dist/server/dev-route-files.js

@@ -69,5 +69,3 @@ function shouldInvalidateAppRouteFile(appDir, filePath, matcher) {
 }
 //#endregion
 export { shouldInvalidateAppRouteFile };
-
-//# sourceMappingURL=dev-route-files.js.map

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

@@ -1,6 +1,6 @@
+import { NextI18nConfig } from "../config/next-config.js";
 import { ValidFileMatcher } from "../routing/file-matcher.js";
 import { Route } from "../routing/pages-router.js";
-import { NextI18nConfig } from "../config/next-config.js";
 import { ModuleImporter } from "./instrumentation.js";
 import { ViteDevServer } from "vite";
 import { IncomingMessage, ServerResponse } from "node:http";
@@ -55,5 +55,4 @@ statusCode?: number,
 
 isDataReq?: boolean) => Promise<void>;
 //#endregion
-export { createSSRHandler, detectLocaleFromHeaders, extractLocaleFromUrl, parseCookieLocale };
-//# sourceMappingURL=dev-server.d.ts.map
+export { createSSRHandler, detectLocaleFromHeaders, extractLocaleFromUrl, parseCookieLocale };

package/dist/server/dev-server.js

@@ -24,6 +24,7 @@ import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
+import { loadPagesGetInitialProps } from "./pages-get-initial-props.js";
 import path from "node:path";
 import React from "react";
 import { renderToReadableStream } from "react-dom/server.edge";
@@ -43,6 +44,33 @@ async function renderToStringAsync(element) {
 async function renderIsrPassToStringAsync(element) {
 	return await runWithServerInsertedHTMLState(() => runWithHeadState(() => _runWithCacheState(() => runWithPrivateCache(() => runWithFetchCache(async () => renderToStringAsync(element))))));
 }
+/**
+* Emit a `getServerSideProps` / `getStaticProps` `{ redirect }` result.
+*
+* For an HTML request we write a real HTTP redirect (`Location`). For a
+* `_next/data` request we instead reply 200 with `__N_REDIRECT` /
+* `__N_REDIRECT_STATUS` in pageProps so the client router re-dispatches a
+* fresh client navigation (which supersedes the in-flight one) rather than
+* the fetch transparently following an HTTP redirect to non-JSON HTML. This
+* mirrors the production path in `pages-page-data.ts`
+* (`buildPagesRedirectResponse`) and Next.js's `render.tsx` `__N_REDIRECT`
+* handling. See AGENTS.md "dev and prod server parity".
+*/
+function writeGsspRedirect(res, redirect, isDataReq) {
+	const status = redirect.statusCode ?? (redirect.permanent ? 308 : 307);
+	let dest = redirect.destination;
+	if (!dest.startsWith("http://") && !dest.startsWith("https://")) dest = dest.replace(/^[\\/]+/, "/");
+	if (isDataReq) {
+		res.writeHead(200, { "Content-Type": "application/json" });
+		res.end(JSON.stringify({ pageProps: {
+			__N_REDIRECT: dest,
+			__N_REDIRECT_STATUS: status
+		} }));
+		return;
+	}
+	res.writeHead(status, { Location: dest });
+	res.end();
+}
 /** Body placeholder used to split the document shell for streaming. */
 const STREAM_BODY_MARKER = "<!--VINEXT_STREAM_BODY-->";
 /**
@@ -320,12 +348,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					if (res.writableEnded) return;
 					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);
-						let dest = redirect.destination;
-						if (!dest.startsWith("http://") && !dest.startsWith("https://")) dest = dest.replace(/^[\\/]+/, "/");
-						res.writeHead(status, { Location: dest });
-						res.end();
+						writeGsspRedirect(res, result.redirect, isDataReq);
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
@@ -473,12 +496,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					const result = await pageModule.getStaticProps(context);
 					if (result && "props" in result) pageProps = result.props;
 					if (result && "redirect" in result) {
-						const { redirect } = result;
-						const status = redirect.statusCode ?? (redirect.permanent ? 308 : 307);
-						let dest = redirect.destination;
-						if (!dest.startsWith("http://") && !dest.startsWith("https://")) dest = dest.replace(/^[\\/]+/, "/");
-						res.writeHead(status, { Location: dest });
-						res.end();
+						writeGsspRedirect(res, result.redirect, isDataReq);
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
@@ -493,6 +511,23 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					if (result && "props" in result) isSerializableProps(patternToNextFormat(route.pattern), "getStaticProps", pageProps);
 					if (typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
 				}
+				if (typeof pageModule.getServerSideProps !== "function" && typeof pageModule.getStaticProps !== "function") {
+					const initialProps = await loadPagesGetInitialProps(PageComponent, {
+						req,
+						res,
+						pathname: patternToNextFormat(route.pattern),
+						query,
+						asPath: url,
+						locale: locale ?? currentDefaultLocale,
+						locales: i18nConfig?.locales,
+						defaultLocale: currentDefaultLocale
+					});
+					if (res.headersSent || res.writableEnded) return;
+					if (initialProps) pageProps = {
+						...pageProps,
+						...initialProps
+					};
+				}
 				if (isDataReq) {
 					const dataHeaders = { "Content-Type": "application/json" };
 					if (gsspExtraHeaders) for (const [k, v] of Object.entries(gsspExtraHeaders)) dataHeaders[k] = v;
@@ -561,6 +596,18 @@ const nextData = window.__NEXT_DATA__;
 const { pageProps } = nextData.props;
 
 async function hydrate() {
+  let hydrateRootOptions;
+  if (import.meta.env.DEV) {
+    const overlay = await import("vinext/dev-error-overlay");
+    overlay.installDevErrorOverlay();
+    overlay.installViteHmrErrorHandler(import.meta.hot);
+    overlay.reportInitialDevServerErrors();
+    hydrateRootOptions = {
+      onCaughtError: overlay.devOnCaughtError,
+      onUncaughtError: overlay.devOnUncaughtError,
+    };
+  }
+
   const pageModule = await import("${pageModuleUrl}");
   const PageComponent = pageModule.default;
   let element;
@@ -573,7 +620,7 @@ async function hydrate() {
   element = React.createElement(PageComponent, pageProps);
   `}
   element = wrapWithRouterContext(element);
-  const root = hydrateRoot(document.getElementById("__next"), element);
+  const root = hydrateRoot(document.getElementById("__next"), element, hydrateRootOptions);
   window.__VINEXT_ROOT__ = root;
   installPagesRouterRuntime();
   const hydratedAt = performance.now();
@@ -673,7 +720,7 @@ hydrate();
 					routeType: "render"
 				}).catch(() => {});
 				try {
-					await renderErrorPage(server, runner, req, res, url, pagesDir, 500, void 0, matcher);
+					await renderErrorPage(server, runner, req, res, url, pagesDir, 500, void 0, matcher, e instanceof Error ? e : new Error(String(e)));
 				} catch (fallbackErr) {
 					res.statusCode = 500;
 					res.end(`Internal Server Error: ${fallbackErr.message}`);
@@ -690,7 +737,7 @@ hydrate();
 * - 500: pages/500.tsx -> pages/_error.tsx -> default
 * - other: pages/_error.tsx -> default
 */
-async function renderErrorPage(server, runner, _req, res, url, pagesDir, statusCode, wrapWithRouterContext, fileMatcher) {
+async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCode, wrapWithRouterContext, fileMatcher, err) {
 	const matcher = fileMatcher ?? createValidFileMatcher();
 	const candidates = statusCode === 404 ? ["404", "_error"] : statusCode === 500 ? ["500", "_error"] : ["_error"];
 	for (const candidate of candidates) try {
@@ -704,7 +751,19 @@ async function renderErrorPage(server, runner, _req, res, url, pagesDir, statusC
 			AppComponent = (await importModule(runner, appPathErr)).default ?? null;
 		} catch {}
 		const createElement = React.createElement;
-		const errorProps = { statusCode };
+		const initialErrorProps = await loadPagesGetInitialProps(ErrorComponent, {
+			req,
+			res,
+			err,
+			pathname: candidate === "_error" ? "/_error" : `/${candidate}`,
+			query: parseQueryString(url),
+			asPath: url
+		});
+		if (res.headersSent || res.writableEnded) return;
+		const errorProps = {
+			...initialErrorProps,
+			statusCode
+		};
 		let wrapFn = wrapWithRouterContext;
 		if (!wrapFn) try {
 			wrapFn = (await importModule(runner, "next/router")).wrapWithRouterContext;
@@ -761,5 +820,3 @@ async function renderErrorPage(server, runner, _req, res, url, pagesDir, statusC
 }
 //#endregion
 export { createSSRHandler, detectLocaleFromHeaders, extractLocaleFromUrl, parseCookieLocale };
-
-//# sourceMappingURL=dev-server.js.map

package/dist/server/dev-stack-sourcemap-endpoint.d.ts

@@ -0,0 +1,4 @@
+//#region src/server/dev-stack-sourcemap-endpoint.d.ts
+declare const VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT = "/__vinext_original-stack-trace";
+//#endregion
+export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT };

package/dist/server/dev-stack-sourcemap-endpoint.js

@@ -0,0 +1,4 @@
+//#region src/server/dev-stack-sourcemap-endpoint.ts
+const VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT = "/__vinext_original-stack-trace";
+//#endregion
+export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT };

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

@@ -0,0 +1,43 @@
+import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "./dev-stack-sourcemap-endpoint.js";
+import { ViteDevServer } from "vite";
+
+//#region src/server/dev-stack-sourcemap.d.ts
+type SourceMapPayload = {
+  version?: number;
+  sources: string[];
+  sourcesContent?: (string | null)[];
+  sourceRoot?: string;
+  mappings: string;
+  ignoreList?: number[];
+};
+type SourceMapPosition = {
+  source: string;
+  line: number;
+  column: number;
+};
+type StackCodeFramePayload = {
+  file: string;
+  line: number;
+  column: number;
+  methodName?: string;
+  lines: StackCodeFrameLine[];
+};
+type StackCodeFrameLine = {
+  line: number;
+  text: string;
+  isErrorLine: boolean;
+};
+type MappedStackLine = {
+  line: string;
+  isFrame: boolean;
+  ignored: boolean;
+  codeFrame?: StackCodeFramePayload;
+};
+declare function installDevStackSourcemapMiddleware(server: ViteDevServer): void;
+declare function mapStackLine(server: ViteDevServer, line: string, requestHost: string | undefined, sourceMapCache: Map<string, Promise<SourceMapPayload | null>>): Promise<string>;
+declare function mapStackLineWithMetadata(server: ViteDevServer, line: string, requestHost: string | undefined, sourceMapCache: Map<string, Promise<SourceMapPayload | null>>): Promise<MappedStackLine>;
+declare function originalPositionFor(sourceMap: SourceMapPayload, generatedLine: number, generatedColumn: number): SourceMapPosition | null;
+declare function decodeVlqSegment(segment: string): number[];
+declare function resolveSourceFile(source: string, sourceMap: SourceMapPayload, generatedUrl: URL): string;
+//#endregion
+export { SourceMapPayload, VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT, decodeVlqSegment, installDevStackSourcemapMiddleware, mapStackLine, mapStackLineWithMetadata, originalPositionFor, resolveSourceFile };