vinext 1.4.3 → 1.4.5

package/dist/build/inline-css.d.ts

@@ -1,6 +1,4 @@
-//#region src/build/inline-css.d.ts
 type InlineCssManifest = Record<string, string>;
 export declare function collectInlineCssManifest(clientDir: string, assetPrefix: string): InlineCssManifest;
 export declare function injectInlineCssManifestGlobal(entryPath: string, manifest: InlineCssManifest): boolean;
-//#endregion
 export {};

package/dist/build/inline-css.js

@@ -1,7 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { resolveAssetUrlPrefix, resolveAssetsDir } from "../utils/asset-prefix.js";
 import fs from "node:fs";
-//#region src/build/inline-css.ts
+// src/build/inline-css.ts
 const INLINE_CSS_GLOBAL_MARKER = "globalThis.__VINEXT_INLINE_CSS__ = ";
 function collectCssFiles(directory) {
 	const files = [];
@@ -41,5 +41,4 @@ function injectInlineCssManifestGlobal(entryPath, manifest) {
 	fs.writeFileSync(entryPath, `${createInlineCssManifestGlobalCode(manifest)}\n${code}`);
 	return true;
 }
-//#endregion
 export { collectInlineCssManifest, injectInlineCssManifestGlobal };

package/dist/build/lifecycle.d.ts

@@ -3,7 +3,6 @@ import { ResolvedVinextPrerenderConfig, VinextRouteRootConfig } from "../config/
 import { ResolvedNextConfig } from "../config/next-config.js";
 import { runWithPreviewBuildCredentials } from "./preview-credentials.js";
 import { Plugin, PluginOption, ResolvedConfig, UserConfig, ViteBuilder } from "vite";
-//#region src/build/lifecycle.d.ts
 export type BuildLifecycleContext = {
   cacheConfig: VinextCacheConfig | null;
   configNodeEnv?: string;
@@ -38,5 +37,4 @@ export declare function createBuildLifecyclePlugins(options: {
   shouldDeferPostBuild?: () => boolean;
   shouldPrepare: (config: UserConfig | ResolvedConfig) => boolean;
   shouldBuildPlainPages: () => boolean;
-}): Plugin[];
-//#endregion
+}): Plugin[];

package/dist/build/lifecycle.js

@@ -1,7 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { flattenPluginOptions } from "../utils/plugin-options.js";
 import { finalizeCacheAdapterPrerenderOutput, hasBuildIdentityResponseHeader, hasUncachedRequestRouting, hasVerbatimResponseVary, isConfiguredCdnResponsePolicyHeader } from "../cache/cache-adapters-virtual.js";
 import { formatVinextPrerenderLabel, resolveVinextPrerenderDecision } from "../config/prerender.js";
+import { flattenPluginOptions } from "../utils/plugin-options.js";
 import { resolveVinextPackageRoot } from "../utils/vinext-root.js";
 import { cleanBuildOutput } from "./clean-output.js";
 import { PAGES_CLIENT_ASSETS_MODULE } from "./pages-client-assets-module.js";
@@ -9,7 +9,7 @@ import { runWithPreviewBuildCredentials } from "./preview-credentials.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
-//#region src/build/lifecycle.ts
+// src/build/lifecycle.ts
 const VINEXT_BUILD_LIFECYCLE_CONFIG = "__vinextBuildLifecycle";
 async function loadProjectViteApi(root) {
 	let vitePath;
@@ -249,5 +249,4 @@ function createBuildLifecyclePlugins(options) {
 		}
 	}, finalizePlugin];
 }
-//#endregion
 export { VINEXT_BUILD_LIFECYCLE_CONFIG, createBuildLifecyclePlugins, prepareBuildOutput };

package/dist/build/module-dependency-cache.d.ts

@@ -1,4 +1,3 @@
-//#region src/build/module-dependency-cache.d.ts
 export declare function createModuleDependencyCache<T>(collect: (moduleId: string) => Promise<T>): (moduleId: string) => Promise<T>;
 export type ModuleDependencyEntry<T> = {
   dependencies: T[];
@@ -31,5 +30,4 @@ export declare class ModuleDependencyStore<T> {
   invalidate(files: readonly string[], event: FileEvent["event"]): boolean;
   clear(): void;
 }
-//#endregion
 export {};

package/dist/build/module-dependency-cache.js

@@ -1,5 +1,5 @@
 import { stripViteModuleQuery } from "../utils/path.js";
-//#region src/build/module-dependency-cache.ts
+// src/build/module-dependency-cache.ts
 function createModuleDependencyCache(collect) {
 	const cache = /* @__PURE__ */ new Map();
 	return function getModuleDependencies(moduleId) {
@@ -59,5 +59,4 @@ var ModuleDependencyStore = class {
 		this.entries.clear();
 	}
 };
-//#endregion
 export { ModuleDependencyStore, createModuleDependencyCache };

package/dist/build/next-client-runtime-manifests.d.ts

@@ -1,6 +1,5 @@
-import { ValidFileMatcher } from "../routing/file-matcher.js";
 import { ResolvedNextConfig } from "../config/next-config.js";
-//#region src/build/next-client-runtime-manifests.d.ts
+import { ValidFileMatcher } from "../routing/file-matcher.js";
 type EmitNextClientRuntimeManifestsOptions = {
   clientDir: string;
   assetsSubdir: string;
@@ -18,5 +17,4 @@ export declare function getPagesManifestPage(pagesDir: string, filePath: string,
 export declare function buildNextClientBuildManifestContent(rewrites: ResolvedNextConfig["rewrites"], pages: readonly string[]): string;
 export declare function buildNextClientSsgManifestContent(): string;
 export declare function emitNextClientRuntimeManifests(options: EmitNextClientRuntimeManifestsOptions): void;
-//#endregion
 export {};

package/dist/build/next-client-runtime-manifests.js

@@ -1,8 +1,8 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { getSortedRoutes } from "../routing/route-validation.js";
 import { toClientRewrites } from "../client/client-rewrites.js";
+import { getSortedRoutes } from "../routing/route-validation.js";
 import fs from "node:fs";
-//#region src/build/next-client-runtime-manifests.ts
+// src/build/next-client-runtime-manifests.ts
 /**
 * Next.js page key for a `pages/` file, e.g. "/posts/[id]". Keeps the raw file
 * name (no decoding), so `pages/caf%C3%A9.js` stays "/caf%C3%A9".
@@ -33,5 +33,4 @@ function emitNextClientRuntimeManifests(options) {
 	fs.writeFileSync(path.join(manifestDir, "_buildManifest.js"), buildNextClientBuildManifestContent(options.rewrites, options.pages), "utf-8");
 	fs.writeFileSync(path.join(manifestDir, "_ssgManifest.js"), buildNextClientSsgManifestContent(), "utf-8");
 }
-//#endregion
 export { buildNextClientBuildManifestContent, buildNextClientSsgManifestContent, emitNextClientRuntimeManifests, getPagesManifestPage };

package/dist/build/nitro-public-files.d.ts

@@ -1,4 +1,3 @@
-//#region src/build/nitro-public-files.d.ts
 /** The Nitro options this integration reads and updates. */
 export type NitroPublicFilesOptions = {
   dev?: boolean;
@@ -20,5 +19,4 @@ export type NitroPublicFilesOptions = {
  * Nitro's `baseURL` is the root; vinext applies its own `basePath`. Returns
  * whether the plugin is registered.
  */
-export declare function registerNitroPublicFiles(options: NitroPublicFilesOptions, pluginModule: string, getPublicFiles: () => string[]): boolean;
-//#endregion
+export declare function registerNitroPublicFiles(options: NitroPublicFilesOptions, pluginModule: string, getPublicFiles: () => string[]): boolean;

package/dist/build/nitro-public-files.js

@@ -1,6 +1,6 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import fs from "node:fs";
-//#region src/build/nitro-public-files.ts
+// src/build/nitro-public-files.ts
 const NITRO_PUBLIC_FILES_PLUGIN = "#vinext/nitro-public-files";
 const CDN_STATIC_PRESETS = /* @__PURE__ */ new Set(["aws-amplify"]);
 const COMPRESSED_EXTENSIONS = [
@@ -56,5 +56,4 @@ function registerNitroPublicFiles(options, pluginModule, getPublicFiles) {
 	if (!options.plugins.includes(NITRO_PUBLIC_FILES_PLUGIN)) options.plugins.push(NITRO_PUBLIC_FILES_PLUGIN);
 	return true;
 }
-//#endregion
 export { registerNitroPublicFiles };

package/dist/build/output-root-externals.d.ts

@@ -1,5 +1,4 @@
 import MagicString from "magic-string";
-//#region src/build/output-root-externals.d.ts
 /**
  * Rewrite external virtual ids into imports of files that live at a fixed
  * place relative to the output root.
@@ -17,5 +16,4 @@ import MagicString from "magic-string";
 export declare function rewriteOutputRootExternals(code: string, chunkFileName: string, targets: ReadonlyMap<string, string>): {
   code: string;
   map: ReturnType<MagicString["generateMap"]>;
-} | null;
-//#endregion
+} | null;

package/dist/build/output-root-externals.js

@@ -1,7 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { escapeRegExp } from "../utils/regex.js";
 import MagicString from "magic-string";
-//#region src/build/output-root-externals.ts
+// src/build/output-root-externals.ts
 /**
 * Rewrite external virtual ids into imports of files that live at a fixed
 * place relative to the output root.
@@ -36,5 +36,4 @@ function rewriteOutputRootExternals(code, chunkFileName, targets) {
 		map: output.generateMap({ hires: "boundary" })
 	};
 }
-//#endregion
 export { rewriteOutputRootExternals };

package/dist/build/pages-client-assets-module.d.ts

@@ -1,5 +1,4 @@
 import { PagesClientAssets } from "../server/pages-client-assets.js";
-//#region src/build/pages-client-assets-module.d.ts
 export declare const PAGES_CLIENT_ASSETS_MODULE = "vinext-client-assets.js";
 export declare function buildPagesClientAssetsModule(assets: PagesClientAssets): string;
 /**
@@ -10,5 +9,4 @@ export declare function buildPagesClientAssetsModule(assets: PagesClientAssets):
  * `.assetsignore`) is excluded.
  */
 export declare function collectClientBuildFiles(fileNames: Iterable<string>): string[];
-export declare function writePagesClientAssetsModuleIfMissing(outputDir: string, moduleSource: string): void;
-//#endregion
+export declare function writePagesClientAssetsModuleIfMissing(outputDir: string, moduleSource: string): void;

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

@@ -1,9 +1,9 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import "../utils/asset-prefix.js";
 import { getSharedChunkFiles } from "../server/pages-asset-tags.js";
+import "../utils/asset-prefix.js";
 import "../utils/client-entry-manifest.js";
 import fs from "node:fs";
-//#region src/build/pages-client-assets-module.ts
+// src/build/pages-client-assets-module.ts
 const PAGES_CLIENT_ASSETS_MODULE = "vinext-client-assets.js";
 function buildPagesClientAssetsModule(assets) {
 	const prepared = assets.ssrManifest && !assets.sharedChunks ? {
@@ -36,5 +36,4 @@ function writePagesClientAssetsModuleIfMissing(outputDir, moduleSource) {
 	fs.mkdirSync(outputDir, { recursive: true });
 	fs.writeFileSync(outputPath, moduleSource);
 }
-//#endregion
 export { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, collectClientBuildFiles, writePagesClientAssetsModuleIfMissing };

package/dist/build/precompress.d.ts

@@ -1,4 +1,3 @@
-//#region src/build/precompress.d.ts
 type PrecompressResult = {
   filesCompressed: number;
   totalOriginalBytes: number;
@@ -28,5 +27,4 @@ export declare function precompressAssets(clientDir: string, options?: {
   assetsDir?: string;
   onProgress?: (completed: number, total: number, file: string) => void;
 }): Promise<PrecompressResult>;
-//#endregion
 export {};

package/dist/build/precompress.js

@@ -6,7 +6,7 @@ import os from "node:os";
 import { randomUUID } from "node:crypto";
 import zlib from "node:zlib";
 import { promisify } from "node:util";
-//#region src/build/precompress.ts
+// src/build/precompress.ts
 /**
 * Build-time precompression for hashed static assets.
 *
@@ -140,5 +140,4 @@ async function removeCompressedVariants(fullPath) {
 async function removeFileIfPresent(filePath) {
 	await fsp.rm(filePath, { force: true });
 }
-//#endregion
 export { precompressAssets };

package/dist/build/prerender-cloudflare-loader.d.ts

@@ -1,4 +1,2 @@
-//#region src/build/prerender-cloudflare-loader.d.ts
 /** Allow Node's prerender runner to import the Worker bundle without granting Worker bindings. */
-export declare function registerPrerenderCloudflareLoader(): void;
-//#endregion
+export declare function registerPrerenderCloudflareLoader(): void;

package/dist/build/prerender-cloudflare-loader.js

@@ -1,5 +1,5 @@
 import { register } from "node:module";
-//#region src/build/prerender-cloudflare-loader.ts
+// src/build/prerender-cloudflare-loader.ts
 let registered = false;
 /** Allow Node's prerender runner to import the Worker bundle without granting Worker bindings. */
 function registerPrerenderCloudflareLoader() {
@@ -45,5 +45,4 @@ function registerPrerenderCloudflareLoader() {
       }
     `)}`);
 }
-//#endregion
 export { registerPrerenderCloudflareLoader };

package/dist/build/prerender-paths.d.ts

@@ -1,8 +1,7 @@
-import { CdnCacheAdapterCapabilities } from "../cache/cache-adapters-virtual.js";
-import { VinextRouteRootConfig } from "../config/prerender.js";
 import { ResolvedNextConfig } from "../config/next-config.js";
+import { VinextRouteRootConfig } from "../config/prerender.js";
+import { CdnCacheAdapterCapabilities } from "../cache/cache-adapters-virtual.js";
 import { MatcherConfig } from "../server/middleware-matcher.js";
-//#region src/build/prerender-paths.d.ts
 export type PrerenderRoutePattern = {
   kind: "app-page" | "app-route" | "pages-page";
   pattern: string;
@@ -104,5 +103,4 @@ export declare function matchesMiddlewareWarmPath(pathname: string, matcher: Mat
 }): boolean;
 export declare function discoverPrerenderPathManifest(options: PrerenderPathDiscoveryOptions): Promise<PrerenderPathManifest | null>;
 export declare function emitPrerenderPathManifest(options: PrerenderPathDiscoveryOptions): Promise<PrerenderPathManifest | null>;
-//#endregion
 export {};

package/dist/build/prerender-paths.js

@@ -1,31 +1,32 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { findDir } from "../utils/project.js";
-import { BLOCKED_PAGES, PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
-import { VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
-import { isExternalUrl } from "../utils/external-url.js";
-import "../server/headers.js";
-import { matchHeaders, matchesRewriteSource } from "../config/config-matchers.js";
 import { loadNextConfig, resolveNextConfig } from "../config/next-config.js";
 import { appRouteHasMainTreeLoadingBoundary, appRouter, matchAppRoute } from "../routing/app-router.js";
+import { VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { apiRouter, matchRoute, pagesRouter } from "../routing/pages-router.js";
-import { matchesMiddlewarePathname } from "../server/middleware-matcher.js";
-import { extractLocaleFromUrl, normalizeDefaultLocalePathname, shouldRestoreLocaleRootTrailingSlash } from "../server/pages-i18n.js";
-import { normalizeNextDataPagePathname, shouldAddTrailingSlashToPagesDataPath } from "../server/pages-data-route.js";
-import { classifyAppRoute, classifyAppRouteHandler, classifyPagesRoute, extractExportConstString, extractMiddlewareMatcherConfig, getAppRouteRenderEntryPath } from "./report.js";
 import { normalizeStaticPathname, normalizeStaticPathsEntry } from "../routing/route-pattern.js";
-import { buildPagesDataHref } from "../shims/internal/pages-data-url.js";
-import { normalizePathTrailingSlash } from "../shims/url-utils.js";
-import { resolveAppPageDynamicConfig } from "../server/app-segment-config.js";
+import { classifyAppRoute, classifyAppRouteHandler, classifyPagesRoute, extractExportConstString, extractMiddlewareMatcherConfig, getAppRouteRenderEntryPath } from "./report.js";
 import { classifyAppPageRouteStaticEligibility } from "./app-page-static-eligibility.js";
-import { pagesRouteHasPriorityOverAppRoute } from "../server/hybrid-route-priority.js";
+import { buildUrlFromParams, layoutOnlyParamSets, localizePagesPath, resolveParentParams, routeStaticParamSets, validateDiscoveredParams } from "./prerender.js";
 import { readPrerenderSecret } from "./server-manifest.js";
-import { loadMdxEsmReader } from "../utils/mdx-scan.js";
+import { tryRealpathSync } from "./ssr-manifest.js";
 import { startProdServer } from "../server/prod-server.js";
+import { loadMdxEsmReader } from "../utils/mdx-scan.js";
+import { findDir } from "../utils/project.js";
+import { BLOCKED_PAGES, PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
+import "../server/headers.js";
 import { enterPrerenderPhase } from "./prerender-phase.js";
-import { buildUrlFromParams, layoutOnlyParamSets, localizePagesPath, resolveParentParams, routeStaticParamSets, validateDiscoveredParams } from "./prerender.js";
+import { matchHeaders, matchesRewriteSource } from "../config/config-matchers.js";
+import { pagesRouteHasPriorityOverAppRoute } from "../server/hybrid-route-priority.js";
+import { resolveAppPageDynamicConfig } from "../server/app-segment-config.js";
+import { normalizeNextDataPagePathname, shouldAddTrailingSlashToPagesDataPath } from "../server/pages-data-route.js";
+import { extractLocaleFromUrl, normalizeDefaultLocalePathname, shouldRestoreLocaleRootTrailingSlash } from "../server/pages-i18n.js";
+import { normalizePathTrailingSlash } from "../shims/url-utils.js";
+import { buildPagesDataHref } from "../shims/internal/pages-data-url.js";
 import { resolveBuiltPagesEntryPath, resolveBuiltRscEntryPath } from "./server-entry.js";
+import { matchesMiddlewarePathname } from "../server/middleware-matcher.js";
 import fs from "node:fs";
-//#region src/build/prerender-paths.ts
+// src/build/prerender-paths.ts
 const PRERENDER_PATH_DISCOVERY_ENV = "__VINEXT_PRERENDER_PATH_DISCOVERY";
 const PRERENDER_PATHS_MANIFEST = "vinext-prerender-paths.json";
 const PATH_DISCOVERY_FETCH_TIMEOUT_MS = 3e4;
@@ -674,10 +675,13 @@ function configuredRulesAffectWarmPath(pathname, rules, config) {
 function configuredRewritesCanReplaceWarmPath(pathname, rewrites, hasNonDynamicRoute, config, include) {
 	return configuredRulesAffectWarmPath(pathname, [...rewrites.beforeFiles.filter(include), ...hasNonDynamicRoute ? [] : rewrites.afterFiles.filter(include)], config);
 }
+function canonicalDir(dir) {
+	return toSlash(tryRealpathSync(dir) ?? dir);
+}
 function findMiddlewareConventionFile(root, appDir, pagesDir, pageExtensions) {
 	const routeDir = appDir ?? pagesDir;
 	const routeRoot = routeDir ? path.dirname(routeDir) : root;
-	const conventionDir = routeRoot === path.join(root, "src") ? routeRoot : root;
+	const conventionDir = canonicalDir(routeRoot) === canonicalDir(path.join(root, "src")) ? routeRoot : root;
 	for (const name of ["proxy", "middleware"]) for (const extension of pageExtensions) {
 		const filePath = path.join(conventionDir, `${name}.${extension}`);
 		if (fs.existsSync(filePath)) return filePath;
@@ -953,5 +957,4 @@ async function emitPrerenderPathManifest(options) {
 	fs.writeFileSync(path.join(manifestDir, PRERENDER_PATHS_MANIFEST), JSON.stringify(manifest, null, 2) + "\n", "utf-8");
 	return manifest;
 }
-//#endregion
 export { DEFAULT_REMOTE_PATH_DISCOVERY_PHASE_TIMEOUT_MS, DEFAULT_REMOTE_PATH_DISCOVERY_RETRY_DELAY_MS, PRERENDER_PATHS_MANIFEST, PRERENDER_PATH_DISCOVERY_ENV, discoverPrerenderPathManifest, emitPrerenderPathManifest, matchesMiddlewareWarmPath };

package/dist/build/prerender-phase.d.ts

@@ -1,4 +1,3 @@
-//#region src/build/prerender-phase.d.ts
 type PrerenderPhaseEnv = {
   NEXT_PHASE?: string;
   NODE_ENV?: string;
@@ -11,5 +10,4 @@ type PrerenderPhaseEnv = {
  * overwriting the caller's prior phase when they finish.
  */
 export declare function enterPrerenderPhase(env?: PrerenderPhaseEnv): () => void;
-//#endregion
 export {};

package/dist/build/prerender-phase.js

@@ -1,5 +1,5 @@
 import { PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
-//#region src/build/prerender-phase.ts
+// src/build/prerender-phase.ts
 const activePrerenderPhases = /* @__PURE__ */ new WeakMap();
 /**
 * Enter the same process environment phase that Next.js exposes while its
@@ -33,5 +33,4 @@ function enterPrerenderPhase(env = process.env) {
 		else env.NEXT_PHASE = state.previousNextPhase;
 	};
 }
-//#endregion
 export { enterPrerenderPhase };

package/dist/build/prerender-server-entry.js

@@ -1,7 +1,7 @@
+import { startProdServer } from "../server/prod-server.js";
 import { NoOpCacheHandler, setCacheHandler } from "../shims/cache-handler.js";
 import { registerPrerenderCloudflareLoader } from "./prerender-cloudflare-loader.js";
-import { startProdServer } from "../server/prod-server.js";
-//#region src/build/prerender-server-entry.ts
+// src/build/prerender-server-entry.ts
 /**
 * Child-process entry for a parallel prerender render server.
 *
@@ -53,5 +53,4 @@ main().catch((err) => {
 	}
 	process.exit(1);
 });
-//#endregion
 export {};

package/dist/build/prerender-server-pool.d.ts

@@ -1,4 +1,3 @@
-//#region src/build/prerender-server-pool.d.ts
 /**
  * Whether the forkable worker entry exists as a runnable `.js` sibling. False
  * when vinext runs from source (e.g. the test suite transpiles `.ts` on the
@@ -45,5 +44,4 @@ export declare function startPrerenderServerPool(outDir: string, size: number, o
   entry?: string;
   rscEntryPath?: string;
   serverDir?: string;
-}): Promise<PrerenderServerPool>;
-//#endregion
+}): Promise<PrerenderServerPool>;

package/dist/build/prerender-server-pool.js

@@ -4,7 +4,7 @@ import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import os from "node:os";
 import { fork } from "node:child_process";
-//#region src/build/prerender-server-pool.ts
+// src/build/prerender-server-pool.ts
 /**
 * Parallel prerender server pool.
 *
@@ -195,5 +195,4 @@ async function closeChild(child) {
 	if (!child.killed) child.kill("SIGKILL");
 	await exited;
 }
-//#endregion
 export { prerenderPoolAvailable, resolvePrerenderPoolSize, startPrerenderServerPool };

package/dist/build/prerender.d.ts

@@ -1,10 +1,9 @@
+import { Route } from "../routing/pages-router.js";
 import { AppRoute } from "../routing/app-route-graph.js";
 import { ResolvedNextConfig } from "../config/next-config.js";
-import { Route } from "../routing/pages-router.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
 export type PrerenderResult = {
   /** One entry per route (including skipped/error routes). */
   routes: PrerenderRouteResult[];
@@ -285,5 +284,4 @@ export declare function writePrerenderIndex(routes: PrerenderRouteResult[], outD
   buildId?: string;
   trailingSlash?: boolean;
 }): void;
-//#endregion
 export { readPrerenderSecret };

package/dist/build/prerender.js

@@ -1,32 +1,32 @@
 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 { appRouteLayoutStaticParamsGroups } from "../routing/app-router.js";
+import { buildPregeneratedConcretePathTable } from "../server/prerender-manifest.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 { NEXT_CACHE_TAGS_HEADER, VINEXT_METADATA_ROUTE_CACHE_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_PRERENDER_METADATA_ROUTES_PATH, VINEXT_PRERENDER_RENDER_ERROR_HEADER, VINEXT_PRERENDER_SPECIAL_ERROR_HEADER } from "../server/headers.js";
-import { appRouteLayoutStaticParamsGroups } from "../routing/app-router.js";
-import { extractLocaleFromUrl } from "../server/pages-i18n.js";
 import { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.js";
-import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
+import { concatUint8Arrays, decodeRscEmbeddedChunk } from "../server/app-rsc-embedded-chunks.js";
 import { NoOpCacheHandler, getCacheHandler, setCacheHandler } from "../shims/cache-handler.js";
-import { headersContextFromRequest, runWithHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife } from "../shims/cache-request-state.js";
-import { normalizeStaticPathsEntry } from "../routing/route-pattern.js";
-import { readPrerenderSecret } from "./server-manifest.js";
-import { buildPregeneratedConcretePathTable } from "../server/prerender-manifest.js";
-import { concatUint8Arrays, decodeRscEmbeddedChunk } from "../server/app-rsc-embedded-chunks.js";
-import { createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
+import { headersContextFromRequest, runWithHeadersContext } from "../shims/headers.js";
+import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-matcher.js";
+import { normalizeStaticPathname, normalizeStaticPathsEntry } from "../routing/route-pattern.js";
+import { extractLocaleFromUrl } from "../server/pages-i18n.js";
+import { isUnknownRecord } from "../utils/record.js";
 import { navigationRuntimeRscBootstrapExpression } from "../server/app-ssr-stream.js";
+import { createRscRequestUrl } from "../server/app-rsc-cache-busting.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, VINEXT_PRERENDER_SPECIAL_ERROR_HEADER } from "../server/headers.js";
 import { encodePrerenderRouteParams, serializePrerenderRouteParamsHeader } from "../server/prerender-route-params.js";
 import { startProdServer } from "../server/prod-server.js";
 import { prerenderPoolAvailable, resolvePrerenderPoolSize, startPrerenderServerPool } from "./prerender-server-pool.js";
-import { getAppRouteOutputPath, getOutputPath, getRscOutputPath } from "../utils/prerender-output-paths.js";
+import { readPrerenderSecret } from "./server-manifest.js";
+import { PagePathMismatchError, assertNormalizedPagePath, getAppRouteOutputPath, getOutputPath, getRscOutputPath } from "../utils/prerender-output-paths.js";
+import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
 import { createAppPprFallbackShells, markAppPprDynamicFallbackShellHtml } from "../server/app-ppr-fallback-shell.js";
 import { enterPrerenderPhase } from "./prerender-phase.js";
 import { buildAppRouteCacheValue } from "../server/app-route-handler-response.js";
 import fs from "node:fs";
 import os from "node:os";
-//#region src/build/prerender.ts
+// src/build/prerender.ts
 /**
 * Prerendering phase for vite build.
 *
@@ -496,6 +496,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 				}
 				const paths = pathsResult?.paths ?? [];
 				let entryError = null;
+				let entryFatal = false;
 				const seenPaths = /* @__PURE__ */ new Set();
 				for (const item of paths) {
 					let locale = config.i18n?.defaultLocale;
@@ -505,18 +506,20 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 						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 {
+						if (typeof pathEntry === "string") assertNormalizedPagePath(normalizeStaticPathname(pathEntry).split("/").map((segment) => {
+							try {
+								return decodeURIComponent(segment).replaceAll("/", "%2F");
+							} catch {
+								return segment;
+							}
+						}).join("/"));
+						const normalized = normalizeStaticPathsEntry(pathEntry, route.pattern);
+						if ("error" in normalized) throw new Error(normalized.error);
+						if (locale !== void 0 && !config.i18n?.locales.includes(locale)) throw new Error(`Invalid locale returned from getStaticPaths for ${route.pattern}: ${locale}`);
+						const { params } = normalized;
 						const urlPath = localizePagesPath(buildUrlFromParams(route.pattern, params), locale, config.i18n);
+						assertNormalizedPagePath(urlPath);
 						if (!seenPaths.has(urlPath)) {
 							seenPaths.add(urlPath);
 							pagesToRender.push({
@@ -530,6 +533,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 						}
 					} catch (e) {
 						entryError = e.message;
+						entryFatal = e instanceof PagePathMismatchError;
 						break;
 					}
 				}
@@ -537,7 +541,8 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					results.push({
 						route: route.pattern,
 						status: "error",
-						error: entryError
+						error: entryError,
+						...entryFatal ? { fatal: true } : {}
 					});
 					continue;
 				}
@@ -587,6 +592,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					307,
 					308
 				].includes(response.status);
+				const renderedOk = response.ok || route.pattern === "/500" && response.status === 500 && response.headers.get("x-vinext-prerender-render-error") !== "1";
 				let redirectProps;
 				if (redirect) {
 					const props = await response.json();
@@ -602,7 +608,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					fs.writeFileSync(htmlFullPath, html, "utf-8");
 					outputFiles.push(htmlOutputPath);
 				} else {
-					if (!response.ok && !notFound) throw new Error(`renderPage returned ${response.status} for ${urlPath}`);
+					if (!renderedOk && !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");
@@ -618,8 +624,8 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					router: "pages",
 					...urlPath !== route.pattern ? { path: urlPath } : {},
 					...locale ? { locale } : {},
-					...response.ok ? { responseStatus: response.status } : {},
-					...response.ok && contentType ? { headers: { "content-type": contentType } } : {},
+					...renderedOk ? { responseStatus: response.status } : {},
+					...renderedOk && contentType ? { headers: { "content-type": contentType } } : {},
 					...notFound ? {
 						notFound: true,
 						responseStatus: 404
@@ -1332,5 +1338,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, localizePagesPath, prerenderApp, prerenderPages, readPrerenderSecret, resolveParentParams, routeStaticParamSets, validateDiscoveredParams, writePrerenderIndex };

package/dist/build/preview-credentials.d.ts

@@ -1,4 +1,3 @@
-//#region src/build/preview-credentials.d.ts
 export type PreviewBuildCredentials = {
   id: string;
   signingKey: string;
@@ -6,5 +5,4 @@ export type PreviewBuildCredentials = {
 };
 export declare function createPreviewBuildCredentials(): PreviewBuildCredentials;
 export declare function getPreviewBuildCredentials(): PreviewBuildCredentials | undefined;
-export declare function runWithPreviewBuildCredentials<T>(callback: () => T, credentials?: PreviewBuildCredentials): T;
-//#endregion
+export declare function runWithPreviewBuildCredentials<T>(callback: () => T, credentials?: PreviewBuildCredentials): T;

package/dist/build/preview-credentials.js

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import { randomBytes } from "node:crypto";
-//#region src/build/preview-credentials.ts
+// src/build/preview-credentials.ts
 const previewBuildCredentialsStorage = new AsyncLocalStorage();
 function createPreviewBuildCredentials() {
 	return {
@@ -15,5 +15,4 @@ function getPreviewBuildCredentials() {
 function runWithPreviewBuildCredentials(callback, credentials = createPreviewBuildCredentials()) {
 	return previewBuildCredentialsStorage.run(credentials, callback);
 }
-//#endregion
 export { createPreviewBuildCredentials, getPreviewBuildCredentials, runWithPreviewBuildCredentials };

package/dist/build/public-dir-conflict.d.ts

@@ -1,4 +1,3 @@
-//#region src/build/public-dir-conflict.d.ts
 export type PublicDirConflictOptions = {
   root: string;
   publicDir: string | null;
@@ -9,5 +8,4 @@ export type PublicNextRequestConflictOptions = Pick<PublicDirConflictOptions, "r
   requestUrl: string;
 };
 export declare function assertNoPublicNextRequestConflict({ root, publicDir, basePath, requestUrl }: PublicNextRequestConflictOptions): void;
-export declare function assertNoPublicDirAssetConflict({ root, publicDir, assetsDir }: PublicDirConflictOptions): void;
-//#endregion
+export declare function assertNoPublicDirAssetConflict({ root, publicDir, assetsDir }: PublicDirConflictOptions): void;

package/dist/build/public-dir-conflict.js

@@ -1,6 +1,6 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { existsSync } from "node:fs";
-//#region src/build/public-dir-conflict.ts
+// src/build/public-dir-conflict.ts
 const PUBLIC_NEXT_CONFLICT_ERROR = "You can not have a '_next' folder inside of your public folder. This conflicts with the internal '/_next' route. https://nextjs.org/docs/messages/public-next-folder-conflict";
 function assertNoPublicNextDir(root, publicDir) {
 	if (!publicDir) return;
@@ -22,5 +22,4 @@ function assertNoPublicDirAssetConflict({ root, publicDir, assetsDir }) {
 	const relativeAssetsDir = path.relative(resolvedPublicDir, publicAssetsDir);
 	if (relativeAssetsDir !== "" && !relativeAssetsDir.startsWith("../") && !path.isAbsolute(relativeAssetsDir) && existsSync(publicAssetsDir)) throw new Error(`[vinext] The public directory contains a path reserved for build assets: ${relativeAssetsDir}`);
 }
-//#endregion
 export { assertNoPublicDirAssetConflict, assertNoPublicNextRequestConflict };