vinext 1.2.0 → 1.3.0

package/dist/client/navigation-runtime.js

@@ -1,20 +1,15 @@
 import { isUnknownRecord } from "../utils/record.js";
+import { decodeBrowserRouteManifest } from "../routing/browser-route-manifest.js";
 import { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION } from "./browser-globals.js";
 //#region src/client/navigation-runtime.ts
 const NAVIGATION_RUNTIME_KEY = Symbol.for(NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION);
 const ROUTE_MANIFEST_SEGMENT_GRAPH_MAP_KEYS = [
-	"boundaries",
-	"defaults",
 	"interceptions",
 	"interceptionsBySlotId",
 	"layouts",
-	"pages",
 	"rootBoundaries",
-	"routeHandlers",
 	"routes",
-	"slotBindings",
-	"slots",
-	"templates"
+	"slotBindings"
 ];
 function createNavigationRuntime() {
 	return {
@@ -31,7 +26,7 @@ function readRuntimeWindow() {
 }
 function isNavigationRuntimeFunctions(value) {
 	if (!isUnknownRecord(value)) return false;
-	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "getPrefetchRouterState")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks")) && isOptionalRuntimeFunction(Reflect.get(value, "preparePrefetchResponse")) && isOptionalRuntimeFunction(Reflect.get(value, "claimCurrentHistoryTreeSnapshot")) && isOptionalRuntimeFunction(Reflect.get(value, "commitAppOwnedHistoryStateWrite")) && isOptionalRuntimeFunction(Reflect.get(value, "discardPendingNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "flushCommittingNavigationUrl"));
+	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "getPrefetchRouterState")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks")) && isOptionalRuntimeFunction(Reflect.get(value, "preparePrefetchResponse")) && isOptionalRuntimeFunction(Reflect.get(value, "claimCurrentHistoryTreeSnapshot")) && isOptionalRuntimeFunction(Reflect.get(value, "commitAppOwnedHistoryStateWrite")) && isOptionalRuntimeFunction(Reflect.get(value, "discardPendingNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "flushCommittingNavigationUrl")) && isOptionalRuntimeFunction(Reflect.get(value, "loadRouteManifest"));
 }
 function isNavigationRuntimeRscChunk(value) {
 	if (typeof value === "string") return true;
@@ -49,6 +44,7 @@ function isNavigationRuntimeParams(value) {
 }
 function isNavigationRuntimeRscBootstrap(value) {
 	if (!isUnknownRecord(value)) return false;
+	const compatibilityId = Reflect.get(value, "compatibilityId");
 	const done = Reflect.get(value, "done");
 	const dynamicStaleTimeSeconds = Reflect.get(value, "dynamicStaleTimeSeconds");
 	const initialCacheKind = Reflect.get(value, "initialCacheKind");
@@ -58,7 +54,7 @@ function isNavigationRuntimeRscBootstrap(value) {
 	const renderedSearch = Reflect.get(value, "renderedSearch");
 	const rsc = Reflect.get(value, "rsc");
 	const staleTimeSeconds = Reflect.get(value, "staleTimeSeconds");
-	return (done === void 0 || typeof done === "boolean") && isOptionalStaleTimeSeconds(dynamicStaleTimeSeconds) && (initialCacheKind === void 0 || initialCacheKind === "dynamic" || initialCacheKind === "static") && (searchParamsFromBrowser === void 0 || typeof searchParamsFromBrowser === "boolean") && (nav === void 0 || isNavigationRuntimeSnapshot(nav)) && (params === void 0 || isNavigationRuntimeParams(params)) && (renderedSearch === void 0 || typeof renderedSearch === "string") && Array.isArray(rsc) && rsc.every(isNavigationRuntimeRscChunk) && isOptionalStaleTimeSeconds(staleTimeSeconds);
+	return (compatibilityId === void 0 || typeof compatibilityId === "string") && (done === void 0 || typeof done === "boolean") && isOptionalStaleTimeSeconds(dynamicStaleTimeSeconds) && (initialCacheKind === void 0 || initialCacheKind === "dynamic" || initialCacheKind === "static") && (searchParamsFromBrowser === void 0 || typeof searchParamsFromBrowser === "boolean") && (nav === void 0 || isNavigationRuntimeSnapshot(nav)) && (params === void 0 || isNavigationRuntimeParams(params)) && (renderedSearch === void 0 || typeof renderedSearch === "string") && Array.isArray(rsc) && rsc.every(isNavigationRuntimeRscChunk) && isOptionalStaleTimeSeconds(staleTimeSeconds);
 }
 function isOptionalStaleTimeSeconds(value) {
 	return value === void 0 || typeof value === "number" && Number.isFinite(value) && value >= 0;
@@ -71,7 +67,7 @@ function isNullableString(value) {
 }
 function isNavigationRuntimeInterception(value) {
 	if (!isUnknownRecord(value)) return false;
-	return typeof value.id === "string" && typeof value.sourcePattern === "string" && isReadonlyStringArray(value.sourcePatternParts) && typeof value.targetPattern === "string" && isReadonlyStringArray(value.targetPatternParts) && typeof value.slotId === "string" && isNullableString(value.ownerLayoutId) && isNullableString(value.interceptingRouteId) && isNullableString(value.targetRouteId);
+	return typeof value.id === "string" && isReadonlyStringArray(value.sourcePatternParts) && isReadonlyStringArray(value.targetPatternParts) && typeof value.slotId === "string" && isNullableString(value.ownerLayoutId) && isNullableString(value.targetRouteId);
 }
 function isNavigationRuntimeInterceptionArray(value) {
 	return Array.isArray(value) && value.every(isNavigationRuntimeInterception);
@@ -150,6 +146,41 @@ function ensureNavigationRuntimeRscBootstrapForRuntime(runtime) {
 	}
 	return rscBootstrap;
 }
+/**
+* The browser entry does not inline the RouteManifest: the manifest grows with
+* every route of the app, so it lives in its own chunk that loads alongside
+* hydration. The navigation planner needs it to classify commits (root layout
+* changes, intercepted payloads, preserved slots), so navigations, commits and
+* prefetches that read it wait for this load first.
+*/
+function createNavigationRuntimeRouteManifestLoader(importManifest) {
+	let loaded = false;
+	let reportedFailure = false;
+	let pending = null;
+	return () => {
+		if (loaded) return null;
+		pending ??= importManifest().then(({ default: wire }) => {
+			registerNavigationRuntimeBootstrap({ routeManifest: wire === null ? null : decodeBrowserRouteManifest(wire) });
+			loaded = true;
+			return true;
+		}).catch((error) => {
+			pending = null;
+			if (!reportedFailure) {
+				reportedFailure = true;
+				console.error("[vinext] Failed to load the App Router route manifest:", error);
+			}
+			return false;
+		});
+		return pending;
+	};
+}
+/**
+* Starts or joins the RouteManifest load. Resolves whether it loaded, and
+* returns null once it has (or when no App Router runtime registered a loader).
+*/
+function loadNavigationRuntimeRouteManifest() {
+	return getNavigationRuntime()?.functions.loadRouteManifest?.() ?? null;
+}
 function hasAppNavigationRuntime() {
 	return typeof getNavigationRuntime()?.functions.navigate === "function";
 }
@@ -169,4 +200,4 @@ function hasAppNavigationRuntimeBootstrap() {
 	return getNavigationRuntime() !== null;
 }
 //#endregion
-export { NAVIGATION_RUNTIME_KEY, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions };
+export { NAVIGATION_RUNTIME_KEY, createNavigationRuntimeRouteManifestLoader, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, loadNavigationRuntimeRouteManifest, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions };

package/dist/client/vinext-next-data.d.ts

@@ -21,7 +21,6 @@ export type VinextLinkPrefetchRoute = {
  */
 export type VinextPagesLinkPrefetchRoute = {
   canPrefetchLoadingShell: false;
-  documentOnly?: boolean;
   isDynamic: boolean;
   patternParts: string[];
   requiresDynamicNavigationRequest?: boolean;

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

@@ -2,34 +2,8 @@ import { HasCondition, NextHeader, NextI18nConfig, NextRedirect, NextRewrite } f
 import { RequestContext, normalizeHost, parseCookies, requestContextFromRequest } from "./request-context.js";
 import { RedirectDestinationQueryPart } from "./destination-params.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import { configSourceError, matchConfigPattern } from "./config-source.js";
 //#region src/config/config-matchers.d.ts
-/**
- * Detect regex patterns vulnerable to catastrophic backtracking (ReDoS).
- *
- * 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.
- */
-export 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.
- *
- * Logs a warning when a pattern is rejected so developers can fix their config.
- */
-export declare function safeRegExp(pattern: string, flags?: string): RegExp | null;
-/**
- * Convert a Next.js header/rewrite/redirect source pattern into a regex string.
- *
- * Regex groups in the source (e.g. `(\d+)`) are extracted first, the remaining
- * text is escaped/converted in a **single pass** (avoiding chained `.replace()`
- * which CodeQL flags as incomplete sanitization), then groups are restored.
- */
-export declare function escapeHeaderSource(source: string): string;
 /**
  * basePath gating state passed alongside the pathname to every matcher.
  *
@@ -75,7 +49,6 @@ export declare function applyMiddlewareRequestHeaders(middlewareHeaders: Record<
   postMwReqCtx: RequestContext;
 };
 export declare function checkHasConditions(has: HasCondition[] | undefined, missing: HasCondition[] | undefined, ctx: RequestContext): boolean;
-export declare function matchConfigPattern(pathname: string, pattern: string): Record<string, string> | null;
 /**
  * A matched config redirect. `destinationQuery` holds the destination query's
  * parts, split before params were substituted, for merging the request query.
@@ -220,17 +193,19 @@ export declare function matchHeaders(pathname: string, headers: NextHeader[], ct
  *     starts with `/:nextInternalLocale(en|sv|nl)` so that locale-prefixed
  *     URLs match. For redirects only, a second variant prefixed with
  *     `/${defaultLocale}` is also emitted, matching Next.js exactly.
- *   - **Vinext divergence**: we ALSO retain the original (unprefixed) source
- *     so that requests for the default locale that arrive without a prefix
- *     still match. Next.js solves this upstream by path-normalising every
- *     incoming default-locale request to include the prefix
- *     (`resolve-routes.ts` lines ~251-263); vinext currently does that
- *     normalisation only inside the pages-server-entry route matcher, so
- *     the rewrite/redirect matcher would otherwise miss unprefixed paths.
- *     Keeping the unprefixed variant gives functionally identical behaviour
- *     without requiring a server-wide path normalisation pass. The original
- *     source is appended LAST so the locale-aware variants win when both
- *     forms could match.
+ *   - Headers get only that variant, exactly like Next.js. Every header
+ *     matcher caller splices the (domain-aware) default locale into
+ *     unprefixed request paths first (`normalizeDefaultLocalePathname`,
+ *     mirroring `resolve-routes.ts`), so `/about` is matched as `/en/about`.
+ *     `/_next/*` paths are left unprefixed and therefore only match
+ *     `locale: false` rules, as in Next.js.
+ *   - **Vinext divergence (redirects/rewrites only)**: we ALSO retain the
+ *     original (unprefixed) source, appended LAST so the locale-aware
+ *     variants win when both forms could match. Their callers normalise
+ *     default-locale paths too, so this is a legacy fallback. Headers never
+ *     get it: it would apply rules Next.js skips (`/((?!api).*)` would match
+ *     `/fr/api/x` as `fr/api/x`), and default-locale requests would match
+ *     both variants, appending additive headers such as `Set-Cookie` twice.
  *
  * Destinations that are local (start with `/`) are similarly rewritten with
  * `/:nextInternalLocale` for the locale-capture variant so the locale
@@ -243,4 +218,4 @@ export declare function applyLocaleToRoutes<T extends NextRedirect | NextRewrite
   trailingSlash?: boolean;
 }): T[];
 //#endregion
-export { type RequestContext, isExternalUrl, normalizeHost, parseCookies, requestContextFromRequest };
+export { type RequestContext, configSourceError, isExternalUrl, matchConfigPattern, normalizeHost, parseCookies, requestContextFromRequest };