vinext 0.1.7 → 0.2.0

package/dist/cli.js

@@ -2,14 +2,21 @@
 import { detectPackageManager, ensureViteConfigCompatibility, hasAppDir, hasViteConfig } from "./utils/project.js";
 import { formatReport, runCheck } from "./check.js";
 import { parseArgs } from "./cli-args.js";
+import { createDevServerConfigPlugin, normalizeDevServerHostname } from "./cli-dev-config.js";
+import { normalizePathSeparators } from "./utils/path.js";
 import { PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { createRscCompatibilityId, loadNextConfig, resolveNextConfig } from "./config/next-config.js";
 import { generateRouteTypes } from "./typegen.js";
-import { getReactUpgradeDeps, init } from "./init.js";
+import { clearPagesClientAssetsBuildMetadata } from "./build/pages-client-assets-module.js";
+import { findVinextPrerenderConfigInPlugins, formatVinextPrerenderLabel, resolveVinextPrerenderDecision } from "./config/prerender.js";
+import vinext from "./index.js";
 import { runPrerender } from "./build/run-prerender.js";
 import { loadDotenv } from "./config/dotenv.js";
-import { deploy, parseDeployArgs } from "./deploy.js";
-import vinext from "./index.js";
+import { deploy, parseDeployArgs } from "./packages/cloudflare/src/deploy.js";
+import { printDeployHelp } from "./packages/cloudflare/src/deploy-help.js";
+import { getReactUpgradeDeps } from "./utils/react-version.js";
+import { init } from "./init.js";
+import { INIT_PLATFORMS, resolveInitPlatform, resolveInitPrerender } from "./init-platform.js";
 import { resolveVinextPackageRoot } from "./utils/vinext-root.js";
 import { emitStandaloneOutput } from "./build/standalone.js";
 import { cleanBuildOutput } from "./build/clean-output.js";
@@ -27,7 +34,7 @@ import { execFileSync } from "node:child_process";
 *   vinext dev     Start development server (Vite)
 *   vinext build   Build for production
 *   vinext start   Start production server
-*   vinext deploy  Deploy to Cloudflare Workers
+*   vinext deploy  Deprecated Cloudflare deploy shim
 *   vinext typegen Generate App Router route helper types
 *   vinext lint    Run linter (delegates to eslint/oxlint)
 *
@@ -120,13 +127,17 @@ function createBuildLogger(vite) {
 function hasPagesDir() {
 	return fs.existsSync(path.join(process.cwd(), "pages")) || fs.existsSync(path.join(process.cwd(), "src", "pages"));
 }
-async function loadBuildEmptyOutDir(vite, root) {
-	if (!hasViteConfig(root)) return void 0;
-	const emptyOutDir = (await vite.loadConfigFromFile({
+async function loadBuildViteConfigMetadata(vite, root) {
+	if (!hasViteConfig(root)) return { prerenderConfig: null };
+	const loaded = await vite.loadConfigFromFile({
 		command: "build",
 		mode: "production"
-	}, void 0, root))?.config.build?.emptyOutDir;
-	return typeof emptyOutDir === "boolean" ? emptyOutDir : void 0;
+	}, void 0, root);
+	const emptyOutDir = loaded?.config.build?.emptyOutDir;
+	return {
+		emptyOutDir: typeof emptyOutDir === "boolean" ? emptyOutDir : void 0,
+		prerenderConfig: findVinextPrerenderConfigInPlugins(loaded?.config.plugins)
+	};
 }
 /**
 * Build the Vite config automatically. If a vite.config.ts exists in the
@@ -179,20 +190,20 @@ async function dev() {
 	});
 	applyViteConfigCompatibility(process.cwd());
 	const vite = await loadVite();
-	const port = parsed.port ?? 3e3;
-	const host = parsed.hostname ?? "localhost";
+	const initialPort = parsed.port ?? 3e3;
+	const initialHost = parsed.hostname ?? "localhost";
 	let lockfile;
 	const startedAt = Date.now();
 	if (process.env.VINEXT_NO_DEV_LOCK !== "1") {
 		const root = process.cwd();
-		const initialDisplayHost = host === "0.0.0.0" ? "localhost" : host;
+		const initialDisplayHost = initialHost === "0.0.0.0" ? "localhost" : initialHost;
 		const acquired = tryAcquireLockfile({
 			root,
 			info: {
 				pid: process.pid,
-				port,
-				hostname: host,
-				appUrl: `http://${initialDisplayHost}:${port}`,
+				port: initialPort,
+				hostname: initialHost,
+				appUrl: `http://${initialDisplayHost}:${initialPort}`,
 				startedAt,
 				cwd: root
 			}
@@ -208,13 +219,21 @@ async function dev() {
 		lockfile = acquired.lockfile;
 	}
 	console.log(`\n  vinext dev  (Vite ${getViteVersion()})\n`);
-	const config = buildViteConfig({ server: {
-		port,
-		host
-	} });
+	const config = buildViteConfig();
+	(config.plugins ??= []).push(createDevServerConfigPlugin(parsed));
 	let server;
 	try {
 		server = await vite.createServer(config);
+		const port = server.config.server.port ?? 3e3;
+		const host = normalizeDevServerHostname(server.config.server.host);
+		lockfile?.update({
+			pid: process.pid,
+			port,
+			hostname: host,
+			appUrl: `http://${host === "0.0.0.0" ? "localhost" : host}:${port}`,
+			startedAt,
+			cwd: process.cwd()
+		});
 		await server.listen();
 	} catch (err) {
 		lockfile?.release();
@@ -222,8 +241,10 @@ async function dev() {
 	}
 	server.printUrls();
 	if (lockfile) {
+		const configuredPort = server.config.server.port ?? 3e3;
+		const configuredHost = normalizeDevServerHostname(server.config.server.host);
 		const resolved = server.resolvedUrls?.local[0];
-		let actualPort = port;
+		let actualPort = configuredPort;
 		let appUrl;
 		if (resolved) {
 			appUrl = resolved.replace(/\/$/, "");
@@ -233,13 +254,13 @@ async function dev() {
 			} catch {}
 		} else {
 			const address = server.httpServer?.address();
-			actualPort = typeof address === "object" && address ? address.port : port;
-			appUrl = `http://${host === "0.0.0.0" ? "localhost" : host}:${actualPort}`;
+			actualPort = typeof address === "object" && address ? address.port : configuredPort;
+			appUrl = `http://${configuredHost === "0.0.0.0" ? "localhost" : configuredHost}:${actualPort}`;
 		}
 		lockfile.update({
 			pid: process.pid,
 			port: actualPort,
-			hostname: host,
+			hostname: configuredHost,
 			appUrl,
 			startedAt,
 			cwd: process.cwd()
@@ -260,7 +281,7 @@ async function buildApp() {
 	const withBuildBundlerOptions = (bundlerOptions) => viteMajorVersion >= 8 ? { rolldownOptions: bundlerOptions } : { rollupOptions: bundlerOptions };
 	console.log(`\n  vinext build  (Vite ${getViteVersion()})\n`);
 	const root = process.cwd();
-	const isApp = hasAppDir(process.cwd());
+	const isApp = hasAppDir(normalizePathSeparators(root));
 	const resolvedNextConfig = await resolveNextConfig(await loadNextConfig(root, PHASE_PRODUCTION_BUILD), root);
 	process.env.__VINEXT_SHARED_BUILD_ID = resolvedNextConfig.buildId;
 	process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID = createRscCompatibilityId(resolvedNextConfig);
@@ -287,15 +308,19 @@ async function buildApp() {
 			});
 		}
 	}
+	const buildConfigMetadata = await loadBuildViteConfigMetadata(vite, root);
 	cleanBuildOutput({
 		root,
 		outDir: distDir,
-		emptyOutDir: await loadBuildEmptyOutDir(vite, root)
+		emptyOutDir: buildConfigMetadata.emptyOutDir
 	});
-	const config = buildViteConfig({}, logger);
-	await (await vite.createBuilder(config)).buildApp();
-	if (isApp) {
-		if (hasPagesDir()) {
+	const isHybrid = isApp && hasPagesDir();
+	const pagesClientAssetsBuildSession = isHybrid ? randomBytes(16).toString("hex") : null;
+	if (pagesClientAssetsBuildSession) process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION = pagesClientAssetsBuildSession;
+	try {
+		const config = buildViteConfig({}, logger);
+		await (await vite.createBuilder(config)).buildApp();
+		if (isHybrid) {
 			console.log("  Building Pages Router server (hybrid)...");
 			const root = process.cwd();
 			let userTransformPlugins = [];
@@ -326,6 +351,11 @@ async function buildApp() {
 				}
 			});
 		}
+	} finally {
+		if (pagesClientAssetsBuildSession) {
+			clearPagesClientAssetsBuildMetadata(pagesClientAssetsBuildSession);
+			if (process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION === pagesClientAssetsBuildSession) delete process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
+		}
 	}
 	if (outputMode === "standalone") {
 		const standalone = emitStandaloneOutput({
@@ -337,23 +367,27 @@ async function buildApp() {
 		return process.exit(0);
 	}
 	let prerenderResult;
-	if (parsed.prerenderAll || resolvedNextConfig.output === "export") {
+	const prerenderDecision = resolveVinextPrerenderDecision({
+		prerenderAllFlag: parsed.prerenderAll,
+		vinextPrerenderConfig: buildConfigMetadata.prerenderConfig,
+		nextOutput: resolvedNextConfig.output
+	});
+	if (prerenderDecision) {
 		if (resolvedNextConfig.enablePrerenderSourceMaps) {
 			process.setSourceMapsEnabled(true);
 			Error.stackTraceLimit = Math.max(Error.stackTraceLimit, 50);
 		}
-		const label = parsed.prerenderAll ? "Pre-rendering all routes..." : "Pre-rendering all routes (output: 'export')...";
 		process.stdout.write("\x1B[0m");
-		console.log(`  ${label}`);
+		console.log(`  ${formatVinextPrerenderLabel(prerenderDecision)}`);
 		prerenderResult = await runPrerender({
-			root: process.cwd(),
+			root: normalizePathSeparators(process.cwd()),
 			concurrency: parsed.prerenderConcurrency
 		});
 	}
 	process.stdout.write("\x1B[0m");
 	const { printBuildReport } = await import("./build/report.js");
 	await printBuildReport({
-		root: process.cwd(),
+		root: normalizePathSeparators(process.cwd()),
 		pageExtensions: resolvedNextConfig.pageExtensions,
 		prerenderResult: prerenderResult ?? void 0
 	});
@@ -420,7 +454,12 @@ async function lint() {
 }
 async function deployCommand() {
 	const parsed = parseDeployArgs(rawArgs);
-	if (parsed.help) return printHelp("deploy");
+	if (parsed.help) {
+		printDeployDeprecationWarning();
+		printDeployHelp();
+		return;
+	}
+	printDeployDeprecationWarning();
 	await loadVite();
 	console.log(`\n  vinext deploy  (Vite ${getViteVersion()})\n`);
 	await deploy({
@@ -438,12 +477,14 @@ async function deployCommand() {
 		tprWindow: parsed.tprWindow
 	});
 }
+function printDeployDeprecationWarning() {
+	console.log("  ⚠️  Warning: `vinext deploy` has moved to the `@vinext/cloudflare` package.\n  Please switch to `npx @vinext/cloudflare deploy` or `vp exec vinext-cloudflare deploy`; this compatibility command will be removed in a future release.\n");
+}
 async function check() {
 	if (parseArgs(rawArgs).help) return printHelp("check");
-	const root = process.cwd();
 	console.log(`\n  vinext check\n`);
 	console.log("  Scanning project...\n");
-	const result = runCheck(root);
+	const result = runCheck(normalizePathSeparators(process.cwd()));
 	console.log(formatReport(result));
 }
 async function typegen() {
@@ -467,11 +508,17 @@ async function initCommand() {
 	const port = parsed.port ?? 3001;
 	const skipCheck = rawArgs.includes("--skip-check");
 	const force = rawArgs.includes("--force");
+	const platform = await resolveInitPlatform(rawArgs);
+	const platformOptions = await INIT_PLATFORMS[platform].options(rawArgs);
+	const prerender = await resolveInitPrerender(rawArgs);
 	await init({
 		root: process.cwd(),
 		port,
 		skipCheck,
-		force
+		force,
+		platform,
+		prerender,
+		cloudflare: platform === "cloudflare" ? platformOptions : void 0
 	});
 }
 function printHelp(cmd) {
@@ -501,8 +548,8 @@ function printHelp(cmd) {
 
   Options:
     --verbose            Show full Vite/Rollup build output (suppressed by default)
-    --prerender-all      Pre-render discovered routes after building (future releases
-                         will serve these files in vinext start)
+    --prerender-all      Pre-render discovered routes after building. Equivalent
+                         to vinext({ prerender: true }) and takes priority.
     --prerender-concurrency <count>
                          Maximum number of routes to pre-render in parallel
     --precompress        Precompress static assets at build time (.br, .gz, .zst)
@@ -528,52 +575,8 @@ function printHelp(cmd) {
 		return;
 	}
 	if (cmd === "deploy") {
-		console.log(`
-  vinext deploy - Deploy to Cloudflare Workers
-
-  Usage: vinext deploy [options]
-
-  One-command deployment to Cloudflare Workers. Automatically:
-    - Detects App Router or Pages Router
-    - Generates wrangler.jsonc, worker/index.ts, vite.config.ts if missing
-    - Installs @cloudflare/vite-plugin and wrangler if needed
-    - Builds the project with Vite
-    - Deploys via wrangler
-
-  Options:
-    --preview                Deploy to preview environment (same as --env preview)
-    --env <name>             Deploy using wrangler env.<name>
-    --name <name>            Custom Worker name (default: from package.json)
-    --skip-build             Skip the build step (use existing dist/)
-    --dry-run                Generate config files without building or deploying
-    --prerender-all          Pre-render discovered routes after building (future
-                             releases will auto-populate the remote cache)
-    --prerender-concurrency <count>
-                             Maximum number of routes to pre-render in parallel
-    -h, --help               Show this help
-
-  Experimental:
-    --experimental-tpr               Enable Traffic-aware Pre-Rendering
-    --tpr-coverage <pct>             Traffic coverage target, 0–100 (default: 90)
-    --tpr-limit <count>              Hard cap on pages to pre-render (default: 1000)
-    --tpr-window <hours>             Analytics lookback window in hours (default: 24)
-
-  TPR (Traffic-aware Pre-Rendering) uses Cloudflare zone analytics to determine
-  which pages get the most traffic and pre-renders them into KV cache during
-  deploy. This feature is experimental and must be explicitly enabled. Requires
-  a custom domain (zone analytics are unavailable on *.workers.dev) and the
-  CLOUDFLARE_API_TOKEN environment variable with Zone.Analytics read permission.
-
-  Examples:
-    vinext deploy                              Build and deploy to production
-    vinext deploy --preview                    Deploy to a preview URL
-    vinext deploy --env staging                Deploy using wrangler env.staging
-    vinext deploy --dry-run                    See what files would be generated
-    vinext deploy --name my-app                Deploy with a custom Worker name
-    vinext deploy --experimental-tpr           Enable TPR during deploy
-    vinext deploy --experimental-tpr --tpr-coverage 95   Cover 95% of traffic
-    vinext deploy --experimental-tpr --tpr-limit 500     Cap at 500 pages
-`);
+		printDeployDeprecationWarning();
+		printDeployHelp();
 		return;
 	}
 	if (cmd === "check") {
@@ -605,10 +608,23 @@ function printHelp(cmd) {
     -p, --port <port>    Dev server port for the vinext script (default: 3001)
     --skip-check         Skip the compatibility check step
     --force              Overwrite existing vite.config.ts
+    --platform <target>  Deployment target: cloudflare or node
+    --prerender          Configure vinext build to pre-render all static routes
+                         (default: prompt, with No selected by default)
+    --data-cache <type>  Cloudflare data cache: kv or none (default: kv)
+    --image-optimization <type>
+                         Cloudflare image optimization: cloudflare-images or none
     -h, --help           Show this help
 
   Examples:
-    vinext init                   Migrate with defaults
+    vinext init                   Prompt for a deployment platform
+    vinext init --platform=cloudflare  Configure Cloudflare Workers (default)
+    vinext init --platform=cloudflare --data-cache=kv
+                                Configure the default Cloudflare cache handlers
+    vinext init --platform=cloudflare --image-optimization=none
+                                Do not configure Cloudflare Images
+    vinext init --prerender     Add prerender: { routes: "*" } to vite.config.ts
+    vinext init --platform=node   Configure a Node deployment
     vinext init -p 4000           Use port 4000 for dev:vinext
     vinext init --force           Overwrite existing vite.config.ts
     vinext init --skip-check      Skip the compatibility report
@@ -653,7 +669,6 @@ function printHelp(cmd) {
     dev      Start development server
     build    Build for production
     start    Start production server
-    deploy   Deploy to Cloudflare Workers
     typegen  Generate App Router route helper types
     init     Migrate a Next.js project to vinext
     check    Scan Next.js app for compatibility
@@ -664,15 +679,16 @@ function printHelp(cmd) {
     --version      Show version
 
   Examples:
-    vinext dev                  Start dev server on port 3000
-    vinext dev -p 4000          Start dev server on port 4000
-    vinext build                Build for production
-    vinext typegen              Generate route helper types
-    vinext start                Start production server
-    vinext deploy               Deploy to Cloudflare Workers
-    vinext init                 Migrate a Next.js project
-    vinext check                Check compatibility
-    vinext lint                 Run linter
+    vinext dev                         Start dev server on port 3000
+    vinext dev -p 4000                 Start dev server on port 4000
+    vinext build                       Build for production
+    vinext typegen                     Generate route helper types
+    vinext start                       Start production server
+    vinext init                        Migrate a Next.js project
+    vinext check                       Check compatibility
+    vinext lint                        Run linter
+    npx @vinext/cloudflare deploy      Deploy to Cloudflare Workers
+    vp exec vinext-cloudflare deploy   Deploy to Cloudflare Workers with Vite+
 
   vinext is a drop-in replacement for the \`next\` CLI.
   No vite.config.ts needed — just run \`vinext dev\` in your Next.js project.

package/dist/{server → client}/dev-error-overlay-store.d.ts

@@ -1,4 +1,4 @@
-//#region src/server/dev-error-overlay-store.d.ts
+//#region src/client/dev-error-overlay-store.d.ts
 type Source = "server" | "vite" | "uncaught" | "caught" | "window-error" | "unhandledrejection";
 type ReportedError = {
   id: number;

package/dist/{server → client}/dev-error-overlay-store.js

@@ -1,4 +1,4 @@
-//#region src/server/dev-error-overlay-store.ts
+//#region src/client/dev-error-overlay-store.ts
 const MAX_DEV_OVERLAY_ERRORS = 50;
 let snapshot = {
 	errors: [],

package/dist/{server → client}/dev-error-overlay.d.ts

@@ -1,6 +1,6 @@
 import { ReportedError, dismissOverlay } from "./dev-error-overlay-store.js";
 
-//#region src/server/dev-error-overlay.d.ts
+//#region src/client/dev-error-overlay.d.ts
 declare const DEV_ERROR_OVERLAY_HOST_ID = "__vinext_dev_error_overlay_root";
 declare const DEV_ERROR_OVERLAY_MOUNT_ID = "__vinext_dev_error_overlay_mount";
 declare function installDevErrorOverlay(): void;

package/dist/{server → client}/dev-error-overlay.js

@@ -1,11 +1,11 @@
 import { VINEXT_DEV_ERROR_RECOVERY_EVENT } from "../utils/dev-error-recovery-event.js";
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
-import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "./dev-stack-sourcemap-endpoint.js";
+import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcemap-endpoint.js";
 import { dismissOverlay, expandOverlay, getOverlaySnapshot, minimizeOverlay, reportToOverlay, setOverlayIndex, subscribeOverlay, updateOverlayErrorStack } from "./dev-error-overlay-store.js";
 import { Fragment, useEffect, useMemo, useState, useSyncExternalStore } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 import { createRoot } from "react-dom/client";
-//#region src/server/dev-error-overlay.tsx
+//#region src/client/dev-error-overlay.tsx
 const DEV_ERROR_OVERLAY_HOST_ID = "__vinext_dev_error_overlay_root";
 const DEV_ERROR_OVERLAY_MOUNT_ID = "__vinext_dev_error_overlay_mount";
 const VITE_ERROR_HANDLER_DATA_KEY = "__vinext_vite_error_handler__";

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

@@ -9,6 +9,8 @@ type NavigationRuntimeSnapshot = {
 type NavigationRuntimeRscChunk = string | [3, string];
 type NavigationRuntimeRscBootstrap = {
   done?: boolean;
+  dynamicStaleTimeSeconds?: number;
+  initialCacheKind?: "dynamic" | "static";
   nav?: NavigationRuntimeSnapshot;
   params?: Record<string, string | string[]>;
   rsc: NavigationRuntimeRscChunk[];

package/dist/client/navigation-runtime.js

@@ -50,10 +50,12 @@ function isNavigationRuntimeParams(value) {
 function isNavigationRuntimeRscBootstrap(value) {
 	if (!isUnknownRecord(value)) return false;
 	const done = Reflect.get(value, "done");
+	const dynamicStaleTimeSeconds = Reflect.get(value, "dynamicStaleTimeSeconds");
+	const initialCacheKind = Reflect.get(value, "initialCacheKind");
 	const nav = Reflect.get(value, "nav");
 	const params = Reflect.get(value, "params");
 	const rsc = Reflect.get(value, "rsc");
-	return (done === void 0 || typeof done === "boolean") && (nav === void 0 || isNavigationRuntimeSnapshot(nav)) && (params === void 0 || isNavigationRuntimeParams(params)) && Array.isArray(rsc) && rsc.every(isNavigationRuntimeRscChunk);
+	return (done === void 0 || typeof done === "boolean") && (dynamicStaleTimeSeconds === void 0 || typeof dynamicStaleTimeSeconds === "number" && Number.isFinite(dynamicStaleTimeSeconds) && dynamicStaleTimeSeconds >= 0) && (initialCacheKind === void 0 || initialCacheKind === "dynamic" || initialCacheKind === "static") && (nav === void 0 || isNavigationRuntimeSnapshot(nav)) && (params === void 0 || isNavigationRuntimeParams(params)) && Array.isArray(rsc) && rsc.every(isNavigationRuntimeRscChunk);
 }
 function isReadonlyStringArray(value) {
 	return Array.isArray(value) && value.every((entry) => typeof entry === "string");

package/dist/client/window-next.d.ts

@@ -97,7 +97,8 @@ type PagesRouterPublicInstance = {
    * prefetch — App Router targets land here as `{ __appRouter: true }`.
    * See: `packages/next/src/shared/lib/router/router.ts:2525`.
    */
-  components: Record<string, unknown>;
+  components: Record<string, unknown>; /** Persistent Pages Router static-data cache, matching Next.js `Router.sdc`. */
+  sdc: Record<string, Promise<Response>>;
 };
 declare global {
   interface Window {

package/dist/cloudflare/index.d.ts

@@ -1,3 +1,3 @@
-import { KVCacheHandler } from "./src/cache/kv-data-adapter.runtime.js";
-import { TPROptions, TPRResult, runTPR } from "./tpr.js";
+import { KVCacheHandler } from "../packages/cloudflare/src/cache/kv-data-adapter.runtime.js";
+import { TPROptions, TPRResult, runTPR } from "../packages/cloudflare/src/tpr.js";
 export { KVCacheHandler, type TPROptions, type TPRResult, runTPR };

package/dist/cloudflare/index.js

@@ -1,3 +1,3 @@
-import { KVCacheHandler } from "./src/cache/kv-data-adapter.runtime.js";
-import { runTPR } from "./tpr.js";
+import { KVCacheHandler } from "../packages/cloudflare/src/cache/kv-data-adapter.runtime.js";
+import { runTPR } from "../packages/cloudflare/src/tpr.js";
 export { KVCacheHandler, runTPR };

package/dist/config/config-matchers.js

@@ -1,5 +1,5 @@
-import { VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../server/headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "../server/middleware-request-headers.js";
+import { VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
+import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { parseCookieHeader } from "../utils/parse-cookie.js";
 //#region src/config/config-matchers.ts
 /**
@@ -526,11 +526,13 @@ function extractConstraint(str, re) {
 *
 * The root path `"/"` is preserved as-is.
 */
-function stripTrailingSlashForConfigMatch(pathname) {
-	return pathname.length > 1 && pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
+function stripTrailingSlashForConfigMatch(value) {
+	return value.length > 1 && value.endsWith("/") ? value.slice(0, -1) : value;
 }
 function matchConfigPattern(pathname, pattern) {
+	const pathnameHadTrailingSlash = pathname.length > 1 && pathname.endsWith("/");
 	pathname = stripTrailingSlashForConfigMatch(pathname);
+	if (pathnameHadTrailingSlash) pattern = stripTrailingSlashForConfigMatch(pattern);
 	const catchAllAnchor = /:[\w-]+[*+]/.test(pattern);
 	const namedParamCount = (pattern.match(/:[\w-]+/g) || []).length;
 	if (pattern.includes("(") || pattern.includes("\\") || /:[\w-]+[*+][^/]/.test(pattern) || /:[\w-]+\./.test(pattern) || /[^/]:[\w-]+/.test(pattern) || catchAllAnchor && namedParamCount > 1) try {
@@ -628,12 +630,12 @@ function matchConfigPattern(pathname, pattern) {
 */
 function matchRedirect(pathname, redirects, ctx, basePathState = _BASEPATH_DEFAULT) {
 	if (redirects.length === 0) return null;
-	pathname = stripTrailingSlashForConfigMatch(pathname);
+	const normalizedPathname = stripTrailingSlashForConfigMatch(pathname);
 	const index = _getRedirectIndex(redirects);
 	let localeMatch = null;
 	let localeMatchIndex = Infinity;
 	if (index.localeStatic.size > 0) {
-		const noLocaleBucket = index.localeStatic.get(pathname);
+		const noLocaleBucket = index.localeStatic.get(normalizedPathname);
 		if (noLocaleBucket) for (const entry of noLocaleBucket) {
 			if (!entry.optional) continue;
 			if (entry.originalIndex >= localeMatchIndex) continue;
@@ -651,10 +653,10 @@ function matchRedirect(pathname, redirects, ctx, basePathState = _BASEPATH_DEFAU
 			localeMatchIndex = entry.originalIndex;
 			break;
 		}
-		const slashTwo = pathname.indexOf("/", 1);
+		const slashTwo = normalizedPathname.indexOf("/", 1);
 		if (slashTwo !== -1) {
-			const suffix = pathname.slice(slashTwo);
-			const localePart = pathname.slice(1, slashTwo);
+			const suffix = normalizedPathname.slice(slashTwo);
+			const localePart = normalizedPathname.slice(1, slashTwo);
 			const localeBucket = index.localeStatic.get(suffix);
 			if (localeBucket) for (const entry of localeBucket) {
 				if (entry.originalIndex >= localeMatchIndex) continue;
@@ -956,11 +958,13 @@ async function proxyExternalRequest(request, externalUrl) {
 * when evaluating headers, so this parameter is required.
 */
 function matchHeaders(pathname, headers, ctx, basePathState = _BASEPATH_DEFAULT) {
+	const pathnameHadTrailingSlash = pathname.length > 1 && pathname.endsWith("/");
 	pathname = stripTrailingSlashForConfigMatch(pathname);
 	const result = [];
 	for (const rule of headers) {
 		if (!shouldEvaluateRule(rule.basePath, basePathState)) continue;
-		const sourceRegex = getCachedRegex(_compiledHeaderSourceCache, rule.source, () => safeRegExp("^" + escapeHeaderSource(rule.source) + "$"));
+		const source = pathnameHadTrailingSlash ? stripTrailingSlashForConfigMatch(rule.source) : rule.source;
+		const sourceRegex = getCachedRegex(_compiledHeaderSourceCache, source, () => safeRegExp("^" + escapeHeaderSource(source) + "$"));
 		if (sourceRegex && sourceRegex.test(pathname)) {
 			if (rule.has || rule.missing) {
 				if (!checkHasConditions(rule.has, rule.missing, ctx)) continue;

package/dist/config/next-config.d.ts

@@ -107,7 +107,7 @@ type NextConfig = {
   }; /** Custom response headers */
   headers?: () => Promise<NextHeader[]> | NextHeader[]; /** Image optimization config */
   images?: {
-    remotePatterns?: Array<{
+    remotePatterns?: Array<URL | {
       protocol?: string;
       hostname: string;
       port?: string;
@@ -272,8 +272,11 @@ type ResolvedNextConfig = {
   aliases: Record<string, string>; /** Extra allowed origins for dev server access (from allowedDevOrigins). */
   allowedDevOrigins: string[]; /** Extra allowed origins for server action CSRF validation (from experimental.serverActions.allowedOrigins). */
   serverActionsAllowedOrigins: string[]; /** Packages whose barrel imports should be optimized (from experimental.optimizePackageImports). */
-  optimizePackageImports: string[]; /** Inline app CSS into production HTML (from experimental.inlineCss). */
-  inlineCss: boolean; /** Parsed body size limit for server actions in bytes (from experimental.serverActions.bodySizeLimit). Defaults to 1MB. */
+  optimizePackageImports: string[]; /** Packages explicitly requested for server/client transpilation. */
+  transpilePackages: string[]; /** Packages treated as application code by Turbopack's foreign-code condition. */
+  turbopackTranspilePackages: string[]; /** Inline app CSS into production HTML (from experimental.inlineCss). */
+  inlineCss: boolean; /** Enable standalone route-miss 404 handling (from experimental.globalNotFound). */
+  globalNotFound: boolean; /** Parsed body size limit for server actions in bytes (from experimental.serverActions.bodySizeLimit). Defaults to 1MB. */
   serverActionsBodySizeLimit: number; /** Verbatim body size limit config value (e.g. "2mb") for the "Body exceeded {limit} limit" error. Defaults to "1 MB". */
   serverActionsBodySizeLimitLabel: string; /** Route-level expire fallback in seconds for ISR entries with numeric revalidate. */
   expireTime: number;