vinext 1.0.0 → 1.0.1

package/THIRD_PARTY_LICENSES.md

@@ -23,3 +23,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+## dotenv (parser adapted from version 16.3.1)
+
+Copyright (c) 2015, Scott Motte
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/dist/build/lifecycle.js

@@ -141,16 +141,6 @@ async function finalizeBuild(builder, context) {
 		__VINEXT_SHARED_RSC_COMPATIBILITY_ID: context.rscCompatibilityId
 	}, () => runWithPreviewBuildCredentials(() => buildHybridPagesBundle(builder, context), context.previewBuildCredentials));
 	if (context.deferPostBuild) return;
-	if (context.nextConfig.output === "standalone") {
-		const { emitStandaloneOutput } = await import("./standalone.js");
-		const standalone = emitStandaloneOutput({
-			root: context.root,
-			outDir: path.resolve(context.root, "dist")
-		});
-		console.log(`  Generated standalone output in ${path.relative(context.root, standalone.standaloneDir)}/`);
-		console.log("  Start it with: node dist/standalone/server.js\n");
-		return;
-	}
 	const prerenderDecision = resolveVinextPrerenderDecision({
 		prerenderAllFlag: context.prerenderAll,
 		vinextPrerenderConfig: context.prerenderConfig,
@@ -187,6 +177,16 @@ async function finalizeBuild(builder, context) {
 			routeRootConfig: buildOutput
 		});
 	}
+	if (context.nextConfig.output === "standalone") {
+		const { emitStandaloneOutput } = await import("./standalone.js");
+		const standalone = emitStandaloneOutput({
+			root: context.root,
+			outDir: path.resolve(context.root, "dist")
+		});
+		console.log(`  Generated standalone output in ${path.relative(context.root, standalone.standaloneDir)}/`);
+		console.log("  Start it with: node dist/standalone/server.js\n");
+		return;
+	}
 	const { printBuildReport } = await import("./report.js");
 	await printBuildReport({
 		root: context.root,

package/dist/build/pages-client-assets-module.js

@@ -1,9 +1,14 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { getSharedChunkFiles } from "../server/pages-asset-tags.js";
 import fs from "node:fs";
 //#region src/build/pages-client-assets-module.ts
 const PAGES_CLIENT_ASSETS_MODULE = "vinext-client-assets.js";
 function buildPagesClientAssetsModule(assets) {
-	return `export default ${JSON.stringify(assets)};\n`;
+	const prepared = assets.ssrManifest ? {
+		...assets,
+		sharedChunks: getSharedChunkFiles(assets.ssrManifest)
+	} : assets;
+	return `export default ${JSON.stringify(prepared)};\n`;
 }
 function writePagesClientAssetsModuleIfMissing(outputDir, moduleSource) {
 	const outputPath = path.join(outputDir, PAGES_CLIENT_ASSETS_MODULE);

package/dist/build/precompress.js

@@ -3,9 +3,9 @@ import { ASSET_PREFIX_URL_DIR } from "../utils/asset-prefix.js";
 import { isPrecompressedVariantBeneficial } from "../utils/precompressed-variant.js";
 import fsp from "node:fs/promises";
 import { randomUUID } from "node:crypto";
-import { promisify } from "node:util";
 import os from "node:os";
 import zlib from "node:zlib";
+import { promisify } from "node:util";
 //#region src/build/precompress.ts
 /**
 * Build-time precompression for hashed static assets.

package/dist/build/prerender-paths.js

@@ -19,9 +19,9 @@ import { readPrerenderSecret } from "./server-manifest.js";
 import { loadMdxEsmReader } from "../utils/mdx-scan.js";
 import { startProdServer } from "../server/prod-server.js";
 import { enterPrerenderPhase } from "./prerender-phase.js";
-import { buildUrlFromParams, layoutOnlyParamSets, resolveParentParams, routeStaticParamSets, validateDiscoveredParams } from "./prerender.js";
+import { buildUrlFromParams, layoutOnlyParamSets, localizePagesPath, resolveParentParams, routeStaticParamSets, validateDiscoveredParams } from "./prerender.js";
 import { collectAppPageStaticGenerationRuntimes, hasAppPageGenerateStaticParamsAtLastDynamicSegment, isAppPageStaticEligible, isEdgeRuntime, resolveAppPageDynamicConfig, resolveAppPageSegmentConfig, resolveAppPageStaticGenerationRuntime } from "../server/app-segment-config.js";
-import { resolveBuiltRscEntryPath } from "./server-entry.js";
+import { resolveBuiltPagesEntryPath, resolveBuiltRscEntryPath } from "./server-entry.js";
 import fs from "node:fs";
 //#region src/build/prerender-paths.ts
 const PRERENDER_PATH_DISCOVERY_ENV = "__VINEXT_PRERENDER_PATH_DISCOVERY";
@@ -325,10 +325,6 @@ async function resolvePagesWarmRouteMetadata(options) {
 		routePatterns
 	};
 }
-function localizePagesPath(pathname, locale, i18n) {
-	if (!i18n || !locale || locale === i18n.defaultLocale) return pathname;
-	return pathname === "/" ? `/${locale}` : `/${locale}${pathname}`;
-}
 /**
 * Next.js data URLs always carry the locale segment, including the default
 * locale that is omitted from the corresponding public HTML pathname.
@@ -795,7 +791,7 @@ async function discoverPrerenderPathManifest(options) {
 	const rscBundlePath = options.rscBundlePath ?? defaultRscBundlePath;
 	const relativeRscEntryPath = path.relative(configuredRscServerDir, rscBundlePath);
 	const rscServerDir = !relativeRscEntryPath.startsWith("../") && !path.isAbsolute(relativeRscEntryPath) ? configuredRscServerDir : path.dirname(rscBundlePath);
-	const pagesBundlePath = options.pagesBundlePath ?? path.join(root, "dist", "server", "entry.js");
+	const pagesBundlePath = options.pagesBundlePath ?? resolveBuiltPagesEntryPath(path.resolve(root, options.routeRootConfig?.ssrOutDir ?? path.join("dist", "server")));
 	const bundleServerDir = fs.existsSync(rscBundlePath) ? rscServerDir : path.dirname(pagesBundlePath);
 	const manifestDir = path.join(root, "dist", "server");
 	const config = options.nextConfig ? { ...options.nextConfig } : { ...await resolveNextConfig(await loadNextConfig(root, PHASE_PRODUCTION_BUILD), root) };

package/dist/build/prerender.d.ts

@@ -30,8 +30,14 @@ export type PrerenderRouteResult = {
   router: "app" | "pages" | "metadata";
   /** Response headers that must be replayed with the prerendered artifact. */
   headers?: Record<string, string | string[]>;
-  /** Original HTTP status for prerendered App Route-style responses. */
+  /** Original HTTP status for prerendered route responses. */
   responseStatus?: number;
+  /** Pages source returned notFound, distinct from the custom 404 document. */
+  notFound?: true;
+  /** Original Pages redirect props, including client navigation semantics. */
+  redirectProps?: object;
+  /** Pages locale rendered for this public pathname. */
+  locale?: string;
   /** Cache tags collected while rendering this route. */
   tags?: string[];
   /** Raw app-tree segments used to derive App Route implicit tags. */
@@ -234,6 +240,7 @@ export declare function routeStaticParamSets(route: Pick<AppRoute, "pattern">, p
  * sets still go through routeStaticParamSets.
  */
 export declare function layoutOnlyParamSets(route: Pick<AppRoute, "params" | "pattern">, parentParamSets: Record<string, string | string[]>[]): Record<string, string | string[]>[] | null;
+export declare function localizePagesPath(pathname: string, locale: string | undefined, i18n: ResolvedNextConfig["i18n"]): string;
 /**
  * Run the prerender phase for Pages Router.
  *

package/dist/build/prerender.js

@@ -1,9 +1,11 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-matcher.js";
+import { isUnknownRecord } from "../utils/record.js";
 import { BLOCKED_PAGES } from "../shims/constants.js";
 import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
 import { appRouteLayoutStaticParamsGroups } from "../routing/app-router.js";
 import { NEXT_CACHE_TAGS_HEADER, VINEXT_METADATA_ROUTE_CACHE_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_PRERENDER_METADATA_ROUTES_PATH, VINEXT_PRERENDER_RENDER_ERROR_HEADER } from "../server/headers.js";
+import { extractLocaleFromUrl } from "../server/pages-i18n.js";
 import { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
 import { NoOpCacheHandler, getCacheHandler, setCacheHandler } from "../shims/cache-handler.js";
@@ -21,7 +23,6 @@ import { startProdServer } from "../server/prod-server.js";
 import { prerenderPoolAvailable, resolvePrerenderPoolSize, startPrerenderServerPool } from "./prerender-server-pool.js";
 import { enterPrerenderPhase } from "./prerender-phase.js";
 import { buildAppRouteCacheValue } from "../server/app-route-handler-response.js";
-import { isMetadataResponseCacheable } from "../server/metadata-route-cache-policy.js";
 import fs from "node:fs";
 import os from "node:os";
 //#region src/build/prerender.ts
@@ -337,6 +338,14 @@ function routeStaticParamSets(route, paramSets, options = {}) {
 function layoutOnlyParamSets(route, parentParamSets) {
 	return parentParamSets.length > 0 && parentParamSets.every((params) => route.params.every((name) => name in params)) ? parentParamSets : null;
 }
+function localizePagesPath(pathname, locale, i18n) {
+	if (!i18n || !locale) return pathname;
+	if (locale === i18n.defaultLocale) {
+		const firstSegment = pathname.split("/")[1]?.toLowerCase();
+		if (!i18n.locales.some((candidate) => candidate.toLowerCase() === firstSegment)) return pathname;
+	}
+	return pathname === "/" ? `/${locale}` : `/${locale}${pathname}`;
+}
 /**
 * Run the prerender phase for Pages Router.
 *
@@ -379,6 +388,8 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 				port: 0,
 				host: "127.0.0.1",
 				outDir: path.dirname(path.dirname(pagesBundlePath)),
+				serverDir: path.dirname(pagesBundlePath),
+				serverEntryPath: pagesBundlePath,
 				noCompression: true,
 				purpose: "prerender"
 			});
@@ -428,7 +439,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 		for (const route of bundlePageRoutes) {
 			if (BLOCKED_PAGES.includes(route.pattern)) continue;
 			if (route.pattern === "/404") continue;
-			const { type, revalidate: classifiedRevalidate } = classifyPagesRoute(route.filePath);
+			const { type, revalidate: classifiedRevalidate, hasStaticProps = false } = classifyPagesRoute(route.filePath);
 			if (type === "ssr") {
 				if (mode === "export") results.push({
 					route: route.pattern,
@@ -460,8 +471,8 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 				let pathsResult;
 				try {
 					pathsResult = await route.module.getStaticPaths({
-						locales: [],
-						defaultLocale: ""
+						locales: [...config.i18n?.locales ?? []],
+						defaultLocale: config.i18n?.defaultLocale ?? ""
 					});
 				} catch (e) {
 					results.push({
@@ -483,21 +494,38 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 				}
 				const paths = pathsResult?.paths ?? [];
 				let entryError = null;
+				const seenPaths = /* @__PURE__ */ new Set();
 				for (const item of paths) {
-					const normalized = normalizeStaticPathsEntry(item, route.pattern);
+					let locale = config.i18n?.defaultLocale;
+					let pathEntry = item;
+					if (config.i18n && typeof item === "string") {
+						const localized = extractLocaleFromUrl(item, config.i18n);
+						locale = localized.locale;
+						pathEntry = localized.url;
+					} else if (item && typeof item === "object" && item.locale !== void 0) locale = item.locale;
+					const normalized = normalizeStaticPathsEntry(pathEntry, route.pattern);
 					if ("error" in normalized) {
 						entryError = normalized.error;
 						break;
 					}
+					if (locale !== void 0 && !config.i18n?.locales.includes(locale)) {
+						entryError = `Invalid locale returned from getStaticPaths for ${route.pattern}: ${locale}`;
+						break;
+					}
 					const { params } = normalized;
 					try {
-						const urlPath = buildUrlFromParams(route.pattern, params);
-						pagesToRender.push({
-							route,
-							urlPath,
-							params,
-							revalidate
-						});
+						const urlPath = localizePagesPath(buildUrlFromParams(route.pattern, params), locale, config.i18n);
+						if (!seenPaths.has(urlPath)) {
+							seenPaths.add(urlPath);
+							pagesToRender.push({
+								route,
+								urlPath,
+								params,
+								revalidate,
+								hasStaticProps,
+								locale
+							});
+						}
 					} catch (e) {
 						entryError = e.message;
 						break;
@@ -511,25 +539,58 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					});
 					continue;
 				}
-			} else pagesToRender.push({
+			} else for (const locale of config.i18n?.locales ?? [void 0]) pagesToRender.push({
 				route,
-				urlPath: route.pattern,
+				urlPath: localizePagesPath(route.pattern, locale, config.i18n),
 				params: {},
-				revalidate
+				revalidate,
+				hasStaticProps,
+				locale
 			});
 		}
 		if (!options._prodServer && pagesBundlePath && prerenderPoolAvailable()) {
 			const poolSize = resolvePrerenderPoolSize(pagesToRender.length, concurrency);
 			if (poolSize > 1) {
-				renderPool = await startOptionalPrerenderServerPool(path.dirname(path.dirname(pagesBundlePath)), poolSize);
+				renderPool = await startOptionalPrerenderServerPool(path.dirname(path.dirname(pagesBundlePath)), poolSize, void 0, path.dirname(pagesBundlePath));
 				if (renderPool) renderPorts = renderPool.ports;
 			}
 		}
 		let completed = 0;
-		const pageResults = await runWithConcurrency(pagesToRender, concurrency, async ({ route, urlPath, revalidate }) => {
+		const pageResults = await runWithConcurrency(pagesToRender, concurrency, async ({ route, urlPath, revalidate, hasStaticProps, locale }) => {
 			let result;
 			try {
 				const response = await renderPage(urlPath);
+				if (mode === "default" && response.headers.get("x-vinext-prerender-rewritten") !== "0") {
+					response.body?.cancel().catch(() => {});
+					const skipped = {
+						route: route.pattern,
+						status: "skipped",
+						reason: "dynamic"
+					};
+					onProgress?.({
+						completed: ++completed,
+						total: pagesToRender.length,
+						route: urlPath,
+						status: skipped.status
+					});
+					return skipped;
+				}
+				const contentType = response.headers.get("content-type");
+				const isStaticPropsResponse = mode === "default" && hasStaticProps && response.headers.get("X-Vinext-Cache") === "MISS";
+				const notFound = isStaticPropsResponse && response.status === 404;
+				const redirect = isStaticPropsResponse && [
+					301,
+					302,
+					303,
+					307,
+					308
+				].includes(response.status);
+				let redirectProps;
+				if (redirect) {
+					const props = await response.json();
+					if (!isUnknownRecord(props) || !isUnknownRecord(props.pageProps) || typeof props.pageProps.__N_REDIRECT !== "string" || props.pageProps.__N_REDIRECT_STATUS !== response.status || props.pageProps.__N_REDIRECT_BASE_PATH !== void 0 && typeof props.pageProps.__N_REDIRECT_BASE_PATH !== "boolean") throw new Error(`Invalid prerendered Pages redirect props for ${urlPath}`);
+					redirectProps = props;
+				}
 				const outputFiles = [];
 				const htmlOutputPath = getOutputPath(urlPath, config.trailingSlash, mode === "export" ? config.basePath : "");
 				const htmlFullPath = path.join(outDir, htmlOutputPath);
@@ -539,7 +600,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					fs.writeFileSync(htmlFullPath, html, "utf-8");
 					outputFiles.push(htmlOutputPath);
 				} else {
-					if (!response.ok) throw new Error(`renderPage returned ${response.status} for ${urlPath}`);
+					if (!response.ok && !notFound) throw new Error(`renderPage returned ${response.status} for ${urlPath}`);
 					const html = await response.text();
 					fs.mkdirSync(path.dirname(htmlFullPath), { recursive: true });
 					fs.writeFileSync(htmlFullPath, html, "utf-8");
@@ -552,7 +613,19 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					revalidate,
 					...typeof revalidate === "number" ? { expire: config.expireTime } : {},
 					router: "pages",
-					...urlPath !== route.pattern ? { path: urlPath } : {}
+					...urlPath !== route.pattern ? { path: urlPath } : {},
+					...locale ? { locale } : {},
+					...response.ok ? { responseStatus: response.status } : {},
+					...response.ok && contentType ? { headers: { "content-type": contentType } } : {},
+					...notFound ? {
+						notFound: true,
+						responseStatus: 404
+					} : {},
+					...redirect ? {
+						responseStatus: response.status,
+						redirectProps,
+						headers: { location: response.headers.get("location") ?? "/" }
+					} : {}
 				};
 			} catch (e) {
 				renderPool?.recordRenderError(e);
@@ -575,21 +648,41 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 		renderPool?.assertHealthy();
 		const hasCustom404 = findFileWithExtensions(path.join(pagesDir, "404"), fileMatcher);
 		const hasErrorPage = findFileWithExtensions(path.join(pagesDir, "_error"), fileMatcher);
-		if (hasCustom404 || hasErrorPage) try {
-			const notFoundRes = await renderPage(hasCustom404 ? "/404" : NOT_FOUND_SENTINEL_PATH);
-			const contentType = notFoundRes.headers.get("content-type") ?? "";
-			if (notFoundRes.status === 404 && contentType.includes("text/html")) {
-				const html404 = await notFoundRes.text();
-				results.push({
-					route: "/404",
-					status: "rendered",
-					outputFiles: emitStatic404Files(outDir, html404, config.trailingSlash),
-					revalidate: false,
-					router: "pages"
-				});
+		for (const locale of config.i18n?.locales ?? [void 0]) {
+			if (!hasCustom404 && !hasErrorPage) break;
+			try {
+				const notFoundRes = await renderPage(localizePagesPath(hasCustom404 ? "/404" : NOT_FOUND_SENTINEL_PATH, locale, config.i18n));
+				if (mode === "default" && notFoundRes.headers.get("x-vinext-prerender-rewritten") !== "0") {
+					notFoundRes.body?.cancel().catch(() => {});
+					continue;
+				}
+				const contentType = notFoundRes.headers.get("content-type") ?? "";
+				if (notFoundRes.status === 404 && contentType.includes("text/html")) {
+					const html404 = await notFoundRes.text();
+					const pathname = localizePagesPath("/404", locale, config.i18n);
+					let outputFiles;
+					if (pathname === "/404") outputFiles = emitStatic404Files(outDir, html404, config.trailingSlash);
+					else {
+						const outputPath = getOutputPath(pathname, config.trailingSlash);
+						const fullPath = path.join(outDir, outputPath);
+						fs.mkdirSync(path.dirname(fullPath), { recursive: true });
+						fs.writeFileSync(fullPath, html404, "utf8");
+						outputFiles = [outputPath];
+					}
+					results.push({
+						route: "/404",
+						status: "rendered",
+						outputFiles,
+						revalidate: false,
+						router: "pages",
+						headers: { "content-type": contentType },
+						...pathname !== "/404" ? { path: pathname } : {},
+						...locale ? { locale } : {}
+					});
+				}
+			} catch (e) {
+				renderPool?.recordRenderError(e);
 			}
-		} catch (e) {
-			renderPool?.recordRenderError(e);
 		}
 		renderPool?.assertHealthy();
 		if (!skipManifest) writePrerenderIndex(results, manifestDir, {
@@ -900,7 +993,8 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 						};
 					}
 					const cacheControl = response.headers.get("cache-control") ?? "";
-					if (!isMetadataResponseCacheable(response)) {
+					const requestCacheLife = readPrerenderCacheLifeHeader(response.headers);
+					if (requestCacheLife?.revalidate === 0) {
 						await response.body?.cancel();
 						return {
 							route: routePattern,
@@ -908,15 +1002,14 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 							reason: "dynamic"
 						};
 					}
-					const requestCacheLife = readPrerenderCacheLifeHeader(response.headers);
 					const collectedTags = readPrerenderCacheTagsHeader(response.headers);
-					const cacheValue = await buildAppRouteCacheValue(response);
+					const cacheValue = await buildAppRouteCacheValue(response, cacheControl);
 					cacheValue.headers[VINEXT_METADATA_ROUTE_CACHE_HEADER] = "1";
 					const outputPath = getAppRouteOutputPath(urlPath);
 					const fullPath = path.join(outDir, outputPath);
 					fs.mkdirSync(path.dirname(fullPath), { recursive: true });
 					fs.writeFileSync(fullPath, new Uint8Array(cacheValue.body));
-					const renderedCacheControl = resolveRenderedCacheControl(requestCacheLife ?? {}, cacheControl, config.expireTime);
+					const renderedCacheControl = resolveRenderedCacheControl(requestCacheLife ?? {}, "", config.expireTime);
 					const renderedRevalidate = renderedCacheControl.revalidate ?? false;
 					const renderedStale = resolveClientStaleTimeSeconds(requestCacheLife ?? void 0);
 					return {
@@ -1187,6 +1280,9 @@ function writePrerenderIndex(routes, outDir, options) {
 			...r.routeSegments ? { routeSegments: r.routeSegments } : {},
 			...r.headers ? { headers: r.headers } : {},
 			...typeof r.responseStatus === "number" ? { responseStatus: r.responseStatus } : {},
+			...r.notFound ? { notFound: true } : {},
+			...r.redirectProps ? { redirectProps: r.redirectProps } : {},
+			...r.locale ? { locale: r.locale } : {},
 			...r.path ? { path: r.path } : {},
 			...r.fallback ? { fallback: true } : {}
 		};
@@ -1210,4 +1306,4 @@ function writePrerenderIndex(routes, outDir, options) {
 	fs.writeFileSync(path.join(outDir, "vinext-prerender.json"), JSON.stringify(index, null, 2), "utf-8");
 }
 //#endregion
-export { buildUrlFromParams, extractRscPayloadFromPrerenderedHtml, layoutOnlyParamSets, prerenderApp, prerenderPages, readPrerenderSecret, resolveParentParams, routeStaticParamSets, validateDiscoveredParams, writePrerenderIndex };
+export { buildUrlFromParams, extractRscPayloadFromPrerenderedHtml, layoutOnlyParamSets, localizePagesPath, prerenderApp, prerenderPages, readPrerenderSecret, resolveParentParams, routeStaticParamSets, validateDiscoveredParams, writePrerenderIndex };

package/dist/build/run-prerender.js

@@ -11,7 +11,7 @@ import { rememberCurrentServerEntryImportMtime, startProdServer } from "../serve
 import { enterPrerenderPhase } from "./prerender-phase.js";
 import { prerenderApp, prerenderPages, writePrerenderIndex } from "./prerender.js";
 import { injectPregeneratedConcretePaths } from "./inject-pregenerated-paths.js";
-import { resolveBuiltRscEntryPath } from "./server-entry.js";
+import { resolveBuiltPagesEntryPath, resolveBuiltRscEntryPath } from "./server-entry.js";
 import fs from "node:fs";
 //#region src/build/run-prerender.ts
 /**
@@ -112,10 +112,11 @@ async function runPrerender(options) {
 	const buildOutDir = path.resolve(root, "dist");
 	const configuredRscServerDir = path.resolve(root, options.routeRootConfig?.rscOutDir ?? path.join("dist", "server"));
 	const rscBundlePath = options.rscBundlePath ?? resolveBuiltRscEntryPath(configuredRscServerDir);
+	const pagesBundlePath = options.pagesBundlePath ?? resolveBuiltPagesEntryPath(path.resolve(root, options.routeRootConfig?.ssrOutDir ?? path.join("dist", "server")));
 	const relativeEntryPath = path.relative(configuredRscServerDir, rscBundlePath);
 	const serverDir = !relativeEntryPath.startsWith("../") && !path.isAbsolute(relativeEntryPath) ? configuredRscServerDir : path.dirname(rscBundlePath);
 	const config = options.nextConfig ? { ...options.nextConfig } : { ...await resolveNextConfig(await loadNextConfig(root, PHASE_PRODUCTION_BUILD), root) };
-	const builtBuildId = readBuiltBuildId(manifestDir) ?? readBuiltBuildId(serverDir);
+	const builtBuildId = readBuiltBuildId(manifestDir) ?? readBuiltBuildId(appDir ? serverDir : path.dirname(pagesBundlePath));
 	if (builtBuildId) config.buildId = builtBuildId;
 	const mode = config.output === "export" ? "export" : "default";
 	const allRoutes = [];
@@ -183,7 +184,7 @@ async function runPrerender(options) {
 				...sharedProdServer ? {
 					_prodServer: sharedProdServer,
 					_prerenderSecret: sharedPrerenderSecret
-				} : { pagesBundlePath: options.pagesBundlePath ?? path.join(manifestDir, "entry.js") },
+				} : { pagesBundlePath },
 				onProgress: ({ total, route }) => {
 					if (pagesTotal === 0) {
 						pagesTotal = total;

package/dist/build/server-entry.d.ts

@@ -1,4 +1,6 @@
 //#region src/build/server-entry.d.ts
+/** Pages builds emit entry.js in Node or index.js when the host owns the Worker entry. */
+export declare function resolveBuiltPagesEntryPath(serverDir: string): string;
 /** Resolve the built App handler even when a deployment host owns index.js. */
 export declare function resolveBuiltRscEntryPath(serverDir: string): string;
 //#endregion

package/dist/build/server-entry.js

@@ -2,6 +2,12 @@ import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import fs from "node:fs";
 //#region src/build/server-entry.ts
 const RSC_ENTRY_MANIFEST_KEY = "virtual:vinext-rsc-entry";
+/** Pages builds emit entry.js in Node or index.js when the host owns the Worker entry. */
+function resolveBuiltPagesEntryPath(serverDir) {
+	const nodeEntryPath = path.join(serverDir, "entry.js");
+	const workerEntryPath = path.join(serverDir, "index.js");
+	return fs.existsSync(nodeEntryPath) || !fs.existsSync(workerEntryPath) ? nodeEntryPath : workerEntryPath;
+}
 /** Resolve the built App handler even when a deployment host owns index.js. */
 function resolveBuiltRscEntryPath(serverDir) {
 	const fallbackPath = path.join(serverDir, "index.js");
@@ -25,4 +31,4 @@ function resolveBuiltRscEntryPath(serverDir) {
 	return fs.existsSync(entryPath) ? entryPath : fallbackPath;
 }
 //#endregion
-export { resolveBuiltRscEntryPath };
+export { resolveBuiltPagesEntryPath, resolveBuiltRscEntryPath };

package/dist/client/browser-globals.d.ts

@@ -0,0 +1,4 @@
+//#region src/client/browser-globals.d.ts
+export declare const RSC_FORM_STATE_GLOBAL = "__VINEXT_RSC_FORM_STATE__";
+export declare const NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION = "vinext.navigationRuntime";
+//#endregion

package/dist/client/browser-globals.js

@@ -0,0 +1,5 @@
+//#region src/client/browser-globals.ts
+const RSC_FORM_STATE_GLOBAL = "__VINEXT_RSC_FORM_STATE__";
+const NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION = "vinext.navigationRuntime";
+//#endregion
+export { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, RSC_FORM_STATE_GLOBAL };

package/dist/client/navigation-runtime.d.ts

@@ -66,7 +66,6 @@ export type NavigationRuntime = {
   bootstrap: NavigationRuntimeBootstrap;
   functions: NavigationRuntimeFunctions;
 };
-export declare const NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION = "vinext.navigationRuntime";
 export declare const NAVIGATION_RUNTIME_KEY: unique symbol;
 export declare function getNavigationRuntime(): NavigationRuntime | null;
 export declare function registerNavigationRuntimeBootstrap(bootstrap: Partial<NavigationRuntimeBootstrap>): NavigationRuntime;

package/dist/client/navigation-runtime.js

@@ -1,6 +1,6 @@
 import { isUnknownRecord } from "../utils/record.js";
+import { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION } from "./browser-globals.js";
 //#region src/client/navigation-runtime.ts
-const NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION = "vinext.navigationRuntime";
 const NAVIGATION_RUNTIME_KEY = Symbol.for(NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION);
 const ROUTE_MANIFEST_SEGMENT_GRAPH_MAP_KEYS = [
 	"boundaries",
@@ -169,4 +169,4 @@ function hasAppNavigationRuntimeBootstrap() {
 	return getNavigationRuntime() !== null;
 }
 //#endregion
-export { NAVIGATION_RUNTIME_KEY, NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions };
+export { NAVIGATION_RUNTIME_KEY, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions };

package/dist/config/dotenv.js

@@ -1,7 +1,19 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import fs from "node:fs";
-import { parseEnv } from "node:util";
 //#region src/config/dotenv.ts
+const DOTENV_LINE = /^\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?$/gm;
+function parseDotenv(content) {
+	const parsed = {};
+	const lines = content.replace(/\r\n?/g, "\n");
+	for (const match of lines.matchAll(DOTENV_LINE)) {
+		let value = (match[2] ?? "").trim();
+		const quote = value[0];
+		value = value.replace(/^(['"`])([\s\S]*)\1$/gm, "$2");
+		if (quote === "\"") value = value.replace(/\\n/g, "\n").replace(/\\r/g, "\r");
+		parsed[match[1]] = value;
+	}
+	return parsed;
+}
 /**
 * Next.js-compatible dotenv lookup order (highest priority first).
 */
@@ -42,8 +54,7 @@ function loadDotenv({ root, mode, processEnv = process.env }) {
 	for (const relativeFile of getDotenvFiles(mode)) {
 		const filePath = path.join(root, relativeFile);
 		if (!fs.existsSync(filePath)) continue;
-		const fileContent = fs.readFileSync(filePath, "utf-8");
-		const expanded = expandEnv(parseEnv(fileContent), processEnv);
+		const expanded = expandEnv(parseDotenv(fs.readFileSync(filePath, "utf-8")), processEnv);
 		for (const [key, value] of Object.entries(expanded)) {
 			if (processEnv[key] !== void 0) continue;
 			processEnv[key] = value;

package/dist/entries/app-rsc-entry.js

@@ -46,7 +46,6 @@ const appPageRequestPath = resolveEntryPath("../server/app-page-request.js", imp
 const appSegmentConfigPath = resolveEntryPath("../server/app-segment-config.js", import.meta.url);
 const appRscRouteMatchingPath = resolveEntryPath("../server/app-rsc-route-matching.js", import.meta.url);
 const appRscResponseStagePath = resolveEntryPath("../server/app-rsc-response-stage.js", import.meta.url);
-const appRscCombinedHandlerPath = resolveEntryPath("../server/app-rsc-combined-handler.js", import.meta.url);
 const rscStreamHintsPath = resolveEntryPath("../server/rsc-stream-hints.js", import.meta.url);
 const isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url);
 const thenableParamsShimPath = resolveEntryPath("../shims/thenable-params.js", import.meta.url);
@@ -240,6 +239,7 @@ function __isMetadataPath(pathname) {
 ${generateDevOriginCheckCode(config?.allowedDevOrigins)}
 
 const __requestHandler = createAppRscRequestHandler({
+  assetPrefix: __assetPrefix,
   basePath: __basePath,
   buildId: process.env.__VINEXT_BUILD_ID ?? null,
   cacheabilityRequestProjection: __cacheabilityRequestProjection,
@@ -475,7 +475,7 @@ ${instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(toSl
 import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(instrumentationRuntimePath)};` : ""}
 ${applicationInitializationCode}
 ${middlewarePath ? instrumentationPath ? "let middlewareModule;" : `import * as middlewareModule from ${JSON.stringify(toSlash(middlewarePath))};` : ""}
-${responseStageOnly ? `import { renderAppWorkerResponseStage as __renderAppWorkerResponseStage } from ${JSON.stringify(appRscResponseStagePath)};` : `import { createAppRscHandler } from ${JSON.stringify(appRscCombinedHandlerPath)};`}
+${responseStageOnly ? `import { renderAppWorkerResponseStage as __renderAppWorkerResponseStage } from ${JSON.stringify(appRscResponseStagePath)};` : `import { createAppRscHandler } from "vinext/server/app-rsc-combined-handler";`}
 import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 import __pagesClientAssets from "virtual:vinext-pages-client-assets";
 ${actionOwners === void 0 ? `import __vinextActionOwners from ${JSON.stringify(ACTION_OWNER_MANIFEST_ID)};` : ""}
@@ -952,6 +952,7 @@ ${rootParamNameEntries.join("\n")}
 __setPagesClientAssets(__pagesClientAssets);
 function __VINEXT_ACTION_OWNERS() { return ${actionOwners === void 0 ? "__vinextActionOwners" : safeJsonStringify(actionOwners)}; }
 ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandler = createAppRscHandler({"}
+  assetPrefix: __assetPrefix,
   basePath: __basePath,
   buildId: process.env.__VINEXT_BUILD_ID ?? null,
   ensureRouteLoaded: __ensureRouteLoaded,