vinext 0.0.52 → 0.0.53

package/README.md

@@ -558,7 +558,7 @@ These are intentional exclusions. For things that are missing today but on the r
 
 These are gaps we'd like to close — distinct from the [intentional exclusions](#whats-not-supported-and-wont-be) above.
 
-- **Image optimization doesn't happen at build time.** Remote images work via `@unpic/react` (auto-detects 28 CDN providers). Local images are routed through a `/_vinext/image` endpoint that can resize and transcode on Cloudflare Workers (via the Images binding) in production, but no build-time optimization or static resizing occurs.
+- **Image optimization doesn't happen at build time.** Remote images work via `@unpic/react` (auto-detects 28 CDN providers). Local images are routed through a `/_next/image` endpoint that can resize and transcode on Cloudflare Workers (via the Images binding) in production, but no build-time optimization or static resizing occurs.
 - **Google Fonts are loaded from the CDN, not self-hosted.** No `size-adjust` fallback font metrics. Local fonts work but `@font-face` CSS is injected at runtime, not extracted at build time.
 - **Route segment config** — `runtime` and `preferredRegion` are ignored (everything runs in the same environment).
 - **Node.js production server (`vinext start`)** works for testing but is less complete than Workers deployment. Cloudflare Workers is the primary target.

package/dist/build/clean-output.d.ts

@@ -0,0 +1,14 @@
+//#region src/build/clean-output.d.ts
+type CleanBuildOutputOptions = {
+  root: string;
+  outDir?: string;
+  emptyOutDir?: boolean;
+};
+type CleanBuildOutputResult = {
+  cleaned: boolean;
+  outDir: string;
+};
+declare function cleanBuildOutput(options: CleanBuildOutputOptions): CleanBuildOutputResult;
+//#endregion
+export { cleanBuildOutput };
+//# sourceMappingURL=clean-output.d.ts.map

package/dist/build/clean-output.js

@@ -0,0 +1,36 @@
+import fs from "node:fs";
+import path from "node:path";
+//#region src/build/clean-output.ts
+function resolveOutDir(root, outDir) {
+	const resolvedRoot = path.resolve(root);
+	if (!outDir) return path.join(resolvedRoot, "dist");
+	return path.isAbsolute(outDir) ? outDir : path.resolve(resolvedRoot, outDir);
+}
+function isPathInsideOrEqual(parent, child) {
+	const relative = path.relative(parent, child);
+	return relative === "" || !relative.startsWith("..") && !path.isAbsolute(relative);
+}
+function shouldCleanBuildOutput(options) {
+	if (options.emptyOutDir === false) return false;
+	if (options.emptyOutDir === true) return true;
+	return isPathInsideOrEqual(path.resolve(options.root), resolveOutDir(options.root, options.outDir));
+}
+function cleanBuildOutput(options) {
+	const outDir = resolveOutDir(options.root, options.outDir);
+	if (!shouldCleanBuildOutput(options)) return {
+		cleaned: false,
+		outDir
+	};
+	fs.rmSync(outDir, {
+		recursive: true,
+		force: true
+	});
+	return {
+		cleaned: true,
+		outDir
+	};
+}
+//#endregion
+export { cleanBuildOutput };
+
+//# sourceMappingURL=clean-output.js.map

package/dist/build/clean-output.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clean-output.js","names":[],"sources":["../../src/build/clean-output.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\n\ntype CleanBuildOutputOptions = {\n  root: string;\n  outDir?: string;\n  emptyOutDir?: boolean;\n};\n\ntype CleanBuildOutputResult = {\n  cleaned: boolean;\n  outDir: string;\n};\n\nfunction resolveOutDir(root: string, outDir: string | undefined): string {\n  const resolvedRoot = path.resolve(root);\n  if (!outDir) return path.join(resolvedRoot, \"dist\");\n  return path.isAbsolute(outDir) ? outDir : path.resolve(resolvedRoot, outDir);\n}\n\nfunction isPathInsideOrEqual(parent: string, child: string): boolean {\n  const relative = path.relative(parent, child);\n  return relative === \"\" || (!relative.startsWith(\"..\") && !path.isAbsolute(relative));\n}\n\nfunction shouldCleanBuildOutput(options: CleanBuildOutputOptions): boolean {\n  if (options.emptyOutDir === false) return false;\n  if (options.emptyOutDir === true) return true;\n\n  return isPathInsideOrEqual(\n    path.resolve(options.root),\n    resolveOutDir(options.root, options.outDir),\n  );\n}\n\nexport function cleanBuildOutput(options: CleanBuildOutputOptions): CleanBuildOutputResult {\n  const outDir = resolveOutDir(options.root, options.outDir);\n  if (!shouldCleanBuildOutput(options)) return { cleaned: false, outDir };\n\n  fs.rmSync(outDir, { recursive: true, force: true });\n  return { cleaned: true, outDir };\n}\n"],"mappings":";;;AAcA,SAAS,cAAc,MAAc,QAAoC;CACvE,MAAM,eAAe,KAAK,QAAQ,KAAK;CACvC,IAAI,CAAC,QAAQ,OAAO,KAAK,KAAK,cAAc,OAAO;CACnD,OAAO,KAAK,WAAW,OAAO,GAAG,SAAS,KAAK,QAAQ,cAAc,OAAO;;AAG9E,SAAS,oBAAoB,QAAgB,OAAwB;CACnE,MAAM,WAAW,KAAK,SAAS,QAAQ,MAAM;CAC7C,OAAO,aAAa,MAAO,CAAC,SAAS,WAAW,KAAK,IAAI,CAAC,KAAK,WAAW,SAAS;;AAGrF,SAAS,uBAAuB,SAA2C;CACzE,IAAI,QAAQ,gBAAgB,OAAO,OAAO;CAC1C,IAAI,QAAQ,gBAAgB,MAAM,OAAO;CAEzC,OAAO,oBACL,KAAK,QAAQ,QAAQ,KAAK,EAC1B,cAAc,QAAQ,MAAM,QAAQ,OAAO,CAC5C;;AAGH,SAAgB,iBAAiB,SAA0D;CACzF,MAAM,SAAS,cAAc,QAAQ,MAAM,QAAQ,OAAO;CAC1D,IAAI,CAAC,uBAAuB,QAAQ,EAAE,OAAO;EAAE,SAAS;EAAO;EAAQ;CAEvE,GAAG,OAAO,QAAQ;EAAE,WAAW;EAAM,OAAO;EAAM,CAAC;CACnD,OAAO;EAAE,SAAS;EAAM;EAAQ"}

package/dist/build/prerender.d.ts

@@ -1,12 +1,14 @@
 import { Route } from "../routing/pages-router.js";
 import { AppRoute } from "../routing/app-route-graph.js";
 import { ResolvedNextConfig } from "../config/next-config.js";
+import { MetadataFileRoute } from "../server/metadata-routes.js";
 import { readPrerenderSecret } from "./server-manifest.js";
 import { Server } from "node:http";
 
 //#region src/build/prerender.d.ts
 type PrerenderResult = {
-  /** One entry per route (including skipped/error routes). */routes: PrerenderRouteResult[];
+  /** One entry per route (including skipped/error routes). */routes: PrerenderRouteResult[]; /** Additional generated files that are not represented as route entries. */
+  outputFiles?: string[];
 };
 type PrerenderRouteResult = {
   /** The route's file-system pattern, e.g. `/blog/:slug`. */route: string;
@@ -83,7 +85,8 @@ type PrerenderPagesOptions = {
   pagesBundlePath?: string;
 } & PrerenderOptions;
 type PrerenderAppOptions = {
-  /** Discovered app routes. */routes: AppRoute[];
+  /** Discovered app routes. */routes: AppRoute[]; /** Discovered file-based metadata routes. Used by static export. */
+  metadataRoutes?: readonly MetadataFileRoute[];
   /**
    * Absolute path to the pre-built RSC handler bundle (e.g. `dist/server/index.js`).
    */
@@ -176,6 +179,7 @@ declare function prerenderPages({
  */
 declare function prerenderApp({
   routes,
+  metadataRoutes,
   outDir,
   config,
   mode,

package/dist/build/prerender.js

@@ -1,11 +1,12 @@
 import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-matcher.js";
-import { VINEXT_PRERENDER_SECRET_HEADER } from "../server/headers.js";
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../server/headers.js";
 import { normalizeStaticPathsEntry } from "../routing/route-pattern.js";
 import { headersContextFromRequest, runWithHeadersContext } from "../shims/headers.js";
 import { NoOpCacheHandler, _consumeRequestScopedCacheLife, getCacheHandler, setCacheHandler } from "../shims/cache.js";
 import { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.js";
 import { concatUint8Arrays, decodeRscEmbeddedChunk } from "../server/app-rsc-embedded-chunks.js";
 import { navigationRuntimeRscBootstrapExpression } from "../server/app-ssr-stream.js";
+import { encodePrerenderRouteParams, serializePrerenderRouteParamsHeader } from "../server/prerender-route-params.js";
 import { readPrerenderSecret } from "./server-manifest.js";
 import { getOutputPath, getRscOutputPath } from "../utils/prerender-output-paths.js";
 import { startProdServer } from "../server/prod-server.js";
@@ -143,6 +144,26 @@ function buildUrlFromParams(pattern, params) {
 	} else result.push(part);
 	return "/" + result.join("/");
 }
+function metadataOutputPath(servedUrl) {
+	const pathname = servedUrl.split("?", 1)[0];
+	if (!pathname || !pathname.startsWith("/")) return null;
+	const segments = pathname.split("/").filter(Boolean);
+	if (segments.length === 0 || segments.some((segment) => segment === "." || segment === "..")) return null;
+	return segments.join("/");
+}
+function emitStaticMetadataFiles(metadataRoutes, outDir) {
+	const outputFiles = [];
+	for (const route of metadataRoutes) {
+		if (route.isDynamic) continue;
+		const outputPath = metadataOutputPath(route.servedUrl);
+		if (!outputPath) continue;
+		const fullPath = path.join(outDir, ...outputPath.split("/"));
+		fs.mkdirSync(path.dirname(fullPath), { recursive: true });
+		fs.copyFileSync(route.filePath, fullPath);
+		outputFiles.push(outputPath);
+	}
+	return outputFiles;
+}
 /**
 * Resolve parent dynamic segment params for a route.
 * Handles top-down generateStaticParams resolution for nested dynamic routes.
@@ -268,6 +289,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 		const pagesToRender = [];
 		for (const route of bundlePageRoutes) {
 			if (path.basename(route.filePath, path.extname(route.filePath)).startsWith("_")) continue;
+			if (route.pattern === "/404") continue;
 			if (!routes.find((r) => r.filePath === route.filePath || r.pattern === route.pattern)) continue;
 			const { type, revalidate: classifiedRevalidate } = classifyPagesRoute(route.filePath);
 			if (type === "ssr") {
@@ -394,9 +416,12 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 			return result;
 		});
 		results.push(...pageResults);
-		if (findFileWithExtensions(path.join(pagesDir, "404"), fileMatcher) || findFileWithExtensions(path.join(pagesDir, "_error"), fileMatcher)) try {
-			const notFoundRes = await renderPage(NOT_FOUND_SENTINEL_PATH);
-			if ((notFoundRes.headers.get("content-type") ?? "").includes("text/html")) {
+		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();
 				const fullPath = path.join(outDir, "404.html");
 				fs.writeFileSync(fullPath, html404, "utf-8");
@@ -438,7 +463,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 * If they succeed, they are marked as rendered. If they throw a DynamicUsageError
 * or fail, they are marked as skipped with reason 'dynamic'.
 */
-async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...options }) {
+async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode, rscBundlePath, ...options }) {
 	const manifestDir = options.manifestDir ?? outDir;
 	const concurrency = options.concurrency ?? DEFAULT_CONCURRENCY;
 	const onProgress = options.onProgress;
@@ -477,7 +502,8 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 					...secretHeaders,
 					...Object.fromEntries(req.headers.entries())
 				},
-				body: req.method !== "GET" && req.method !== "HEAD" ? req.body : void 0
+				body: req.method !== "GET" && req.method !== "HEAD" ? req.body : void 0,
+				redirect: "manual"
 			});
 		};
 		const staticParamsCache = /* @__PURE__ */ new Map();
@@ -608,6 +634,7 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 					urlsToRender.push({
 						urlPath,
 						routePattern: route.pattern,
+						prerenderRouteParams: encodePrerenderRouteParams(route.pattern, params),
 						revalidate,
 						isSpeculative: false
 					});
@@ -624,12 +651,14 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 			else if (type === "unknown") urlsToRender.push({
 				urlPath: route.pattern,
 				routePattern: route.pattern,
+				prerenderRouteParams: null,
 				revalidate: false,
 				isSpeculative: true
 			});
 			else urlsToRender.push({
 				urlPath: route.pattern,
 				routePattern: route.pattern,
+				prerenderRouteParams: null,
 				revalidate,
 				isSpeculative: false
 			});
@@ -640,9 +669,12 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 		* exactly once per URL after this function returns, keeping the callback
 		* at a single, predictable call site.
 		*/
-		async function renderUrl({ urlPath, routePattern, revalidate, isSpeculative }) {
+		async function renderUrl({ urlPath, routePattern, prerenderRouteParams, revalidate, isSpeculative }) {
 			try {
-				const htmlRequest = new Request(`http://localhost${urlPath}`);
+				const prerenderRouteParamsHeader = serializePrerenderRouteParamsHeader(prerenderRouteParams);
+				const htmlHeaders = new Headers();
+				if (prerenderRouteParamsHeader !== null) htmlHeaders.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
+				const htmlRequest = new Request(`http://localhost${urlPath}`, { headers: htmlHeaders });
 				const htmlRender = await runWithHeadersContext(headersContextFromRequest(htmlRequest), async () => {
 					const response = await rscHandler(htmlRequest);
 					const cacheControl = response.headers.get("cache-control") ?? "";
@@ -692,10 +724,12 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 				const html = htmlRender.html;
 				let rscData = extractRscPayloadFromPrerenderedHtml(html);
 				if (rscData === null) {
-					const rscRequest = new Request(`http://localhost${urlPath}`, { headers: {
+					const rscHeaders = new Headers({
 						Accept: "text/x-component",
 						RSC: "1"
-					} });
+					});
+					if (prerenderRouteParamsHeader !== null) rscHeaders.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
+					const rscRequest = new Request(`http://localhost${urlPath}`, { headers: rscHeaders });
 					const rscRes = await runWithHeadersContext(headersContextFromRequest(rscRequest), () => rscHandler(rscRequest));
 					if (!rscRes.ok) {
 						await rscRes.body?.cancel();
@@ -752,6 +786,7 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 			return result;
 		});
 		results.push(...appResults);
+		const outputFiles = mode === "export" && metadataRoutes.length > 0 ? emitStaticMetadataFiles(metadataRoutes, outDir) : [];
 		try {
 			const notFoundRequest = new Request(`http://localhost${NOT_FOUND_SENTINEL_PATH}`);
 			const notFoundRes = await runWithHeadersContext(headersContextFromRequest(notFoundRequest), () => rscHandler(notFoundRequest));
@@ -773,7 +808,10 @@ async function prerenderApp({ routes, outDir, config, mode, rscBundlePath, ...op
 			buildId: config.buildId,
 			trailingSlash: config.trailingSlash
 		});
-		return { routes: results };
+		return {
+			routes: results,
+			...outputFiles.length > 0 ? { outputFiles } : {}
+		};
 	} finally {
 		setCacheHandler(previousHandler);
 		if (previousPrerenderFlag === void 0) delete process.env.VINEXT_PRERENDER;