vinext 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/client/pages-router-link-navigation.js

@@ -2,7 +2,7 @@ import { stripBasePath } from "../utils/base-path.js";
 import { getLocalePathPrefix } from "../utils/domain-locale.js";
 //#region src/client/pages-router-link-navigation.ts
 function resolvePagesRouterQueryOnlyHref(href, { asPath, basePath, fallbackHref, locales }) {
-	if (!href.startsWith("?")) return href;
+	if (!href.startsWith("?") && !href.startsWith("#")) return href;
 	try {
 		const fallbackUrl = new URL(fallbackHref);
 		const base = new URL(asPath ?? `${stripBasePath(fallbackUrl.pathname, basePath)}${fallbackUrl.search}${fallbackUrl.hash}`, "http://vinext.local");

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

@@ -1,17 +1,20 @@
 import { HasCondition, NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "./next-config.js";
+import { RequestContext, normalizeHost, parseCookies, requestContextFromRequest } from "./request-context.js";
+import { isExternalUrl } from "../utils/external-url.js";
 
 //#region src/config/config-matchers.d.ts
 /**
  * Detect regex patterns vulnerable to catastrophic backtracking (ReDoS).
  *
- * Uses a lightweight heuristic: scans the pattern string for nested quantifiers
- * (a quantifier applied to a group that itself contains a quantifier). This
- * catches the most common pathological patterns like `(a+)+`, `(.*)*`,
- * `([^/]+)+`, `(a|a+)+` without needing a full regex parser.
+ * Uses the same deterministic structural analysis as middleware matcher
+ * validation. Nested bounded repetition is accepted only when its repeated
+ * language has fixed width and unambiguous branches; a fixed outer count can
+ * otherwise still cause polynomially catastrophic backtracking on long near
+ * misses.
  *
  * Returns true if the pattern appears safe, false if it's potentially dangerous.
  */
-declare function isSafeRegex(pattern: string): boolean;
+declare function isSafeRegex(pattern: string, flags?: string): boolean;
 /**
  * Compile a regex pattern safely. Returns the compiled RegExp or null if the
  * pattern is invalid or vulnerable to ReDoS.
@@ -27,16 +30,6 @@ declare function safeRegExp(pattern: string, flags?: string): RegExp | null;
  * which CodeQL flags as incomplete sanitization), then groups are restored.
  */
 declare function escapeHeaderSource(source: string): string;
-/**
- * Request context needed for evaluating has/missing conditions.
- * Callers extract the relevant parts from the incoming Request.
- */
-type RequestContext = {
-  readonly headers: Headers;
-  readonly cookies: Record<string, string>;
-  readonly query: URLSearchParams;
-  readonly host: string;
-};
 /**
  * basePath gating state passed alongside the pathname to every matcher.
  *
@@ -59,22 +52,6 @@ type BasePathMatchState = {
    */
   hadBasePath: boolean;
 };
-/**
- * Parse a Cookie header string into a key-value record.
- */
-declare function parseCookies(cookieHeader: string | null): Record<string, string>;
-/**
- * Build a RequestContext from a Web Request object.
- *
- * `cookies` and `query` are lazy memoized getters: they are consumed only by
- * `has`/`missing` condition evaluation (`checkHasConditions` /
- * `matchesRuleConditions`), and most apps configure no such conditions. The
- * cookie split and `searchParams` access are therefore deferred until first
- * read and computed at most once. Mirrors `headersContextFromRequest` in
- * `shims/headers.ts`.
- */
-declare function requestContextFromRequest(request: Request): RequestContext;
-declare function normalizeHost(hostHeader: string | null, fallbackHostname: string): string;
 /**
  * Unpack `x-middleware-request-*` headers from the collected middleware
  * response headers into the actual request, and strip all `x-middleware-*`
@@ -147,7 +124,7 @@ declare function matchRedirect(pathname: string, redirects: NextRedirect[], ctx:
  * to evaluate has/missing conditions. Next.js always has request context
  * when evaluating rewrites, so this parameter is required.
  */
-declare function matchRewrite(pathname: string, rewrites: NextRewrite[], ctx: RequestContext, basePathState?: BasePathMatchState): string | null;
+declare function matchRewrite(pathname: string, rewrites: NextRewrite[], ctx: RequestContext, basePathState?: BasePathMatchState, paramsPathname?: string): string | null;
 /**
  * Check whether a rewrite source can match a pathname without evaluating its
  * request-dependent `has` / `missing` conditions.
@@ -175,7 +152,6 @@ declare function sanitizeDestination(dest: string): string;
  * Detects any URL scheme (http:, https:, data:, javascript:, blob:, etc.)
  * per RFC 3986, plus protocol-relative URLs (//).
  */
-declare function isExternalUrl(url: string): boolean;
 /**
  * Merge the original request's query params into a config-redirect
  * destination, preserving them on the resulting `Location`.
@@ -218,8 +194,8 @@ declare function matchHeaders(pathname: string, headers: NextHeader[], ctx: Requ
   value: string;
 }>;
 /**
- * Apply Next.js i18n locale-prefix transformation to a set of redirect or
- * rewrite rules. Mirrors the relevant slice of Next.js's `processRoutes`
+ * Apply Next.js i18n locale-prefix transformation to a set of redirect,
+ * rewrite, or header rules. Mirrors the relevant slice of Next.js's `processRoutes`
  * (load-custom-routes.ts) with one deliberate divergence noted below.
  *
  * For each rule:
@@ -250,8 +226,8 @@ declare function matchHeaders(pathname: string, headers: NextHeader[], ctx: Requ
  * Mirrors the Next.js reference in
  * packages/next/src/lib/load-custom-routes.ts — see `processRoutes`.
  */
-declare function applyLocaleToRoutes<T extends NextRedirect | NextRewrite>(routes: T[], i18n: NextI18nConfig | null | undefined, type: "redirect" | "rewrite", options?: {
+declare function applyLocaleToRoutes<T extends NextRedirect | NextRewrite | NextHeader>(routes: T[], i18n: NextI18nConfig | null | undefined, type: "redirect" | "rewrite" | "header", options?: {
   trailingSlash?: boolean;
 }): T[];
 //#endregion
-export { BasePathMatchState, RequestContext, applyLocaleToRoutes, applyMiddlewareRequestHeaders, checkHasConditions, escapeHeaderSource, isExternalUrl, isSafeRegex, matchConfigPattern, matchHeaders, matchRedirect, matchRewrite, matchesRewriteSource, normalizeHost, parseCookies, preserveRedirectDestinationQuery, proxyExternalRequest, requestContextFromRequest, safeRegExp, sanitizeDestination };
+export { BasePathMatchState, type RequestContext, applyLocaleToRoutes, applyMiddlewareRequestHeaders, checkHasConditions, escapeHeaderSource, isExternalUrl, isSafeRegex, matchConfigPattern, matchHeaders, matchRedirect, matchRewrite, matchesRewriteSource, normalizeHost, parseCookies, preserveRedirectDestinationQuery, proxyExternalRequest, requestContextFromRequest, safeRegExp, sanitizeDestination };

package/dist/config/config-matchers.js

@@ -1,6 +1,8 @@
 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";
+import { analyzeRegexSafety } from "../utils/regex-safety.js";
+import { normalizeHost, parseCookies, requestContextFromRequest } from "./request-context.js";
+import { isExternalUrl } from "../utils/external-url.js";
 //#region src/config/config-matchers.ts
 /**
 * Cache for compiled regex patterns in matchConfigPattern.
@@ -159,7 +161,7 @@ function _getRedirectIndex(redirects) {
 	return index;
 }
 /** Hop-by-hop headers that should not be forwarded through a proxy. */
-const HOP_BY_HOP_HEADERS = new Set([
+const HOP_BY_HOP_HEADERS = /* @__PURE__ */ new Set([
 	"connection",
 	"keep-alive",
 	"proxy-authenticate",
@@ -175,7 +177,7 @@ const HOP_BY_HOP_HEADERS = new Set([
 * still forwards proxy auth credentials, while response sanitization strips
 * them before returning data to the client.
 */
-const REQUEST_HOP_BY_HOP_HEADERS = new Set([
+const REQUEST_HOP_BY_HOP_HEADERS = /* @__PURE__ */ new Set([
 	"connection",
 	"keep-alive",
 	"te",
@@ -191,75 +193,16 @@ function stripHopByHopRequestHeaders(headers) {
 /**
 * Detect regex patterns vulnerable to catastrophic backtracking (ReDoS).
 *
-* Uses a lightweight heuristic: scans the pattern string for nested quantifiers
-* (a quantifier applied to a group that itself contains a quantifier). This
-* catches the most common pathological patterns like `(a+)+`, `(.*)*`,
-* `([^/]+)+`, `(a|a+)+` without needing a full regex parser.
+* Uses the same deterministic structural analysis as middleware matcher
+* validation. Nested bounded repetition is accepted only when its repeated
+* language has fixed width and unambiguous branches; a fixed outer count can
+* otherwise still cause polynomially catastrophic backtracking on long near
+* misses.
 *
 * Returns true if the pattern appears safe, false if it's potentially dangerous.
 */
-function isSafeRegex(pattern) {
-	const quantifierAtDepth = [];
-	let depth = 0;
-	let i = 0;
-	while (i < pattern.length) {
-		const ch = pattern[i];
-		if (ch === "\\") {
-			i += 2;
-			continue;
-		}
-		if (ch === "[") {
-			i++;
-			while (i < pattern.length && pattern[i] !== "]") {
-				if (pattern[i] === "\\") i++;
-				i++;
-			}
-			i++;
-			continue;
-		}
-		if (ch === "(") {
-			depth++;
-			if (quantifierAtDepth.length <= depth) quantifierAtDepth.push(false);
-			else quantifierAtDepth[depth] = false;
-			i++;
-			continue;
-		}
-		if (ch === ")") {
-			const hadQuantifier = depth > 0 && quantifierAtDepth[depth];
-			if (depth > 0) depth--;
-			const next = pattern[i + 1];
-			if (next === "+" || next === "*" || next === "{") {
-				if (hadQuantifier) return false;
-				if (depth >= 0 && depth < quantifierAtDepth.length) quantifierAtDepth[depth] = true;
-			}
-			i++;
-			continue;
-		}
-		if (ch === "+" || ch === "*") {
-			if (depth > 0) quantifierAtDepth[depth] = true;
-			i++;
-			continue;
-		}
-		if (ch === "?") {
-			const prev = i > 0 ? pattern[i - 1] : "";
-			if (prev !== "+" && prev !== "*" && prev !== "?" && prev !== "}") {
-				if (depth > 0) quantifierAtDepth[depth] = true;
-			}
-			i++;
-			continue;
-		}
-		if (ch === "{") {
-			let j = i + 1;
-			while (j < pattern.length && /[\d,]/.test(pattern[j])) j++;
-			if (j < pattern.length && pattern[j] === "}" && j > i + 1) {
-				if (depth > 0) quantifierAtDepth[depth] = true;
-				i = j + 1;
-				continue;
-			}
-		}
-		i++;
-	}
-	return true;
+function isSafeRegex(pattern, flags) {
+	return analyzeRegexSafety(pattern, { ignoreCase: flags?.includes("i") }) === null;
 }
 /**
 * Compile a regex pattern safely. Returns the compiled RegExp or null if the
@@ -268,8 +211,8 @@ function isSafeRegex(pattern) {
 * Logs a warning when a pattern is rejected so developers can fix their config.
 */
 function safeRegExp(pattern, flags) {
-	if (!isSafeRegex(pattern)) {
-		console.warn(`[vinext] Rejecting potentially unsafe regex pattern (ReDoS risk): ${pattern}\n  Patterns with nested quantifiers (e.g. (a+)+) can cause catastrophic backtracking.\n  Simplify the pattern to avoid nested repetition.`);
+	if (!isSafeRegex(pattern, flags)) {
+		console.warn(`[vinext] Rejecting potentially unsafe regex pattern (ReDoS risk): ${pattern}\n  Nested or ambiguous repetition can cause catastrophic backtracking.\n  Simplify the pattern to make repeated matches fixed and unambiguous.`);
 		return null;
 	}
 	try {
@@ -342,40 +285,6 @@ function shouldEvaluateRule(ruleBasePath, state) {
 	return ruleBasePath === false ? !state.hadBasePath : state.hadBasePath;
 }
 /**
-* Parse a Cookie header string into a key-value record.
-*/
-function parseCookies(cookieHeader) {
-	return parseCookieHeader(cookieHeader);
-}
-/**
-* Build a RequestContext from a Web Request object.
-*
-* `cookies` and `query` are lazy memoized getters: they are consumed only by
-* `has`/`missing` condition evaluation (`checkHasConditions` /
-* `matchesRuleConditions`), and most apps configure no such conditions. The
-* cookie split and `searchParams` access are therefore deferred until first
-* read and computed at most once. Mirrors `headersContextFromRequest` in
-* `shims/headers.ts`.
-*/
-function requestContextFromRequest(request) {
-	const url = new URL(request.url);
-	let cookies;
-	let query;
-	return {
-		headers: request.headers,
-		get cookies() {
-			return cookies ??= parseCookies(request.headers.get("cookie"));
-		},
-		get query() {
-			return query ??= url.searchParams;
-		},
-		host: normalizeHost(request.headers.get("host"), url.hostname)
-	};
-}
-function normalizeHost(hostHeader, fallbackHostname) {
-	return (hostHeader ?? fallbackHostname).split(":", 1)[0].toLowerCase();
-}
-/**
 * Unpack `x-middleware-request-*` headers from the collected middleware
 * response headers into the actual request, and strip all `x-middleware-*`
 * internal signals so they never reach clients.
@@ -410,7 +319,7 @@ function _emptyParams() {
 	return Object.create(null);
 }
 function _matchConditionValue(actualValue, expectedValue) {
-	if (expectedValue === void 0) return _emptyParams();
+	if (!expectedValue) return actualValue ? _emptyParams() : null;
 	const re = _cachedConditionRegex(expectedValue);
 	if (re) {
 		const match = re.exec(actualValue);
@@ -440,9 +349,10 @@ function matchSingleCondition(condition, ctx) {
 			return _matchConditionValue(cookieValue, condition.value);
 		}
 		case "query": {
-			const queryValue = ctx.query.get(condition.key);
-			if (queryValue === null) return null;
-			return _matchConditionValue(queryValue, condition.value);
+			const queryValues = ctx.query.getAll(condition.key);
+			if (queryValues.length === 0) return null;
+			if (!condition.value && queryValues.length > 1) return _emptyParams();
+			return _matchConditionValue(queryValues[queryValues.length - 1], condition.value);
 		}
 		case "host":
 			if (condition.value !== void 0) return _matchConditionValue(ctx.host, condition.value);
@@ -710,11 +620,12 @@ function matchRedirect(pathname, redirects, ctx, basePathState = _BASEPATH_DEFAU
 * to evaluate has/missing conditions. Next.js always has request context
 * when evaluating rewrites, so this parameter is required.
 */
-function matchRewrite(pathname, rewrites, ctx, basePathState = _BASEPATH_DEFAULT) {
+function matchRewrite(pathname, rewrites, ctx, basePathState = _BASEPATH_DEFAULT, paramsPathname = pathname) {
 	for (const rewrite of rewrites) {
 		if (!shouldEvaluateRule(rewrite.basePath, basePathState)) continue;
-		const params = matchConfigPattern(pathname, rewrite.source);
-		if (params) {
+		const matchedParams = matchConfigPattern(pathname, rewrite.source);
+		if (matchedParams) {
+			const params = paramsPathname === pathname ? matchedParams : matchConfigPattern(paramsPathname, rewrite.source) ?? matchedParams;
 			const conditionParams = rewrite.has || rewrite.missing ? collectConditionParams(rewrite.has, rewrite.missing, ctx) : _emptyParams();
 			if (!conditionParams) continue;
 			const rewriteParams = {
@@ -868,9 +779,6 @@ function sanitizeDestination(dest) {
 * Detects any URL scheme (http:, https:, data:, javascript:, blob:, etc.)
 * per RFC 3986, plus protocol-relative URLs (//).
 */
-function isExternalUrl(url) {
-	return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
-}
 /**
 * Merge the original request's query params into a config-redirect
 * destination, preserving them on the resulting `Location`.
@@ -1004,8 +912,8 @@ function _escapeRegexString(value) {
 	return value.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&");
 }
 /**
-* Apply Next.js i18n locale-prefix transformation to a set of redirect or
-* rewrite rules. Mirrors the relevant slice of Next.js's `processRoutes`
+* Apply Next.js i18n locale-prefix transformation to a set of redirect,
+* rewrite, or header rules. Mirrors the relevant slice of Next.js's `processRoutes`
 * (load-custom-routes.ts) with one deliberate divergence noted below.
 *
 * For each rule:
@@ -1048,7 +956,8 @@ function applyLocaleToRoutes(routes, i18n, type, options = {}) {
 			out.push(r);
 			continue;
 		}
-		const isExternal = !!r.destination && !r.destination.startsWith("/");
+		const destination = "destination" in r ? r.destination : void 0;
+		const isExternal = !!destination && !destination.startsWith("/");
 		if (!isExternal) for (const locale of defaultLocales) {
 			const localizedSource = `/${locale}${suffixFor(r.source)}`;
 			out.push({
@@ -1057,13 +966,14 @@ function applyLocaleToRoutes(routes, i18n, type, options = {}) {
 			});
 		}
 		const internalSource = `${internalLocale}${suffixFor(r.source)}`;
-		let internalDestination = r.destination;
+		let internalDestination = destination;
 		if (internalDestination && internalDestination.startsWith("/") && !isExternal) internalDestination = `/:nextInternalLocale${internalDestination === "/" && !trailingSlash ? "" : internalDestination}`;
-		out.push({
+		const internalRoute = {
 			...r,
-			source: internalSource,
-			destination: internalDestination
-		});
+			source: internalSource
+		};
+		if ("destination" in internalRoute && internalDestination !== void 0) internalRoute.destination = internalDestination;
+		out.push(internalRoute);
 		out.push(r);
 	}
 	return out;

package/dist/config/dotenv.js

@@ -1,5 +1,5 @@
+import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import fs from "node:fs";
-import path from "node:path";
 import { parseEnv } from "node:util";
 //#region src/config/dotenv.ts
 /**

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

@@ -1,6 +1,8 @@
 import { PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
+import { PluginOption } from "vite";
 
 //#region src/config/next-config.d.ts
+declare const VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY = "__vinextNextConfig";
 /**
  * Parse a body size limit value (string or number) into bytes.
  * Accepts Next.js-style strings like "1mb", "500kb", "10mb", bare number strings like "1048576" (bytes),
@@ -52,7 +54,8 @@ type NextHeader = {
     key: string;
     value: string;
   }>; /** See {@link NextRedirect.basePath}. */
-  basePath?: false;
+  basePath?: false; /** See {@link NextRedirect.locale}. */
+  locale?: false;
 };
 type NextI18nConfig = {
   /** List of supported locales */locales: string[]; /** The default locale (used when no locale prefix is in the URL) */
@@ -69,7 +72,7 @@ type NextI18nConfig = {
     domain: string;
     defaultLocale: string;
     locales?: string[];
-    http?: boolean;
+    http?: true;
   }>;
 };
 /**
@@ -241,6 +244,7 @@ type NextConfigFactory = (phase: string, opts: {
   defaultConfig: NextConfig;
 }) => NextConfig | Promise<NextConfig>;
 type NextConfigInput = NextConfig | NextConfigFactory;
+declare function findVinextNextConfigInPlugins(plugins: PluginOption[] | undefined): Promise<NextConfigInput | null>;
 /**
  * Resolved configuration with all async values awaited.
  */
@@ -564,4 +568,4 @@ declare function extractMdxOptions(config: NextConfig, root?: string): Promise<M
  */
 declare function detectNextIntlConfig(root: string, resolved: ResolvedNextConfig): void;
 //#endregion
-export { HasCondition, MdxOptions, NextConfig, NextConfigInput, NextHeader, NextI18nConfig, NextRedirect, NextRewrite, PHASE_PRODUCTION_BUILD, PrefetchInliningConfig, ResolvedNextConfig, createRscCompatibilityId, detectNextIntlConfig, extractMdxOptions, findNextConfigPath, lightningCssFeatureNamesToMask, loadNextConfig, normalizeAssetPrefix, parseBodySizeLimit, reassignsModuleExports, referencesCjsGlobals, resolveNextConfig, resolveNextConfigInput };
+export { HasCondition, MdxOptions, NextConfig, NextConfigInput, NextHeader, NextI18nConfig, NextRedirect, NextRewrite, PHASE_PRODUCTION_BUILD, PrefetchInliningConfig, ResolvedNextConfig, VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, detectNextIntlConfig, extractMdxOptions, findNextConfigPath, findVinextNextConfigInPlugins, lightningCssFeatureNamesToMask, loadNextConfig, normalizeAssetPrefix, parseBodySizeLimit, reassignsModuleExports, referencesCjsGlobals, resolveNextConfig, resolveNextConfigInput };

package/dist/config/next-config.js

@@ -1,13 +1,15 @@
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { normalizePageExtensions } from "../routing/file-matcher.js";
-import { applyLocaleToRoutes, isExternalUrl } from "./config-matchers.js";
+import { isExternalUrl } from "../utils/external-url.js";
+import { applyLocaleToRoutes } from "./config-matchers.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { getHtmlLimitedBotRegex } from "../utils/html-limited-bots.js";
+import { flattenPluginOptions } from "../utils/plugin-options.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
 import { loadTsconfigResolutionForRoot } from "./tsconfig-paths.js";
 import { loadCommonJsModule, shouldRetryAsCommonJs } from "../utils/commonjs-loader.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
-import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { randomUUID } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
@@ -18,6 +20,7 @@ import commonjs from "vite-plugin-commonjs";
 * Loads the Next.js config file (if present) and extracts supported options.
 * Unsupported options are logged as warnings.
 */
+const VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY = "__vinextNextConfig";
 /**
 * Parse a body size limit value (string or number) into bytes.
 * Accepts Next.js-style strings like "1mb", "500kb", "10mb", bare number strings like "1048576" (bytes),
@@ -63,6 +66,15 @@ function parseBodySizeLimit(value) {
 	if (bytes < 1) throw new Error(`Body size limit must be a positive number, got ${bytes}`);
 	return bytes;
 }
+async function findVinextNextConfigInPlugins(plugins) {
+	const flattened = await flattenPluginOptions(plugins);
+	for (const plugin of flattened) {
+		if (!isUnknownRecord(plugin)) continue;
+		const nextConfig = plugin[VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY];
+		if (nextConfig) return nextConfig;
+	}
+	return null;
+}
 const CONFIG_FILES = [
 	"next.config.ts",
 	"next.config.mts",
@@ -150,10 +162,12 @@ async function unwrapConfig(mod, phase = PHASE_DEVELOPMENT_SERVER) {
 /**
 * Resolve a path through filesystem symlinks, falling back to the original
 * path when the file does not exist (e.g. virtual ids, query-suffixed ids).
+* Output is forward-slashed so it compares consistently with pathslash
+* results (fs.realpathSync returns backslashes on Windows).
 */
 function safeRealpath(p) {
 	try {
-		return fs.realpathSync(p);
+		return toSlash(fs.realpathSync(p));
 	} catch {
 		return p;
 	}
@@ -439,8 +453,8 @@ function createRscCompatibilityId(nextConfig) {
 * @returns A filesystem path suitable for path operations
 */
 function resolveCacheHandlerPathToFilesystem(filePath) {
-	if (filePath.startsWith("file://")) return fileURLToPath(filePath);
-	return filePath;
+	if (filePath.startsWith("file://")) return toSlash(fileURLToPath(filePath));
+	return toSlash(filePath);
 }
 function resolveHtmlLimitedBots(value) {
 	const source = value instanceof RegExp ? value.source : typeof value === "string" ? value : void 0;
@@ -571,11 +585,71 @@ function normalizePrefetchInliningConfig(value) {
 		maxSize: Number.isFinite(normalizedMaxSize) ? normalizedMaxSize : Number.MAX_SAFE_INTEGER
 	};
 }
+function normalizeI18nConfig(value) {
+	if (!value) return null;
+	const i18nType = typeof value;
+	if (i18nType !== "object") throw new Error(`Specified i18n should be an object received ${i18nType}.\nSee more info here: https://nextjs.org/docs/messages/invalid-i18n-config`);
+	const i18n = value;
+	if (!Array.isArray(i18n.locales)) throw new Error(`Specified i18n.locales should be an Array received ${typeof i18n.locales}.\nSee more info here: https://nextjs.org/docs/messages/invalid-i18n-config`);
+	if (i18n.locales.length > 100) console.warn(`Received ${i18n.locales.length} i18n.locales items which exceeds the recommended max of 100.\nSee more info here: https://nextjs.org/docs/advanced-features/i18n-routing#how-does-this-work-with-static-generation`);
+	if (!i18n.defaultLocale || typeof i18n.defaultLocale !== "string") throw new Error("Specified i18n.defaultLocale should be a string.\nSee more info here: https://nextjs.org/docs/messages/invalid-i18n-config");
+	if (i18n.domains !== void 0 && !Array.isArray(i18n.domains)) throw new Error(`Specified i18n.domains must be an array of domain objects e.g. [ { domain: 'example.fr', defaultLocale: 'fr', locales: ['fr'] } ] received ${typeof i18n.domains}.\nSee more info here: https://nextjs.org/docs/messages/invalid-i18n-config`);
+	if (i18n.domains) {
+		const invalidDomainItems = i18n.domains.filter((item) => {
+			if (!isUnknownRecord(item) || !item.defaultLocale) return true;
+			if (!item.domain || typeof item.domain !== "string") return true;
+			if (item.domain.includes(":")) {
+				console.warn(`i18n domain: "${item.domain}" is invalid it should be a valid domain without protocol (https://) or port (:3000) e.g. example.vercel.sh`);
+				return true;
+			}
+			const defaultLocaleDuplicate = i18n.domains.find((other) => isUnknownRecord(other) && other.defaultLocale === item.defaultLocale && other.domain !== item.domain);
+			if (defaultLocaleDuplicate && isUnknownRecord(defaultLocaleDuplicate)) {
+				console.warn(`Both ${item.domain} and ${String(defaultLocaleDuplicate.domain)} configured the defaultLocale ${item.defaultLocale} but only one can. Change one item's default locale to continue`);
+				return true;
+			}
+			let hasInvalidLocale = false;
+			if (Array.isArray(item.locales)) for (const locale of item.locales) {
+				if (typeof locale !== "string") hasInvalidLocale = true;
+				for (const domainItem of i18n.domains) {
+					if (domainItem === item || !isUnknownRecord(domainItem)) continue;
+					const domainLocales = domainItem.locales;
+					if (domainLocales && domainLocales.includes(locale)) {
+						console.warn(`Both ${item.domain} and ${String(domainItem.domain)} configured the locale (${String(locale)}) but only one can. Remove it from one i18n.domains config to continue`);
+						hasInvalidLocale = true;
+						break;
+					}
+				}
+			}
+			return hasInvalidLocale;
+		});
+		if (invalidDomainItems.length > 0) throw new Error(`Invalid i18n.domains values:\n${invalidDomainItems.map((item) => JSON.stringify(item)).join("\n")}\n\ndomains value must follow format { domain: 'example.fr', defaultLocale: 'fr', locales: ['fr'] }.\nSee more info here: https://nextjs.org/docs/messages/invalid-i18n-config`);
+	}
+	const invalidLocales = i18n.locales.filter((locale) => typeof locale !== "string");
+	if (invalidLocales.length > 0) throw new Error(`Specified i18n.locales contains invalid values (${invalidLocales.map(String).join(", ")}), locales must be valid locale tags provided as strings e.g. "en-US".\nSee here for list of valid language sub-tags: http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry`);
+	const locales = i18n.locales;
+	if (!locales.includes(i18n.defaultLocale)) throw new Error("Specified i18n.defaultLocale should be included in i18n.locales.\nSee more info here: https://nextjs.org/docs/messages/invalid-i18n-config");
+	const normalizedLocales = /* @__PURE__ */ new Set();
+	const duplicateLocales = /* @__PURE__ */ new Set();
+	for (const locale of locales) {
+		const localeLower = locale.toLowerCase();
+		if (normalizedLocales.has(localeLower)) duplicateLocales.add(locale);
+		normalizedLocales.add(localeLower);
+	}
+	if (duplicateLocales.size > 0) throw new Error(`Specified i18n.locales contains the following duplicate locales:\n${[...duplicateLocales].join(", ")}\nEach locale should be listed only once.\nSee more info here: https://nextjs.org/docs/messages/invalid-i18n-config`);
+	const localeDetectionType = typeof i18n.localeDetection;
+	if (localeDetectionType !== "boolean" && localeDetectionType !== "undefined") throw new Error(`Specified i18n.localeDetection should be undefined or a boolean received ${localeDetectionType}.\nSee more info here: https://nextjs.org/docs/messages/invalid-i18n-config`);
+	return {
+		locales: [i18n.defaultLocale, ...locales.filter((locale) => locale !== i18n.defaultLocale)],
+		defaultLocale: i18n.defaultLocale,
+		localeDetection: i18n.localeDetection ?? true,
+		domains: i18n.domains
+	};
+}
 /**
 * Resolve a NextConfig into a fully-resolved ResolvedNextConfig.
 * Awaits async functions for redirects/rewrites/headers.
 */
-async function resolveNextConfig(config, root = process.cwd(), options = {}) {
+async function resolveNextConfig(config, root = toSlash(process.cwd()), options = {}) {
 	if (!config) {
 		const buildId = await resolveBuildId(void 0);
 		const deploymentId = resolveDeploymentId(void 0);
@@ -643,6 +717,7 @@ async function resolveNextConfig(config, root = process.cwd(), options = {}) {
 		return resolved;
 	}
 	warnDeprecatedConfigOptions(config, root);
+	const i18n = normalizeI18nConfig(config.i18n);
 	let redirects = [];
 	if (config.redirects) {
 		const result = await config.redirects();
@@ -729,13 +804,6 @@ async function resolveNextConfig(config, root = process.cwd(), options = {}) {
 	const experimentalTurbo = readOptionalRecord(experimental?.turbo);
 	const turbopack = readOptionalRecord(config.turbopack);
 	const resolveExtensions = Array.isArray(turbopack?.resolveExtensions) ? readStringArray(turbopack.resolveExtensions) : Array.isArray(experimentalTurbo?.resolveExtensions) ? readStringArray(experimentalTurbo.resolveExtensions) : null;
-	let i18n = null;
-	if (config.i18n) i18n = {
-		locales: config.i18n.locales,
-		defaultLocale: config.i18n.defaultLocale,
-		localeDetection: config.i18n.localeDetection ?? true,
-		domains: config.i18n.domains
-	};
 	const buildId = await resolveBuildId(config.generateBuildId);
 	const deploymentId = resolveDeploymentId(config.deploymentId);
 	const cacheHandler = typeof config.cacheHandler === "string" ? resolveCacheHandlerPathToFilesystem(config.cacheHandler) : void 0;
@@ -748,6 +816,7 @@ async function resolveNextConfig(config, root = process.cwd(), options = {}) {
 			afterFiles: applyLocaleToRoutes(rewrites.afterFiles, i18n, "rewrite", opts),
 			fallback: applyLocaleToRoutes(rewrites.fallback, i18n, "rewrite", opts)
 		};
+		headers = applyLocaleToRoutes(headers, i18n, "header", opts);
 	}
 	const images = config.images ? {
 		...config.images,
@@ -996,7 +1065,7 @@ function invokeLoaderSideEffects(rules, root) {
 * loader rule. The remark/rehype plugins are captured in that closure.
 * We probe the webpack function with a mock config to extract them.
 */
-async function extractMdxOptions(config, root = process.cwd()) {
+async function extractMdxOptions(config, root = toSlash(process.cwd())) {
 	return (await probeWebpackConfig(config, root, false)).mdx;
 }
 /**
@@ -1090,4 +1159,4 @@ function extractPluginsFromOptions(opts) {
 	return null;
 }
 //#endregion
-export { PHASE_PRODUCTION_BUILD, createRscCompatibilityId, detectNextIntlConfig, extractMdxOptions, findNextConfigPath, lightningCssFeatureNamesToMask, loadNextConfig, normalizeAssetPrefix, parseBodySizeLimit, reassignsModuleExports, referencesCjsGlobals, resolveNextConfig, resolveNextConfigInput };
+export { PHASE_PRODUCTION_BUILD, VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, detectNextIntlConfig, extractMdxOptions, findNextConfigPath, findVinextNextConfigInPlugins, lightningCssFeatureNamesToMask, loadNextConfig, normalizeAssetPrefix, parseBodySizeLimit, reassignsModuleExports, referencesCjsGlobals, resolveNextConfig, resolveNextConfigInput };

package/dist/config/prerender.d.ts

@@ -30,8 +30,8 @@ type ViteConfigLoader = {
   loadConfigFromFile: typeof import("vite").loadConfigFromFile;
 };
 declare function normalizeVinextPrerenderConfig(config: VinextPrerenderConfig | undefined): ResolvedVinextPrerenderConfig | null;
-declare function findVinextPrerenderConfigInPlugins(plugins: PluginOption[] | undefined): ResolvedVinextPrerenderConfig | null;
-declare function findVinextRouteRootConfigInPlugins(plugins: PluginOption[] | undefined): VinextRouteRootConfig | null;
+declare function findVinextPrerenderConfigInPlugins(plugins: PluginOption[] | undefined): Promise<ResolvedVinextPrerenderConfig | null>;
+declare function findVinextRouteRootConfigInPlugins(plugins: PluginOption[] | undefined): Promise<VinextRouteRootConfig | null>;
 declare function loadVinextPrerenderConfigFromViteConfig(vite: ViteConfigLoader, root: string): Promise<ResolvedVinextPrerenderConfig | null>;
 declare function loadVinextRouteRootConfigFromViteConfig(vite: ViteConfigLoader, root: string): Promise<VinextRouteRootConfig | null>;
 declare function resolveVinextPrerenderDecision(options: {