vinext 1.4.3 → 1.4.5

package/dist/routing/pages-router.d.ts

@@ -1,6 +1,5 @@
 import { ValidFileMatcher } from "./file-matcher.js";
 import { patternToNextFormat } from "./route-validation.js";
-//#region src/routing/pages-router.d.ts
 export type Route = {
   /** URL pattern, e.g. "/" or "/about" or "/posts/:id" */
   pattern: string;
@@ -48,5 +47,4 @@ export declare function matchRoute(url: string, routes: Route[]): {
  * - pages/api/users/[id].ts -> /api/users/:id
  */
 export declare function apiRouter(pagesDir: string, pageExtensions?: readonly string[], matcher?: ValidFileMatcher): Promise<Route[]>;
-//#endregion
 export { patternToNextFormat };

package/dist/routing/pages-router.js

@@ -1,9 +1,9 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { createValidFileMatcher, scanWithExtensions } from "./file-matcher.js";
 import { decodeRouteSegment, sortRoutes } from "./utils.js";
+import { createValidFileMatcher, scanWithExtensions } from "./file-matcher.js";
 import { patternToNextFormat, validateRoutePatterns } from "./route-validation.js";
 import { createRouteTrieCache, matchRouteWithTrieRawPathname } from "./route-matching.js";
-//#region src/routing/pages-router.ts
+// src/routing/pages-router.ts
 /** Next.js special pages that should not produce routes. */
 const RESERVED_PAGE_NAMES = /* @__PURE__ */ new Set([
 	"_app",
@@ -153,5 +153,4 @@ async function scanApiRoutes(pagesDir, matcher) {
 	sortRoutes(routes);
 	return routes;
 }
-//#endregion
 export { apiRouter, invalidateRouteCache, matchRoute, pagesRouter, patternToNextFormat };

package/dist/routing/route-matching.d.ts

@@ -1,5 +1,4 @@
 import { TrieNode } from "./route-trie.js";
-//#region src/routing/route-matching.d.ts
 type RouteTrieCache<R extends {
   patternParts: string[];
 }> = WeakMap<R[], TrieNode<R>>;
@@ -35,5 +34,4 @@ export declare function matchRouteWithTrieRawPathname<R extends {
   route: R;
   params: Record<string, string | string[]>;
 } | null;
-//#endregion
 export {};

package/dist/routing/route-matching.js

@@ -1,6 +1,6 @@
 import { normalizePathnameForRouteMatch } from "./utils.js";
 import { buildRouteTrie, trieMatch } from "./route-trie.js";
-//#region src/routing/route-matching.ts
+// src/routing/route-matching.ts
 /**
 * Shared route-match preamble used by both Pages Router and App Router.
 *
@@ -52,5 +52,4 @@ function matchRouteWithTrieRawPathname(url, routes, cache) {
 	const trie = getOrBuildTrie(cache, routes);
 	return trieMatch(trie, urlParts);
 }
-//#endregion
 export { createRouteTrieCache, matchRouteWithTrie, matchRouteWithTrieRawPathname };

package/dist/routing/route-pattern.d.ts

@@ -1,4 +1,3 @@
-//#region src/routing/route-pattern.d.ts
 export type RoutePatternParams = Record<string, string | string[]>;
 export declare function routePatternParts(pathname: string): string[];
 export declare function routePattern(pathname: string): string;
@@ -68,5 +67,4 @@ export declare function normalizeStaticPathname(pathname: string): string;
  * locale handling should be added here, not duplicated at call sites.
  */
 export declare function normalizeStaticPathsEntry(entry: StaticPathsEntry, routePattern: string): NormalizedStaticPathsEntry;
-//#endregion
 export {};

package/dist/routing/route-pattern.js

@@ -1,5 +1,5 @@
 import { decodeMatchedParams } from "./utils.js";
-//#region src/routing/route-pattern.ts
+// src/routing/route-pattern.ts
 function routePatternPart(segment) {
 	if (segment.startsWith("[[...") && segment.endsWith("]]")) return `:${segment.slice(5, -2)}*`;
 	if (segment.startsWith("[...") && segment.endsWith("]")) return `:${segment.slice(4, -1)}+`;
@@ -191,5 +191,4 @@ function normalizeStaticPathsEntry(entry, routePattern) {
 	if (params === void 0 || params === null) return { error: `getStaticPaths entry is missing the \`params\` key for pattern \`${routePattern}\`. Return either a string path or { params: { ... } }.` };
 	return { params };
 }
-//#endregion
 export { extractRawRoutePatternParams, fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternRaw, matchRoutePatternWithOptionalDynamicSegments, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };

package/dist/routing/route-trie.d.ts

@@ -1,4 +1,3 @@
-//#region src/routing/route-trie.d.ts
 /**
  * Trie (prefix tree) for O(depth) route matching.
  *
@@ -66,5 +65,4 @@ export declare function trieMatch<R>(root: TrieNode<R>, urlParts: string[]): {
 export declare function trieMatchRaw<R>(root: TrieNode<R>, urlParts: string[]): {
   route: R;
   params: Record<string, string | string[]>;
-} | null;
-//#endregion
+} | null;

package/dist/routing/route-trie.js

@@ -1,5 +1,5 @@
 import { buildParams, decodeMatchedParams } from "./utils.js";
-//#region src/routing/route-trie.ts
+// src/routing/route-trie.ts
 function createNode() {
 	return {
 		staticChildren: /* @__PURE__ */ new Map(),
@@ -142,5 +142,4 @@ function match(node, urlParts, index, entries) {
 	}
 	return null;
 }
-//#endregion
 export { buildRouteTrie, trieMatch, trieMatchRaw };

package/dist/routing/route-validation.d.ts

@@ -1,4 +1,3 @@
-//#region src/routing/route-validation.d.ts
 /**
  * Dynamic route validation and sorting adapted from Next.js' sorted-routes implementation.
  * Source:
@@ -10,5 +9,4 @@
  */
 export declare function getSortedRoutes(pages: readonly string[]): string[];
 export declare function patternToNextFormat(pattern: string): string;
-export declare function validateRoutePatterns(patterns: readonly string[]): void;
-//#endregion
+export declare function validateRoutePatterns(patterns: readonly string[]): void;

package/dist/routing/route-validation.js

@@ -1,5 +1,5 @@
 import { removeTrailingSlash } from "../utils/base-path.js";
-//#region src/routing/route-validation.ts
+// src/routing/route-validation.ts
 /**
 * Dynamic route validation and sorting adapted from Next.js' sorted-routes implementation.
 * Source:
@@ -120,5 +120,4 @@ function validateRoutePatterns(patterns) {
 	}
 	root.smoosh();
 }
-//#endregion
 export { getSortedRoutes, patternToNextFormat, validateRoutePatterns };

package/dist/routing/utils.d.ts

@@ -1,4 +1,3 @@
-//#region src/routing/utils.d.ts
 /**
  * Sort routes by precedence — lower score sorts first (higher priority), with a
  * lexicographic tiebreaker on the pattern for determinism. Sorts in place and
@@ -90,5 +89,4 @@ export declare function isCatchAllSegment(segment: string): boolean;
  * Optional-catch-all filesystem segment, e.g. `[[...slug]]`. Unlike a catch-all,
  * this matches zero or more URL segments.
  */
-export declare function isOptionalCatchAllSegment(segment: string): boolean;
-//#endregion
+export declare function isOptionalCatchAllSegment(segment: string): boolean;

package/dist/routing/utils.js

@@ -1,4 +1,4 @@
-//#region src/routing/utils.ts
+// src/routing/utils.ts
 /**
 * Route precedence — lower score is higher priority.
 * Matches Next.js specificity rules:
@@ -209,5 +209,4 @@ function isCatchAllSegment(segment) {
 function isOptionalCatchAllSegment(segment) {
 	return segment.startsWith("[[...") && segment.endsWith("]]") && segment.length > 7;
 }
-//#endregion
 export { buildParams, compareHybridRoutePatterns, decodeMatchedParams, decodeRouteSegment, isCatchAllSegment, isInvisibleSegment, isOptionalCatchAllSegment, normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict, sortRoutes, splitPathSegments, splitPathnameForRouteMatch };

package/dist/server/accept-encoding.d.ts

@@ -1,5 +1,4 @@
 import { IncomingMessage } from "node:http";
-//#region src/server/accept-encoding.d.ts
 type ContentEncoding = "zstd" | "br" | "gzip" | "deflate";
 export type NegotiatedEncoding = ContentEncoding | "identity";
 /** Parsed explicit coding qualities plus the wildcard quality, when present. */
@@ -23,5 +22,4 @@ export declare function selectContentEncoding<T extends ContentEncoding>(parsed:
 export declare const HAS_ZSTD: boolean;
 /** Select by client q-value first, then zstd > br > gzip > deflate > identity. */
 export declare function negotiateEncoding(req: IncomingMessage): NegotiatedEncoding;
-//#endregion
 export {};

package/dist/server/accept-encoding.js

@@ -1,5 +1,5 @@
 import zlib from "node:zlib";
-//#region src/server/accept-encoding.ts
+// src/server/accept-encoding.ts
 /** Parse an Accept-Encoding header into exact-token numeric qualities. */
 function parseAcceptedEncodings(accept) {
 	const qualities = /* @__PURE__ */ new Map();
@@ -88,5 +88,4 @@ function negotiateEncoding(req) {
 		"deflate"
 	]);
 }
-//#endregion
 export { HAS_ZSTD, getEncodingQuality, negotiateEncoding, parseAcceptedEncodings, selectAcceptedEncoding, selectContentEncoding };

package/dist/server/api-handler.d.ts

@@ -2,7 +2,6 @@ import { NextI18nConfig } from "../config/next-config.js";
 import { Route } from "../routing/pages-router.js";
 import { ModuleImporter } from "./instrumentation.js";
 import { IncomingMessage, ServerResponse } from "node:http";
-//#region src/server/api-handler.d.ts
 /**
  * Handle an API route request.
  * Returns true if the request was handled, false if no API route matched.
@@ -16,5 +15,4 @@ export declare function handleApiRoute(runner: ModuleImporter, req: IncomingMess
   skipTrailingSlashRedirect?: boolean;
   /** Edge API request pathname, with any basePath the dev server stripped restored. */
   requestPathname?: string;
-}): Promise<boolean>;
-//#endregion
+}): Promise<boolean>;

package/dist/server/api-handler.js

@@ -1,21 +1,21 @@
-import { matchRoute } from "../routing/pages-router.js";
 import "./server-globals.js";
-import { resolveRequestHost, resolveRequestProtocol } from "./proxy-trust.js";
-import { NextRequest } from "../shims/server.js";
+import { matchRoute } from "../routing/pages-router.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
-import { logRequestError } from "./request-error-log.js";
 import { mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
-import { tracePagesApiHandler } from "./pages-execution-tracing.js";
-import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT, resolveBodyParserConfig } from "./pages-body-parser-config.js";
 import { PagesBodyParseError, createPagesBodyDecoder, isJsonMediaType } from "./pages-media-type.js";
-import { performOnDemandRevalidate } from "./pages-revalidate.js";
-import { attachPagesPreviewApi, attachPagesRequestCookies } from "./pages-node-compat.js";
 import { finalizeEdgeApiResponse, isEdgeApiRuntime } from "./edge-api-runtime.js";
+import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT, resolveBodyParserConfig } from "./pages-body-parser-config.js";
+import { resolveRequestHost, resolveRequestProtocol } from "./proxy-trust.js";
+import { performOnDemandRevalidate } from "./pages-revalidate.js";
+import { NextRequest } from "../shims/server.js";
 import { signalFromNodeResponse } from "./node-response-signal.js";
+import { attachPagesPreviewApi, attachPagesRequestCookies } from "./pages-node-compat.js";
+import { tracePagesApiHandler } from "./pages-execution-tracing.js";
+import { logRequestError } from "./request-error-log.js";
 import { Buffer } from "node:buffer";
 import { decode } from "node:querystring";
 import { Stream } from "node:stream";
-//#region src/server/api-handler.ts
+// src/server/api-handler.ts
 /**
 * Default request body size (1 MB). Matches Next.js default bodyParser sizeLimit.
 * @see https://nextjs.org/docs/pages/building-your-application/routing/api-routes#custom-config
@@ -263,11 +263,10 @@ async function handleApiRoute(runner, req, res, url, apiRoutes, nextConfig) {
 			const response = finalizeEdgeApiResponse(handlerResponse, "node");
 			res.statusCode = response.status;
 			res.statusMessage = response.statusText;
-			const setCookieHeaders = response.headers.getSetCookie();
 			response.headers.forEach((value, name) => {
 				if (name !== "set-cookie") res.setHeader(name, value);
 			});
-			if (setCookieHeaders.length) res.setHeader("set-cookie", setCookieHeaders);
+			for (const cookie of response.headers.getSetCookie()) res.appendHeader("set-cookie", cookie);
 			await writeEdgeApiResponseBody(res, response.body, nextRequest.signal);
 			return true;
 		}
@@ -308,5 +307,4 @@ async function handleApiRoute(runner, req, res, url, apiRoutes, nextConfig) {
 		return true;
 	}
 }
-//#endregion
 export { handleApiRoute };

package/dist/server/app-action-forwarding.d.ts

@@ -1,6 +1,5 @@
 import { ExecutionContextLike } from "../shims/request-context.js";
 import { AppMiddlewareContext } from "./app-middleware.js";
-//#region src/server/app-action-forwarding.d.ts
 type ActionOwnerManifest = Readonly<Record<string, readonly string[]>>;
 type ForwardServerActionOptions = {
   actionId: string;
@@ -22,5 +21,4 @@ export declare function createForwardedActionContext(executionContext: Execution
   actionForwarded: true;
 } & Partial<ExecutionContextLike>;
 export declare function forwardServerActionIfNeeded(options: ForwardServerActionOptions): Promise<Response | null>;
-//#endregion
 export {};

package/dist/server/app-action-forwarding.js

@@ -1,14 +1,15 @@
-import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
-import "./headers.js";
-import { attachRequestCfMetadata, processMiddlewareHeaders, validateCsrfOrigin } from "./request-pipeline.js";
+import "../shims/internal/cookies.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
+import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
+import { isStreamedActionRedirectResponse, markStreamedActionRedirectResponse } from "./app-rsc-response-finalizer.js";
 import { RequestCookies, ResponseCookies } from "../shims/server.js";
-import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { getSetCookieName } from "./cookie-utils.js";
-import "../shims/internal/cookies.js";
-import { isStreamedActionRedirectResponse, markStreamedActionRedirectResponse } from "./app-rsc-response-finalizer.js";
-import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
-//#region src/server/app-action-forwarding.ts
+import "./headers.js";
+import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
+import "./app-rsc-cache-busting.js";
+import { respondServerActionNotFound } from "./server-action-not-found.js";
+import { attachRequestCfMetadata, processMiddlewareHeaders, validateCsrfOrigin } from "./request-pipeline.js";
+// src/server/app-action-forwarding.ts
 const ACTION_FORWARD_FORBIDDEN_HEADERS = /* @__PURE__ */ new Set([
 	"accept-encoding",
 	"keepalive",
@@ -122,11 +123,7 @@ async function forwardServerActionIfNeeded(options) {
 	if (ownerPatterns?.includes("*")) return null;
 	if (ownerPatterns && options.currentRoutePattern && ownerPatterns.includes(options.currentRoutePattern)) return null;
 	const ownerPath = ownerPatterns?.[0];
-	if (!ownerPath) {
-		console.warn(getServerActionNotFoundMessage(options.actionId));
-		options.clearRequestContext();
-		return filterActionForwardResponse(createServerActionNotFoundResponse(), options.middlewareContext.headers, options.middlewareContext.status);
-	}
+	if (!ownerPath) return filterActionForwardResponse(respondServerActionNotFound(options.actionId, options.clearRequestContext), options.middlewareContext.headers, options.middlewareContext.status);
 	if (options.request.headers.get("x-action-forwarded")) {
 		options.clearRequestContext();
 		return emptyActionForwardResponse(options.middlewareContext);
@@ -152,5 +149,4 @@ async function forwardServerActionIfNeeded(options) {
 	forwardResponse.body?.cancel().catch(() => {});
 	return emptyActionForwardResponse(options.middlewareContext);
 }
-//#endregion
 export { areServerActionsOwnedByRoute, createForwardedActionContext, forwardServerActionIfNeeded };

package/dist/server/app-action-request.d.ts

@@ -1,3 +1 @@
-//#region src/server/app-action-request.d.ts
-export declare function isPossibleAppRouteActionRequest(request: Pick<Request, "headers" | "method">): boolean;
-//#endregion
+export declare function isPossibleAppRouteActionRequest(request: Pick<Request, "headers" | "method">): boolean;

package/dist/server/app-action-request.js

@@ -1,9 +1,8 @@
 import "./headers.js";
-//#region src/server/app-action-request.ts
+// src/server/app-action-request.ts
 function isPossibleAppRouteActionRequest(request) {
 	if (request.method.toUpperCase() !== "POST") return false;
 	const contentType = request.headers.get("content-type");
 	return request.headers.has("x-rsc-action") || request.headers.has("next-action") || contentType === "application/x-www-form-urlencoded" || contentType?.startsWith("multipart/form-data") === true;
 }
-//#endregion
 export { isPossibleAppRouteActionRequest };

package/dist/server/app-bfcache-id.d.ts

@@ -1,5 +1,2 @@
-//#region src/server/app-bfcache-id.d.ts
 export declare const INITIAL_BFCACHE_ID = "0";
-export declare const PUBLIC_INITIAL_BFCACHE_ID = "_b_0_";
-export declare function isBfcacheSegmentId(id: string): boolean;
-//#endregion
+export declare const PUBLIC_INITIAL_BFCACHE_ID = "_b_0_";

package/dist/server/app-bfcache-id.js

@@ -1,11 +1,4 @@
-import { AppElementsWire } from "./app-elements-wire.js";
-import "./app-elements.js";
-//#region src/server/app-bfcache-id.ts
+// src/server/app-bfcache-id.ts
 const INITIAL_BFCACHE_ID = "0";
 const PUBLIC_INITIAL_BFCACHE_ID = "_b_0_";
-function isBfcacheSegmentId(id) {
-	const parsed = AppElementsWire.parseElementKey(id);
-	return parsed?.kind === "layout" || parsed?.kind === "page" || parsed?.kind === "slot" || parsed?.kind === "template";
-}
-//#endregion
-export { INITIAL_BFCACHE_ID, PUBLIC_INITIAL_BFCACHE_ID, isBfcacheSegmentId };
+export { INITIAL_BFCACHE_ID, PUBLIC_INITIAL_BFCACHE_ID };

package/dist/server/app-bfcache-identity.d.ts

@@ -1,8 +1,8 @@
-import { BfcacheSegmentIdentity } from "./bfcache-identity.js";
-import { AppElements, AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { AppElements, AppElementsWire } from "./app-elements-wire.js";
 import { BfcacheIdMap } from "./app-history-state.js";
-//#region src/server/app-bfcache-identity.d.ts
+import { BfcacheSegmentIdentity } from "./bfcache-identity.js";
+export declare function isBfcacheSegmentId(id: string): boolean;
 export type BfcacheSegmentIdentityMap = Readonly<Record<string, BfcacheSegmentIdentity>>;
 export type InitialBfcacheMaps = Readonly<{
   bfcacheIds: BfcacheIdMap;
@@ -31,5 +31,4 @@ export declare function preserveBfcacheIdsForMergedElements(options: {
   preservedElementIds?: readonly string[];
   preservePreviousIds?: readonly string[];
 }): BfcacheIdMap;
-//#endregion
 export {};

package/dist/server/app-bfcache-identity.js

@@ -1,8 +1,12 @@
-import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { isBfcacheSegmentId } from "./app-bfcache-id.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-bfcache-id.js";
 import { isNestedBfcacheSlotSegmentIdFor } from "./bfcache-identity.js";
-//#region src/server/app-bfcache-identity.ts
+// src/server/app-bfcache-identity.ts
+function isBfcacheSegmentId(id) {
+	const parsed = AppElementsWire.parseElementKey(id);
+	return parsed?.kind === "layout" || parsed?.kind === "page" || parsed?.kind === "slot" || parsed?.kind === "template";
+}
 let nextBfcacheId = 0;
 function rememberBfcacheId(value) {
 	const match = /^_b_(\d+)_$/.exec(value);
@@ -76,5 +80,4 @@ function preserveBfcacheIdsForMergedElements(options) {
 	}
 	return ids;
 }
-//#endregion
-export { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createInitialBfcacheMaps, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements };
+export { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createInitialBfcacheMaps, createNextBfcacheIdMap, isBfcacheSegmentId, preserveBfcacheIdsForMergedElements };

package/dist/server/app-browser-action-result.d.ts

@@ -1,6 +1,5 @@
-import { OperationLane } from "./operation-token.js";
 import { ServerActionResultFacts } from "./navigation-planner.js";
-//#region src/server/app-browser-action-result.d.ts
+import { OperationLane } from "./operation-token.js";
 export type AppBrowserServerActionResult<TRoot> = {
   root?: TRoot;
   returnValue?: {
@@ -62,5 +61,4 @@ type DiscardedServerActionRefreshSchedulerOptions = {
   runRefresh: () => void;
 };
 export declare function createDiscardedServerActionRefreshScheduler(options: DiscardedServerActionRefreshSchedulerOptions): DiscardedServerActionRefreshScheduler;
-//#endregion
 export {};

package/dist/server/app-browser-action-result.js

@@ -1,6 +1,6 @@
 import { ACTION_REVALIDATED_HEADER } from "./headers.js";
 import { VINEXT_RSC_CONTENT_TYPE } from "./app-rsc-cache-busting.js";
-//#region src/server/app-browser-action-result.ts
+// src/server/app-browser-action-result.ts
 const ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC = 1;
 const ACTION_DID_REVALIDATE_DYNAMIC_ONLY = 2;
 /**
@@ -121,5 +121,4 @@ function createDiscardedServerActionRefreshScheduler(options) {
 		}
 	};
 }
-//#endregion
 export { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, resolveServerActionOperationLane, shouldClearClientNavigationCachesForServerActionResult, shouldScheduleRefreshForDiscardedServerAction, shouldSyncServerActionHttpFallbackHead };

package/dist/server/app-browser-entry.js

@@ -1,53 +1,54 @@
-import { VINEXT_MOUNTED_LAYOUTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER } from "./headers.js";
-import { AppRouterContext } from "../shims/internal/app-router-context.js";
-import { installWindowNext, setWindowNextInternalSourcePage } from "../client/window-next.js";
-import { retryScrollTo, scrollToHashTargetOnNextFrame } from "../shims/hash-scroll.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, formatRscRequestPath, isRscCompatibilityIdCompatible } from "./app-rsc-cache-busting.js";
-import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners } from "../client/app-nav-failure-handler.js";
-import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
+import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
+import { __basePath, activateNavigationSnapshot, commitClientNavigationState, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, getClientNavigationRenderContext, replaceClientParamsWithoutNotify, setClientParams, setPendingPathname, useRouter } from "../shims/navigation.js";
+import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, appRouterInstance, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, deletePrefetchResponseSnapshot, disableNavigationResponsePrefetchCacheReuse, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidateDynamicPrefetchCache, invalidatePrefetchCache, invalidateVisitedResponsePrefetches, parseRenderedPathAndSearchHeader, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setMountedSlotsHeader, trackAppRouterNavigationInFlight } from "../shims/app-router-navigation.js";
 import { createNavigationRuntimeRouteManifestLoader, getNavigationRuntime, loadNavigationRuntimeRouteManifest, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
-import { AppElementsWire } from "./app-elements-wire.js";
-import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
-import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
-import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
-import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
-import { isExternalHistoryState, readHistoryStateActiveRoutePaths, readHistoryStatePreviousNextUrl, resolveActiveRoutePaths } from "./app-history-state.js";
-import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
-import { stripRscCompletionMetadataResponse } from "./rsc-completion-metadata.js";
-import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
-import { navigationPlanner } from "./navigation-planner.js";
-import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
+import { retryScrollTo, scrollToHashTargetOnNextFrame } from "../shims/hash-scroll.js";
+import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
+import { installWindowNext, setWindowNextInternalSourcePage } from "../client/window-next.js";
+import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
 import { getBfcacheIdMapContext, getNavigationContext, setNavigationContext } from "../shims/navigation-context-state.js";
-import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, activateNavigationSnapshot, appRouterInstance, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, disableNavigationResponsePrefetchCacheReuse, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidateDynamicPrefetchCache, invalidatePrefetchCache, invalidateVisitedResponsePrefetches, parseRenderedPathAndSearchHeader, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, trackAppRouterNavigationInFlight, useRouter } from "../shims/navigation.js";
-import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
-import { createMountedLayoutsHeader, holdsSkippedLayouts } from "./app-mounted-layouts.js";
-import { BfcacheIdentityMapContext, bindAppElementsRenderedSearch, isBfcacheIdentityRetained, setAppElementsRenderedSearch } from "../shims/slot.js";
-import { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl } from "./app-browser-state.js";
+import { AppElementsWire } from "./app-elements-wire.js";
 import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch, navigateDocumentDirectly } from "./app-browser-navigation-controller.js";
+import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
+import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
+import { isExternalHistoryState, readHistoryStateActiveRoutePaths, readHistoryStatePreviousNextUrl, resolveActiveRoutePaths } from "./app-history-state.js";
 import { createAppRouteTree } from "./app-route-tree.js";
 import { shouldRecoverSamePathSearchCommitOnResponseCompletion } from "./app-browser-navigation-response.js";
+import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
+import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
 import { createSupplementalRefreshCoordinator, mergeRefreshedParallelSlot, requireCompleteSupplementalRefresh, resolvePersistedRefreshInterceptions, resolvePersistedSourcePageRefreshes, resolveServerActionSupplementalRefresh, resolveSupplementalRefreshes } from "./app-browser-supplemental-refresh.js";
 import { createAppBrowserNavigationAbortCoordinator } from "./app-browser-navigation-abort.js";
 import { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition, resolveFetchedHydrationLocation } from "./app-browser-hydration.js";
+import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
+import { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl } from "./app-browser-state.js";
 import { AppBrowserHistoryController } from "./app-browser-history-controller.js";
 import { createVisitedResponseCacheEntry, deleteAllVisitedResponseCacheEntries, deleteVisitedResponseCacheEntry, findVisitedResponseCacheEntry, findVisitedResponseForFullPrefetch, hasNavigationResponseHistoryLifetime, isVisitedResponseCacheEntryFresh, revokeHistoryRestoreNavigationReuse } from "./app-visited-response-cache.js";
 import { createPopstateRestoreHandler, restoreSynchronousPopstateScrollPosition, shouldCommitPopstateUrlWithoutNavigation } from "./app-browser-popstate.js";
-import DefaultGlobalError from "../shims/default-global-error.js";
 import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
+import DefaultGlobalError from "../shims/default-global-error.js";
+import { AppRouterContext } from "../shims/internal/app-router-context.js";
+import { BfcacheIdentityMapContext, bindAppElementsRenderedSearch, isBfcacheIdentityRetained, setAppElementsRenderedSearch } from "../shims/slot.js";
 import { createDevOnCaughtError, createOnUncaughtError, createProdOnCaughtError, createProdOnRecoverableError } from "./app-browser-error.js";
 import { createHydrationCachePublication } from "./app-hydration-cache-publication.js";
+import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners } from "../client/app-nav-failure-handler.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, formatRscRequestPath, isRscCompatibilityIdCompatible } from "./app-rsc-cache-busting.js";
+import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
 import { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl } from "./app-browser-prefetch-response.js";
 import { canCommitOptimisticRouteTemplate, createOptimisticRouteTemplate, createOptimisticRouteTemplateStore, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, keepOptimisticStreamingMetadata, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload } from "./app-optimistic-routing.js";
+import { createMountedLayoutsHeader, holdsSkippedLayouts } from "./app-mounted-layouts.js";
+import { VINEXT_MOUNTED_LAYOUTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER } from "./headers.js";
+import { stripRscCompletionMetadataResponse } from "./rsc-completion-metadata.js";
 import { removeStylesheetLinksCoveredByInlineCss } from "./app-inline-css-client.js";
+import { navigationPlanner } from "./navigation-planner.js";
 import { Fragment, createElement, startTransition, use, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { createRoot, hydrateRoot } from "react-dom/client";
-import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { flushSync } from "react-dom";
+import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { hasServerActions, loadServerActionClient } from "virtual:vinext-app-capabilities";
-//#region src/server/app-browser-entry.ts
+// src/server/app-browser-entry.ts
 const HAS_CLIENT_REWRITES = process.env.__VINEXT_HAS_CLIENT_REWRITES !== "false";
 function toActionType(kind) {
 	return kind === "traverse" ? "traverse" : "navigate";
@@ -312,19 +313,8 @@ async function decodeSupplementalRefresh(response, targetPathname) {
 function isSettledPrefetchCacheEntry(entry) {
 	return entry.outcome === "cache-seeded" && entry.pending === void 0 && entry.snapshot !== void 0;
 }
-function parsePrefetchCacheKey(cacheKey) {
-	const separatorIndex = cacheKey.indexOf("\0");
-	if (separatorIndex === -1) return {
-		interceptionContext: null,
-		rscUrl: cacheKey
-	};
-	return {
-		interceptionContext: cacheKey.slice(separatorIndex + 1),
-		rscUrl: cacheKey.slice(0, separatorIndex)
-	};
-}
 async function learnOptimisticRouteTemplateFromPrefetch(options) {
-	const source = parsePrefetchCacheKey(options.cacheKey);
+	const source = AppElementsWire.decodeCacheKey(options.cacheKey);
 	if (source.interceptionContext !== options.interceptionContext) return null;
 	if (resolvePrefetchCacheEntryMountedSlotsHeader(options.entry) !== options.mountedSlotsHeader) return null;
 	if (options.interceptionContext !== null) return null;
@@ -1740,5 +1730,4 @@ if (typeof document !== "undefined") {
 	});
 	main();
 }
-//#endregion
 export {};

package/dist/server/app-browser-error.d.ts

@@ -1,4 +1,3 @@
-//#region src/server/app-browser-error.d.ts
 type VinextHydrateRootErrorInfo = {
   componentStack?: string;
   errorBoundary?: unknown;
@@ -10,5 +9,4 @@ export declare function createOnUncaughtError(options?: {
 export declare function createProdOnCaughtError(onImplicitRootError: HydrateRootErrorHandler): HydrateRootErrorHandler;
 export declare function createDevOnCaughtError(onCaughtError: HydrateRootErrorHandler, onImplicitRootError: HydrateRootErrorHandler, onRootErrorBoundaryCatch?: () => void): HydrateRootErrorHandler;
 export declare function createProdOnRecoverableError(onReportedError: () => void): (error: unknown) => void;
-//#endregion
 export {};

package/dist/server/app-browser-error.js

@@ -1,7 +1,7 @@
-import { isUnknownRecord } from "../utils/record.js";
-import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { isBailoutToCSRError } from "../shims/navigation-errors.js";
-//#region src/server/app-browser-error.ts
+import { isNavigationSignalError } from "../utils/navigation-signal.js";
+import { isUnknownRecord } from "../utils/record.js";
+// src/server/app-browser-error.ts
 function getErrorBoundaryProps(errorInfo) {
 	if (!isUnknownRecord(errorInfo.errorBoundary)) return {};
 	const props = errorInfo.errorBoundary.props;
@@ -64,5 +64,4 @@ function createProdOnRecoverableError(onReportedError) {
 		reportGlobalError(cause);
 	};
 }
-//#endregion
 export { createDevOnCaughtError, createOnUncaughtError, createProdOnCaughtError, createProdOnRecoverableError };

package/dist/server/app-browser-history-controller.d.ts

@@ -1,8 +1,7 @@
-import { RouterHistoryWriteLanding } from "../shims/navigation.js";
 import { BfcacheIdMap, HistoryTraversalIntent } from "./app-history-state.js";
+import { RouterHistoryWriteLanding } from "../shims/navigation.js";
 import { AppRouterState } from "./app-browser-state.js";
 import { HistoryUpdateMode } from "./app-browser-navigation-controller.js";
-//#region src/server/app-browser-history-controller.d.ts
 /**
  * Visible router-state metadata at the instant a hash-only navigation commits.
  * `null` means the browser router tree has not committed yet, so the controller
@@ -122,5 +121,4 @@ export declare class AppBrowserHistoryController {
    */
   restoreHistorySnapshot(options: RestoreHistorySnapshotOptions): boolean;
 }
-//#endregion
 export {};

package/dist/server/app-browser-history-controller.js

@@ -1,5 +1,5 @@
 import { RestorableClientStateController, clearHistoryStateTreeSnapshotId, createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithTreeSnapshotClaim, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateTreeSnapshotClaimed, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, readHistoryStateTreeSnapshotId, resolveHistoryTraversalIntent } from "./app-history-state.js";
-//#region src/server/app-browser-history-controller.ts
+// src/server/app-browser-history-controller.ts
 function createCanonicalBrowserHistoryHref(href) {
 	const url = new URL(href);
 	return `${url.pathname}${url.search}${url.hash}`;
@@ -413,5 +413,4 @@ function areBfcacheIdMapsEqual(a, b) {
 	if (aEntries.length !== bEntries.length) return false;
 	return aEntries.every(([key, value]) => b[key] === value);
 }
-//#endregion
 export { AppBrowserHistoryController, createCanonicalBrowserHistoryHref };

package/dist/server/app-browser-hydration.d.ts

@@ -1,6 +1,5 @@
 import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 import { ReactFormState, hydrateRoot } from "react-dom/client";
-//#region src/server/app-browser-hydration.d.ts
 type HydrateRootOptions = NonNullable<Parameters<typeof hydrateRoot>[2]>;
 type HydrateRoot = typeof hydrateRoot;
 type HydrateRootContainer = Parameters<HydrateRoot>[0];
@@ -38,5 +37,4 @@ export declare function resolveFetchedHydrationLocation(renderedPathAndSearch: s
   pathname: string;
   search: string;
 };
-//#endregion
 export {};