vinext 0.1.3 → 0.1.4

package/dist/shims/document.d.ts

@@ -34,25 +34,23 @@ declare function Main(): React.JSX.Element;
  */
 declare function NextScript(): React.JSX.Element;
 /**
- * Loose stand-ins for Next.js's `DocumentContext` / `DocumentInitialProps`.
- * The shim doesn't currently invoke `getInitialProps` on user `_document.tsx`
- * files (separate gap), but the signatures here match Next.js's so subclasses
- * that delegate via `await Document.getInitialProps(ctx)` typecheck against
- * the same shape they'd see under real Next.js.
+ * Stand-ins for Next.js's `DocumentContext` / `DocumentInitialProps`.
+ * The signatures match Next.js so custom `_document.tsx` subclasses can use
+ * `ctx.renderPage()` enhancers and delegate through
+ * `await Document.getInitialProps(ctx)` with the expected public types.
  *
  * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/utils.ts
  */
 type DocumentContext = {
-  renderPage?: (options?: {
+  renderPage: (options?: {
     enhanceApp?: (App: React.ComponentType<{
       children?: React.ReactNode;
-    }>) => unknown;
-    enhanceComponent?: (Comp: React.ComponentType<unknown>) => unknown;
-  }) => {
-    html: string;
-    head?: ReadonlyArray<React.ReactElement>;
-  };
-  defaultGetInitialProps?: (ctx: DocumentContext, options?: {
+    }>) => React.ComponentType<{
+      children?: React.ReactNode;
+    }>;
+    enhanceComponent?: (Comp: React.ComponentType<unknown>) => React.ComponentType<unknown>;
+  } | ((Comp: React.ComponentType<unknown>) => React.ComponentType<unknown>)) => DocumentInitialProps | Promise<DocumentInitialProps>;
+  defaultGetInitialProps: (ctx: DocumentContext, options?: {
     nonce?: string;
   }) => Promise<DocumentInitialProps>;
   pathname?: string;
@@ -83,14 +81,11 @@ declare class Document<P = {}> extends React.Component<P & {
   children?: React.ReactNode;
 }> {
   /**
-   * `getInitialProps` is invoked by the SSR pipeline. The default implementation
-   * is a stub: vinext does not yet plumb the Pages Router `renderPage` /
-   * `defaultGetInitialProps` chain into the SSR entry, so subclasses that
-   * delegate via `await Document.getInitialProps(ctx)` receive an empty shell
-   * (`html: ""`). This matches the runtime contract user code expects without
-   * pretending the chain is wired up.
+   * `getInitialProps` is invoked by the SSR pipeline. The runtime-provided
+   * `ctx.defaultGetInitialProps()` owns the page render and style collection,
+   * matching Next.js's canonical CSS-in-JS integration path.
    */
-  static getInitialProps(_ctx: DocumentContext): Promise<DocumentInitialProps>;
+  static getInitialProps(ctx: DocumentContext): Promise<DocumentInitialProps>;
   render(): React.ReactNode;
 }
 //#endregion

package/dist/shims/document.js

@@ -61,15 +61,12 @@ function NextScript() {
 */
 var Document = class extends React.Component {
 	/**
-	* `getInitialProps` is invoked by the SSR pipeline. The default implementation
-	* is a stub: vinext does not yet plumb the Pages Router `renderPage` /
-	* `defaultGetInitialProps` chain into the SSR entry, so subclasses that
-	* delegate via `await Document.getInitialProps(ctx)` receive an empty shell
-	* (`html: ""`). This matches the runtime contract user code expects without
-	* pretending the chain is wired up.
+	* `getInitialProps` is invoked by the SSR pipeline. The runtime-provided
+	* `ctx.defaultGetInitialProps()` owns the page render and style collection,
+	* matching Next.js's canonical CSS-in-JS integration path.
 	*/
-	static async getInitialProps(_ctx) {
-		return { html: "" };
+	static getInitialProps(ctx) {
+		return ctx.defaultGetInitialProps(ctx);
 	}
 	render() {
 		return /* @__PURE__ */ jsxs(Html, { children: [/* @__PURE__ */ jsx(Head, {}), /* @__PURE__ */ jsxs("body", { children: [/* @__PURE__ */ jsx(Main, {}), /* @__PURE__ */ jsx(NextScript, {})] })] });

package/dist/shims/image.js

@@ -175,6 +175,13 @@ function sanitizeBlurDataURL(url) {
 function isRemoteUrl(src) {
 	return src.startsWith("http://") || src.startsWith("https://") || src.startsWith("//");
 }
+function isSvgUrl(src) {
+	try {
+		return new URL(src, "http://vinext.local").pathname.toLowerCase().endsWith(".svg");
+	} catch {
+		return false;
+	}
+}
 function getFillStyle(style, backgroundStyle) {
 	return {
 		position: "absolute",
@@ -414,7 +421,7 @@ const Image = forwardRef(function Image({ src: srcProp, alt, width, height, fill
 		}
 	}
 	const imgQuality = quality ?? 75;
-	const isSvg = src.endsWith(".svg");
+	const isSvg = isSvgUrl(src);
 	const skipOptimization = _unoptimized === true || isSvg && !__dangerouslyAllowSVG;
 	const srcSet = imgWidth && !fill && !skipOptimization ? generateSrcSet(src, imgWidth, imgQuality) : imgWidth && !fill ? RESPONSIVE_WIDTHS.filter((w) => w <= imgWidth * 2).map((w) => `${src} ${w}w`).join(", ") || `${src} ${imgWidth}w` : void 0;
 	const optimizedSrc = skipOptimization ? src : imgWidth ? imageOptimizationUrl(src, imgWidth, imgQuality) : imageOptimizationUrl(src, RESPONSIVE_WIDTHS[0], imgQuality);
@@ -483,7 +490,7 @@ function getImageProps(props) {
 		width: imgWidth ?? 0,
 		quality: imgQuality
 	}) : src;
-	const isSvg = resolvedSrc.endsWith(".svg");
+	const isSvg = isSvgUrl(resolvedSrc);
 	const skipOpt = _unoptimized === true || isSvg && !__dangerouslyAllowSVG || blockedInProd || !!loader || isRemoteUrl(resolvedSrc);
 	const optimizedSrc = skipOpt ? resolvedSrc : imgWidth ? imageOptimizationUrl(resolvedSrc, imgWidth, imgQuality) : imageOptimizationUrl(resolvedSrc, RESPONSIVE_WIDTHS[0], imgQuality);
 	const srcSet = imgWidth && !fill && !isRemoteUrl(resolvedSrc) && !loader && !skipOpt ? generateSrcSet(resolvedSrc, imgWidth, imgQuality) : void 0;

package/dist/shims/internal/pages-data-fetch-dedup.d.ts

@@ -24,19 +24,18 @@
  *   directly by anyone, which keeps subsequent clones legal even after one
  *   caller has consumed its copy.
  *
- * - No `AbortSignal` is honored at the shared layer. Each `Router.push` cycle
- *   has its own AbortController that supersedes prior navigations via
- *   `_navigationId`; aborting the shared fetch on behalf of one caller would
- *   destroy the dedup gain for every other concurrent caller. Cancellation is
- *   handled by the caller's `assertStillCurrent()` checkpoints after `await`,
- *   not by abort propagation.
+ * - Each caller owns one waiter. Cancelling a waiter leaves the shared request
+ *   alive while another waiter remains; cancelling the final waiter aborts the
+ *   underlying fetch and evicts the entry immediately so a replacement caller
+ *   can retry without joining a doomed request.
  *
  * - The map is module-scoped (one per realm). The Pages Router runs in the
  *   browser only, so a single `Map` is sufficient.
  */
 /**
  * Dedupe a `fetch()` against the `_next/data` endpoint. Multiple concurrent
- * callers for the same `dataHref` share one underlying network request.
+ * callers for the same resolved URL and deployment ID share one underlying
+ * network request.
  *
  * Each call returns a freshly-cloned `Response` so consumers can read the
  * body independently. Once the in-flight Promise settles (resolve or reject)

package/dist/shims/internal/pages-data-fetch-dedup.js

@@ -1,3 +1,4 @@
+import "../../utils/deployment-id.js";
 //#region src/shims/internal/pages-data-fetch-dedup.ts
 /**
 * In-flight request dedup for the Pages Router `/_next/data/<id>/<page>.json`
@@ -24,21 +25,57 @@
 *   directly by anyone, which keeps subsequent clones legal even after one
 *   caller has consumed its copy.
 *
-* - No `AbortSignal` is honored at the shared layer. Each `Router.push` cycle
-*   has its own AbortController that supersedes prior navigations via
-*   `_navigationId`; aborting the shared fetch on behalf of one caller would
-*   destroy the dedup gain for every other concurrent caller. Cancellation is
-*   handled by the caller's `assertStillCurrent()` checkpoints after `await`,
-*   not by abort propagation.
+* - Each caller owns one waiter. Cancelling a waiter leaves the shared request
+*   alive while another waiter remains; cancelling the final waiter aborts the
+*   underlying fetch and evicts the entry immediately so a replacement caller
+*   can retry without joining a doomed request.
 *
 * - The map is module-scoped (one per realm). The Pages Router runs in the
 *   browser only, so a single `Map` is sufficient.
 */
-/** Inflight fetch promises keyed by the resolved data URL. */
+/** Inflight fetch entries keyed by the resolved data request identity. */
 const inflight = /* @__PURE__ */ new Map();
+function getInflightKey(dataHref, init) {
+	let resolvedHref = dataHref;
+	if (typeof window !== "undefined") try {
+		resolvedHref = new URL(dataHref, window.location.href).href;
+	} catch {}
+	const deploymentId = new Headers(init?.headers).get("x-deployment-id") ?? "";
+	return `${resolvedHref}\n${deploymentId}`;
+}
+function cloneSharedResponse(key, entry, signal) {
+	entry.waiters += 1;
+	return new Promise((resolve, reject) => {
+		let released = false;
+		const release = (cancelled) => {
+			if (released) return;
+			released = true;
+			entry.waiters -= 1;
+			if (cancelled && entry.waiters === 0 && !entry.settled) {
+				if (inflight.get(key) === entry) inflight.delete(key);
+				entry.controller.abort();
+			}
+		};
+		const abort = () => {
+			release(true);
+			reject(new DOMException("Aborted", "AbortError"));
+		};
+		signal?.addEventListener("abort", abort, { once: true });
+		entry.promise.then((response) => {
+			signal?.removeEventListener("abort", abort);
+			release(false);
+			resolve(response.clone());
+		}, (error) => {
+			signal?.removeEventListener("abort", abort);
+			release(false);
+			reject(error);
+		});
+	});
+}
 /**
 * Dedupe a `fetch()` against the `_next/data` endpoint. Multiple concurrent
-* callers for the same `dataHref` share one underlying network request.
+* callers for the same resolved URL and deployment ID share one underlying
+* network request.
 *
 * Each call returns a freshly-cloned `Response` so consumers can read the
 * body independently. Once the in-flight Promise settles (resolve or reject)
@@ -48,20 +85,36 @@ const inflight = /* @__PURE__ */ new Map();
 * dropped on failure so the next navigation can retry.
 */
 function dedupedPagesDataFetch(dataHref, init) {
-	let entry = inflight.get(dataHref);
+	const key = getInflightKey(dataHref, init);
+	const signal = init?.signal ?? void 0;
+	if (signal?.aborted) return Promise.reject(new DOMException("Aborted", "AbortError"));
+	let entry = inflight.get(key);
 	if (!entry) {
-		entry = fetch(dataHref, init).finally(() => {
-			if (inflight.get(dataHref) === entry) inflight.delete(dataHref);
-		});
-		inflight.set(dataHref, entry);
+		const controller = new AbortController();
+		let currentEntry;
+		currentEntry = {
+			controller,
+			promise: fetch(dataHref, {
+				...init,
+				signal: controller.signal
+			}).finally(() => {
+				currentEntry.settled = true;
+				if (inflight.get(key) === currentEntry) inflight.delete(key);
+			}),
+			settled: false,
+			waiters: 0
+		};
+		inflight.set(key, currentEntry);
+		entry = currentEntry;
 	}
-	return entry.then((res) => res.clone());
+	return cloneSharedResponse(key, entry, signal);
 }
 /**
 * Drop every cached in-flight entry. Intended for tests; production code
 * does not need to call this because entries self-evict on settle.
 */
 function clearPagesDataInflight() {
+	for (const entry of inflight.values()) entry.controller.abort();
 	inflight.clear();
 }
 //#endregion

package/dist/shims/internal/pages-data-target.js

@@ -1,8 +1,8 @@
 import { stripBasePath } from "../../utils/base-path.js";
 import { getLocalePathPrefix } from "../../utils/domain-locale.js";
 import { buildPagesDataHref, matchPagesPattern } from "./pages-data-url.js";
-import { dedupedPagesDataFetch } from "./pages-data-fetch-dedup.js";
 import { NEXT_DEPLOYMENT_ID_HEADER, getDeploymentId } from "../../utils/deployment-id.js";
+import { dedupedPagesDataFetch } from "./pages-data-fetch-dedup.js";
 //#region src/shims/internal/pages-data-target.ts
 /**
 * Shared decision helper for the Pages Router `/_next/data/<id>/<page>.json`

package/dist/shims/link.js

@@ -17,7 +17,7 @@ import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-
 import { getNavigationRuntime, hasAppNavigationRuntime, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
 import { getMountedSlotsHeader, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./navigation.js";
-import { navigatePagesRouterLink } from "../client/pages-router-link-navigation.js";
+import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref } from "../client/pages-router-link-navigation.js";
 import { getI18nContext } from "./i18n-context.js";
 import { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchHref } from "./link-prefetch.js";
 import { clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation } from "./internal/link-status-registry.js";
@@ -56,6 +56,19 @@ function resolveHref(href) {
 	}
 	return url;
 }
+function resolvePagesQueryOnlyHref(href) {
+	if (!href.startsWith("?") || typeof window === "undefined") return href;
+	const pagesRouter = window.next?.appDir === true ? void 0 : window.next?.router;
+	return resolvePagesRouterQueryOnlyHref(href, {
+		asPath: pagesRouter && "reload" in pagesRouter && "asPath" in pagesRouter && typeof pagesRouter.asPath === "string" ? pagesRouter.asPath : void 0,
+		basePath: __basePath,
+		fallbackHref: window.location.href,
+		locales: window.__VINEXT_LOCALES__
+	});
+}
+function resolvePagesLinkNavigationHref(href, locale) {
+	return normalizePathTrailingSlash(applyLocaleToHref(resolvePagesQueryOnlyHref(href), locale), __trailingSlash);
+}
 /**
 * Collapse repeated forward-slashes (and convert backslashes to forward-slashes)
 * in the path portion of a URL, preserving any query string.
@@ -493,7 +506,9 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			navigateHref = localPath;
 		}
 		e.preventDefault();
-		const absoluteFullHref = toBrowserNavigationHref(navigateHref, window.location.href, __basePath);
+		const hasAppNavigationRuntime = Boolean(getNavigationRuntime()?.functions.navigate);
+		const pagesNavigateHref = resolvedHref.startsWith("?") ? resolvePagesLinkNavigationHref(resolvedHref, locale) : navigateHref;
+		const absoluteFullHref = toBrowserNavigationHref(hasAppNavigationRuntime ? navigateHref : pagesNavigateHref, window.location.href, __basePath);
 		if (onNavigate) try {
 			const navUrl = new URL(absoluteFullHref, window.location.origin);
 			let prevented = false;
@@ -509,12 +524,12 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			onNavigate(navEvent);
 			if (navEvent.defaultPrevented) return;
 		} catch {}
-		if (getNavigationRuntime()?.functions.navigate && ["pages", "document"].includes(resolveHybridClientRouteOwner(navigateHref, __basePath) ?? "")) {
+		if (hasAppNavigationRuntime && ["pages", "document"].includes(resolveHybridClientRouteOwner(navigateHref, __basePath) ?? "")) {
 			if (replace) window.location.replace(absoluteFullHref);
 			else window.location.assign(absoluteFullHref);
 			return;
 		}
-		if (getNavigationRuntime()?.functions.navigate) {
+		if (hasAppNavigationRuntime) {
 			const setter = setPendingRef.current;
 			if (setter) setLinkForCurrentNavigation(setter);
 			setPending(true);
@@ -525,19 +540,25 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 				});
 			});
 			return;
-		} else try {
-			const Router = (await import("next/router.js")).default;
-			await navigatePagesRouterLink(Router, {
-				href: navigateHref,
-				replace,
-				scroll,
-				shallow,
-				locale
+		} else {
+			const Router = window.next?.appDir === true ? void 0 : window.next?.router;
+			await navigatePagesRouterLinkWithFallback({
+				router: Router && "reload" in Router ? Router : void 0,
+				loadRouter: async () => (await import("next/router.js")).default,
+				navigation: {
+					href: pagesNavigateHref,
+					replace,
+					scroll,
+					shallow,
+					locale,
+					interpolateDynamicRoute: resolvedHref.startsWith("?")
+				},
+				fallback: () => {
+					if (replace) window.history.replaceState({}, "", absoluteFullHref);
+					else window.history.pushState({}, "", absoluteFullHref);
+					window.dispatchEvent(new PopStateEvent("popstate"));
+				}
 			});
-		} catch {
-			if (replace) window.history.replaceState({}, "", absoluteFullHref);
-			else window.history.pushState({}, "", absoluteFullHref);
-			window.dispatchEvent(new PopStateEvent("popstate"));
 		}
 	};
 	const anchorProps = restWithoutLocale;

package/dist/shims/metadata.js

@@ -621,7 +621,7 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash }) {
 				}
 			}
 		}
-		if (tw.players) {
+		if (tw.card === "player" && tw.players) {
 			const players = Array.isArray(tw.players) ? tw.players : [tw.players];
 			for (const player of players) {
 				const playerUrl = player.playerUrl.toString();
@@ -644,7 +644,7 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash }) {
 				}, key++));
 			}
 		}
-		if (tw.app) {
+		if (tw.card === "app" && tw.app) {
 			const { app } = tw;
 			for (const platform of [
 				"iphone",
@@ -655,11 +655,11 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash }) {
 					name: `twitter:app:name:${platform}`,
 					content: app.name
 				}, key++));
-				if (app.id[platform] !== void 0) elements.push(/* @__PURE__ */ jsx("meta", {
+				if (app.id[platform]) elements.push(/* @__PURE__ */ jsx("meta", {
 					name: `twitter:app:id:${platform}`,
 					content: String(app.id[platform])
 				}, key++));
-				if (app.url?.[platform] !== void 0) {
+				if (app.url?.[platform]) {
 					const appUrl = app.url[platform].toString();
 					elements.push(/* @__PURE__ */ jsx("meta", {
 						name: `twitter:app:url:${platform}`,

package/dist/shims/navigation.js

@@ -1084,6 +1084,7 @@ const _appRouter = {
 	push(href, options) {
 		assertSafeNavigationUrl(href);
 		if (isServer) return;
+		getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
 		const releaseNavigation = trackScheduledAppRouterNavigation();
 		try {
 			React$1.startTransition(() => {
@@ -1098,6 +1099,7 @@ const _appRouter = {
 	replace(href, options) {
 		assertSafeNavigationUrl(href);
 		if (isServer) return;
+		getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
 		const releaseNavigation = trackScheduledAppRouterNavigation();
 		try {
 			React$1.startTransition(() => {

package/dist/shims/router.d.ts

@@ -34,12 +34,15 @@ type NextRouter = {
 type UrlObject = {
   pathname?: string;
   query?: UrlQuery;
+  search?: string;
+  hash?: string;
 };
 type TransitionOptions = {
   _h?: 1;
   shallow?: boolean;
   scroll?: boolean;
   locale?: string | false;
+  _vinextInterpolateDynamicRoute?: boolean;
 };
 type RouterEvents = {
   on(event: string, handler: (...args: unknown[]) => void): void;
@@ -50,7 +53,7 @@ type RouterEvents = {
  * Apply locale prefix to a URL for client-side navigation.
  * Same logic as Link's applyLocaleToHref but reads from window globals.
  */
-declare function applyNavigationLocale(url: string, locale?: string): string;
+declare function applyNavigationLocale(url: string, locale?: string, replaceExistingLocale?: boolean): string;
 /** Check if a URL is external (any URL scheme per RFC 3986, or protocol-relative) */
 declare function isExternalUrl(url: string): boolean;
 /** Check if a href is only a hash change relative to the current URL */
@@ -110,6 +113,7 @@ type PagesNavigationContextShape = {
 declare function getPagesNavigationContext(): PagesNavigationContextShape | null;
 declare function getPagesNavigationIsReadyFromSerializedState(routePattern: string | undefined, searchString: string, nextData?: VinextNextData): boolean;
 declare function markPagesRouterReady(): boolean;
+declare function initializePagesRouterReadyFromNextData(nextData: VinextNextData): void;
 /**
  * useRouter hook - Pages Router compatible.
  *
@@ -187,4 +191,4 @@ declare const RouterMethods: {
 };
 declare const Router: typeof RouterMethods & Omit<NextRouter, keyof typeof RouterMethods>;
 //#endregion
-export { ExcludeRouterProps, NextRouter, WithRouterProps, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { ExcludeRouterProps, NextRouter, WithRouterProps, initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };

package/dist/shims/router.js

@@ -1,7 +1,7 @@
 import { splitPathSegments } from "../routing/utils.js";
 import { removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
-import { matchRoutePattern, routePatternParts } from "../routing/route-pattern.js";
+import { fillRoutePatternSegments, matchRoutePattern, routePatternParts } from "../routing/route-pattern.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { RouterContext } from "./internal/router-context.js";
@@ -9,8 +9,8 @@ import { applyVinextLocaleGlobals, extractVinextNextDataJson, parseVinextNextDat
 import { isValidModulePath } from "../client/validate-module-path.js";
 import { addLocalePrefix, getDomainLocaleUrl, getLocalePathPrefix } from "../utils/domain-locale.js";
 import { buildPagesDataHref } from "./internal/pages-data-url.js";
-import { dedupedPagesDataFetch } from "./internal/pages-data-fetch-dedup.js";
 import { NEXT_DEPLOYMENT_ID_HEADER, getDeploymentId } from "../utils/deployment-id.js";
+import { dedupedPagesDataFetch } from "./internal/pages-data-fetch-dedup.js";
 import { prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
 import { addQueryParam, appendSearchParamsToUrl, mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
@@ -214,11 +214,20 @@ function getPagesRouterRuntimeComponents() {
 }
 function resolveUrl(url) {
 	if (typeof url === "string") return url;
-	let result = url.pathname ?? "/";
-	if (url.query) {
+	const hasQuery = url.query !== void 0 && Object.keys(url.query).length > 0;
+	const hasSearch = typeof url.search === "string" && url.search.length > 0;
+	const hasHash = typeof url.hash === "string" && url.hash.length > 0;
+	const inheritsVisiblePath = url.pathname === void 0 && (hasQuery || hasSearch || hasHash);
+	let result = url.pathname ?? (typeof window !== "undefined" ? inheritsVisiblePath ? stripBasePath(window.location.pathname, __basePath) : window.__NEXT_DATA__?.page ?? stripBasePath(window.location.pathname, __basePath) : "/");
+	if (hasSearch) {
+		const search = url.search.startsWith("?") ? url.search : `?${url.search}`;
+		const hashIndex = search.indexOf("#");
+		result += hashIndex === -1 ? search : `${search.slice(0, hashIndex)}%23${search.slice(hashIndex + 1)}`;
+	} else if (hasQuery) {
 		const params = urlQueryToSearchParams(url.query);
 		result = appendSearchParamsToUrl(result, params);
-	}
+	} else if (hasHash && typeof window !== "undefined") result += window.location.search;
+	if (hasHash) result += url.hash.startsWith("#") ? url.hash : `#${url.hash}`;
 	return result;
 }
 /**
@@ -230,8 +239,39 @@ function resolveUrl(url) {
 * Pages error routes are handled as a narrow exception below because Next.js
 * treats their href as the component route while preserving `as` in history.
 */
-function resolveNavigationTarget(url, as, locale) {
-	return applyNavigationLocale(as ?? resolveUrl(url), locale);
+function resolveNavigationTarget(url, as, locale, replaceExistingLocale = false) {
+	return applyNavigationLocale(as ?? resolveUrl(url), locale, replaceExistingLocale);
+}
+var HrefInterpolationError = class extends Error {};
+function interpolateCurrentDynamicRoute(resolved) {
+	if (typeof window === "undefined") return resolved;
+	const routePattern = window.__NEXT_DATA__?.page;
+	if (!routePattern || extractRouteParamNames(routePattern).length === 0) return resolved;
+	try {
+		const target = new URL(resolved, "http://vinext.local");
+		const currentOrigin = getWindowOrigin();
+		if (currentOrigin && target.origin !== "http://vinext.local" && target.origin !== currentOrigin) return resolved;
+		const visiblePath = stripBasePath(window.location.pathname, __basePath);
+		const visibleLocale = getLocalePathPrefix(visiblePath, window.__VINEXT_LOCALES__);
+		if (extractRouteParamsFromPath(routePattern, visibleLocale ? visiblePath.slice(visibleLocale.length + 1) || "/" : visiblePath) === null) return resolved;
+		const query = parseQueryString(target.search);
+		const missingParams = routePatternParts(routePattern).filter((part) => part.startsWith(":") && !part.endsWith("*")).map((part) => part.slice(1, part.endsWith("+") ? -1 : void 0)).filter((paramName) => {
+			const value = query[paramName];
+			return value === void 0 || value === "" || Array.isArray(value) && value.length === 0;
+		});
+		if (missingParams.length > 0) throw new HrefInterpolationError(`The provided \`href\` (${`${routePattern}${target.search}${target.hash}`}) value is missing query values (${missingParams.join(", ")}) to be interpolated properly. Read more: https://nextjs.org/docs/messages/href-interpolation-failed`);
+		const routeParams = getRouteParamsFromQuery(routePattern, query);
+		if (!routeParams) return resolved;
+		const pathname = fillRoutePatternSegments(routePattern, Object.fromEntries(Object.entries(routeParams).map(([key, value]) => [key, Array.isArray(value) ? value.map(encodeURIComponent) : encodeURIComponent(value)])));
+		if (!pathname) return resolved;
+		const targetLocale = getLocalePathPrefix(target.pathname, window.__VINEXT_LOCALES__);
+		target.pathname = targetLocale ? `/${targetLocale}${pathname}` : pathname;
+		for (const paramName of extractRouteParamNames(routePattern)) target.searchParams.delete(paramName);
+		return target.href.slice(target.origin.length);
+	} catch (error) {
+		if (error instanceof HrefInterpolationError) throw error;
+		return resolved;
+	}
 }
 function getCurrentUrlLocale() {
 	return getCurrentBrowserLocale({
@@ -296,13 +336,26 @@ function getDomainLocalePath(url, locale) {
 * Apply locale prefix to a URL for client-side navigation.
 * Same logic as Link's applyLocaleToHref but reads from window globals.
 */
-function applyNavigationLocale(url, locale) {
+function applyNavigationLocale(url, locale, replaceExistingLocale = false) {
 	if (!locale || typeof window === "undefined") return url;
 	if (isAbsoluteOrProtocolRelativeUrl(url)) return url;
-	if (getLocalePathPrefix(url, window.__VINEXT_LOCALES__)) return url;
-	const domainLocalePath = getDomainLocalePath(url, locale);
+	if (!replaceExistingLocale && getLocalePathPrefix(url, window.__VINEXT_LOCALES__)) return url;
+	const normalizedUrl = replaceExistingLocale ? removeNavigationLocalePrefix(url) : url;
+	const domainLocalePath = getDomainLocalePath(normalizedUrl, locale);
 	if (domainLocalePath) return domainLocalePath;
-	return addLocalePrefix(url, locale, window.__VINEXT_DEFAULT_LOCALE__ ?? "");
+	return addLocalePrefix(normalizedUrl, locale, window.__VINEXT_DEFAULT_LOCALE__ ?? "");
+}
+function removeNavigationLocalePrefix(url) {
+	const locales = window.__VINEXT_LOCALES__;
+	if (!locales?.length) return url;
+	try {
+		const parsed = new URL(url, "http://vinext.local");
+		const locale = getLocalePathPrefix(parsed.pathname, locales);
+		if (!locale) return url;
+		return `${parsed.pathname.slice(locale.length + 1) || "/"}${parsed.search}${parsed.hash}`;
+	} catch {
+		return url;
+	}
 }
 function isDefaultLocaleRootNavigation(url, locale) {
 	if (typeof window === "undefined") return false;
@@ -640,9 +693,23 @@ function getPathnameAndQuery() {
 			...searchQuery,
 			...routeQuery
 		},
-		asPath: resolvedPath + window.location.search + window.location.hash
+		asPath: getCurrentHistoryAsPath() ?? resolvedPath + window.location.search + window.location.hash
 	};
 }
+function getCurrentHistoryAsPath() {
+	const state = window.history?.state;
+	if (!isNextRouterState(state) || typeof state.as !== "string") return null;
+	try {
+		const browserUrl = new URL(window.location.href);
+		const stateUrl = new URL(toBrowserNavigationHref(state.as, window.location.href, __basePath), window.location.href);
+		if (stateUrl.pathname !== browserUrl.pathname || stateUrl.search !== browserUrl.search) return null;
+		const stateAs = stripHash(state.as);
+		const visibleAs = `${stripBasePath(window.location.pathname, __basePath)}${window.location.search}`;
+		return `${stateAs || visibleAs}${window.location.hash}`;
+	} catch {
+		return null;
+	}
+}
 function getPagesNavigationIsReadyFromSerializedState(routePattern, searchString, nextData) {
 	if (!routePattern) return true;
 	if (nextData?.gssp === true || nextData?.gip === true || nextData?.isExperimentalCompile === true || nextData?.appGip === true && nextData.gsp !== true) return true;
@@ -672,6 +739,10 @@ function markPagesRouterReady() {
 	routerRuntimeState.pagesRouterReady = true;
 	return true;
 }
+function initializePagesRouterReadyFromNextData(nextData) {
+	if (typeof window === "undefined") return;
+	routerRuntimeState.pagesRouterReady = getPagesNavigationIsReadyFromSerializedState(nextData.page, window.location.search, nextData);
+}
 function markPagesRouterHydrated() {
 	if (typeof window === "undefined" || window.__NEXT_HYDRATED === true) return;
 	const hydratedAt = performance.now();
@@ -792,10 +863,13 @@ async function resolveMiddlewareDataEffect(browserUrl, signal) {
 	if (!dataUrl) return null;
 	if (signal.aborted) throw new DOMException("Aborted", "AbortError");
 	try {
-		const res = await dedupedPagesDataFetch(dataUrl, { headers: {
-			Accept: "application/json",
-			"x-nextjs-data": "1"
-		} });
+		const res = await dedupedPagesDataFetch(dataUrl, {
+			headers: {
+				Accept: "application/json",
+				"x-nextjs-data": "1"
+			},
+			signal
+		});
 		return {
 			redirectLocation: res.headers.get("x-nextjs-redirect"),
 			rewriteTarget: res.headers.get("x-nextjs-rewrite"),
@@ -851,7 +925,10 @@ async function navigateClientData(url, initialTarget, controller, navId, assertS
 		};
 		const deploymentId = getDeploymentId();
 		if (deploymentId) headers[NEXT_DEPLOYMENT_ID_HEADER] = deploymentId;
-		res = await dedupedPagesDataFetch(initialTarget.dataHref, { headers });
+		res = await dedupedPagesDataFetch(initialTarget.dataHref, {
+			headers,
+			signal: controller.signal
+		});
 	} catch (err) {
 		if (err instanceof DOMException && err.name === "AbortError") throw new NavigationCancelledError(url);
 		throw err;
@@ -1043,7 +1120,8 @@ async function navigateClientHtml(url, fetchUrl, controller, navId, assertStillC
 */
 async function navigateClient(url, fetchUrl = url, options = {}) {
 	if (typeof window === "undefined") return;
-	routerRuntimeState.activeAbortController?.abort();
+	const previousAbortController = routerRuntimeState.activeAbortController;
+	if (previousAbortController) queueMicrotask(() => previousAbortController.abort());
 	cancelPreviousRenderCommit();
 	const controller = new AbortController();
 	routerRuntimeState.activeAbortController = controller;
@@ -1222,7 +1300,8 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 	assertSafeNavigationUrl(resolveUrl(url));
 	if (as !== void 0) assertSafeNavigationUrl(String(as));
 	const navigationLocale = resolveTransitionLocale(options?.locale);
-	let resolved = resolveNavigationTarget(url, as, navigationLocale);
+	let resolved = resolveNavigationTarget(url, as, navigationLocale, as === void 0 && options?.locale !== void 0 && typeof url !== "string" && url.pathname === void 0 && (url.query !== void 0 && Object.keys(url.query).length > 0 || typeof url.search === "string" && url.search.length > 0 || typeof url.hash === "string" && url.hash.length > 0));
+	if (as === void 0 && (typeof url === "string" && options?._vinextInterpolateDynamicRoute === true || typeof url !== "string" && url.pathname === void 0 && (url.query !== void 0 && Object.keys(url.query).length > 0 || typeof url.search === "string" && url.search.length > 0))) resolved = interpolateCurrentDynamicRoute(resolved);
 	if (isExternalUrl(resolved)) {
 		const localPath = toSameOriginAppPath(resolved, __basePath);
 		if (localPath == null) {
@@ -1660,4 +1739,4 @@ if (typeof window !== "undefined") {
 const _PAGES_NAVIGATION_ACCESSOR_KEY = Symbol.for("vinext.navigation.pagesNavigationContextAccessor");
 globalThis[_PAGES_NAVIGATION_ACCESSOR_KEY] = getPagesNavigationContext;
 //#endregion
-export { markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };