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

package/dist/shims/router.d.ts

@@ -1,7 +1,10 @@
 import { VinextNextData } from "../client/vinext-next-data.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { PagesRouterComponentsMap } from "./internal/pages-router-components.js";
-import { UrlQuery } from "../utils/query.js";
+import { UrlObject } from "node:url";
 import { ComponentType, ReactElement } from "react";
+import { ParsedUrlQuery } from "node:querystring";
+import { BaseContext, NextComponentType, NextPageContext } from "@vinext/types/next/upstream/dist/shared/lib/utils";
 
 //#region src/shims/router.d.ts
 type BeforePopStateCallback = (state: {
@@ -12,30 +15,27 @@ type BeforePopStateCallback = (state: {
 type NextRouter = {
   /** Current pathname */pathname: string; /** Current route pattern (e.g., "/posts/[id]") */
   route: string; /** Query parameters */
-  query: Record<string, string | string[]>; /** Full URL including query string */
+  query: ParsedUrlQuery; /** Full URL including query string */
   asPath: string; /** Base path */
   basePath: string; /** Current locale */
   locale?: string; /** Available locales */
-  locales?: string[]; /** Default locale */
+  locales?: readonly string[]; /** Default locale */
   defaultLocale?: string; /** Configured domain locales */
-  domainLocales?: VinextNextData["domainLocales"]; /** Whether the router is ready */
+  domainLocales?: VinextNextData["domainLocales"]; /** Whether the active hostname matches a configured locale domain */
+  isLocaleDomain: boolean; /** Whether the router is ready */
   isReady: boolean; /** Whether this is a preview */
   isPreview: boolean; /** Whether this is a fallback page */
   isFallback: boolean; /** Navigate to a new URL */
-  push(url: string | UrlObject, as?: string, options?: TransitionOptions): Promise<boolean>; /** Replace current URL */
-  replace(url: string | UrlObject, as?: string, options?: TransitionOptions): Promise<boolean>; /** Go back */
-  back(): void; /** Reload the page */
+  push(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>; /** Replace current URL */
+  replace(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>; /** Go back */
+  back(): void; /** Go forward */
+  forward(): void; /** Reload the page */
   reload(): void; /** Prefetch a page (injects <link rel="prefetch">) */
   prefetch(url: string, as?: string): Promise<void>; /** Register a callback to run before popstate navigation */
   beforePopState(cb: BeforePopStateCallback): void; /** Listen for route changes */
   events: RouterEvents;
 };
-type UrlObject = {
-  pathname?: string;
-  query?: UrlQuery;
-  search?: string;
-  hash?: string;
-};
+type UrlObject$1 = UrlObject;
 type TransitionOptions = {
   _h?: 1;
   shallow?: boolean;
@@ -53,8 +53,6 @@ type RouterEvents = {
  * Same logic as Link's applyLocaleToHref but reads from window globals.
  */
 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 */
 declare function isHashOnlyChange(href: string): boolean;
 /**
@@ -70,6 +68,7 @@ type SSRContext = {
   locales?: string[];
   defaultLocale?: string;
   domainLocales?: VinextNextData["domainLocales"];
+  isPreview?: boolean;
   /**
    * True when rendering a `getStaticPaths` fallback shell for a path that
    * hasn't been pre-rendered yet (`fallback: true` + unlisted path). Mirrors
@@ -112,7 +111,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;
+declare function initializePagesRouterReadyFromNextData(nextData: VinextNextData, forceReady?: boolean): void;
 /**
  * useRouter hook - Pages Router compatible.
  *
@@ -173,18 +172,54 @@ type ExcludeRouterProps<P> = Pick<P, Exclude<keyof P, keyof WithRouterProps>>;
  *   composed component so `_app` parity holds for class components that
  *   define `getInitialProps`.
  */
-declare function withRouter<P extends WithRouterProps>(ComposedComponent: ComponentType<P>): ComponentType<ExcludeRouterProps<P>>;
+declare function withRouter<P extends WithRouterProps, C extends BaseContext = NextPageContext>(ComposedComponent: NextComponentType<C, any, P>): ComponentType<ExcludeRouterProps<P>>;
 declare const RouterMethods: {
-  /** See `_components` comment above for the dual role this map plays. */components: PagesRouterComponentsMap;
+  router: null;
+  readyCallbacks: Array<() => unknown>;
+  ready(callback: () => unknown): void; /** See `_components` comment above for the dual role this map plays. */
+  components: PagesRouterComponentsMap;
   sdc: Record<string, Promise<Response>>;
-  push: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
-  replace: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
+  push: (url: string | UrlObject$1, as?: string, options?: TransitionOptions) => Promise<boolean>;
+  replace: (url: string | UrlObject$1, as?: string, options?: TransitionOptions) => Promise<boolean>;
   back: () => void;
+  forward: () => void;
   reload: () => void;
   prefetch: (url: string, as?: string) => Promise<void>;
   beforePopState: (cb: BeforePopStateCallback) => void;
   events: RouterEvents;
 };
-declare const Router: typeof RouterMethods & Omit<NextRouter, keyof typeof RouterMethods>;
+declare const singletonRouter: typeof RouterMethods & Omit<NextRouter, keyof typeof RouterMethods>;
+/**
+ * Constructible named export matching `next/router`'s Router class surface.
+ * Vinext owns one browser history runtime, so instances delegate to that
+ * shared runtime while preserving the class/static-events API used by apps.
+ */
+declare class Router {
+  static events: RouterEvents;
+  constructor(..._args: unknown[]);
+  get route(): string;
+  get pathname(): string;
+  get query(): ParsedUrlQuery;
+  get asPath(): string;
+  get basePath(): string;
+  get locale(): string | undefined;
+  get locales(): readonly string[] | undefined;
+  get defaultLocale(): string | undefined;
+  get domainLocales(): VinextNextData["domainLocales"];
+  get isLocaleDomain(): boolean;
+  get isReady(): boolean;
+  get isPreview(): boolean;
+  get isFallback(): boolean;
+  get events(): RouterEvents;
+  get components(): PagesRouterComponentsMap;
+  get sdc(): Record<string, Promise<Response>>;
+  push(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  replace(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  reload(): void;
+  back(): void;
+  forward(): void;
+  prefetch(url: string, as?: string): Promise<void>;
+  beforePopState(cb: BeforePopStateCallback): void;
+}
 //#endregion
-export { ExcludeRouterProps, NextRouter, WithRouterProps, initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { ExcludeRouterProps, NextRouter, Router, WithRouterProps, initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, singletonRouter as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };

package/dist/shims/router.js

@@ -2,6 +2,7 @@ import { splitPathSegments } from "../routing/utils.js";
 import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { parseCookieHeader } from "../utils/parse-cookie.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { RouterContext } from "./internal/router-context.js";
@@ -217,7 +218,8 @@ function getPagesRouterRuntimeComponents() {
 }
 function resolveUrl(url) {
 	if (typeof url === "string") return url;
-	const hasQuery = url.query !== void 0 && Object.keys(url.query).length > 0;
+	const query = url.query && typeof url.query === "object" ? url.query : void 0;
+	const hasQuery = query !== void 0 && Object.keys(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);
@@ -227,7 +229,7 @@ function resolveUrl(url) {
 		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);
+		const params = urlQueryToSearchParams(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}`;
@@ -245,6 +247,23 @@ function resolveUrl(url) {
 function resolveNavigationTarget(url, as, locale, replaceExistingLocale = false) {
 	return applyNavigationLocale(as ?? resolveUrl(url), locale, replaceExistingLocale);
 }
+/**
+* Next.js's internal `_h` replacement receives browser-visible URLs, which may
+* already contain basePath and a locale prefix. Convert those back to app
+* paths before the normal history/data URL builders run; otherwise basePath is
+* added twice and locale-domain routing can turn a same-document hydration
+* update into an external navigation.
+*/
+function normalizeHydrationNavigationUrl(url) {
+	try {
+		const parsed = new URL(url, window.location.href);
+		const origin = getWindowOrigin();
+		if (!origin || parsed.origin !== origin) return url;
+		return stripBasePath(parsed.pathname, __basePath) + parsed.search + parsed.hash;
+	} catch {
+		return url;
+	}
+}
 var HrefInterpolationError = class extends Error {};
 function interpolateCurrentDynamicRoute(resolved) {
 	if (typeof window === "undefined") return resolved;
@@ -376,10 +395,6 @@ function getPagesHtmlFetchUrl(browserUrl, locale) {
 	const parsed = new URL(browserUrl, window.location.href);
 	return normalizePathTrailingSlash(toBrowserNavigationHref(`${normalizePathTrailingSlash(`/${locale}`, __trailingSlash)}${parsed.search}${parsed.hash}`, window.location.href, __basePath), __trailingSlash);
 }
-/** Check if a URL is external (any URL scheme per RFC 3986, or protocol-relative) */
-function isExternalUrl(url) {
-	return isAbsoluteOrProtocolRelativeUrl(url);
-}
 /** Resolve a hash URL to a basePath-stripped app URL for event payloads */
 function resolveHashUrl(url) {
 	if (typeof window === "undefined") return url;
@@ -579,7 +594,7 @@ function getPagesNavigationContext() {
 		return ctx;
 	}
 	if (!isPagesRouterDocumentActive()) return null;
-	const resolvedPath = stripBasePath(window.location.pathname, __basePath);
+	const resolvedPath = removeNavigationLocalePrefix(stripBasePath(window.location.pathname, __basePath));
 	const nextData = window.__NEXT_DATA__;
 	const pattern = resolvePagesRoutePatternForPath(nextData?.page, resolvedPath);
 	if (!pattern) return null;
@@ -626,6 +641,12 @@ function resolvePagesRoutePatternForPath(nextDataPage, resolvedPath) {
 	_cachedPagesRoutePattern = resolved;
 	return resolved;
 }
+function getSerializedRouteQuery(nextData) {
+	const query = {};
+	for (const [key, value] of Object.entries(nextData?.query ?? {})) if (typeof value === "string") query[key] = value;
+	else if (Array.isArray(value)) query[key] = [...value];
+	return query;
+}
 function extractRouteParamsFromPath(pattern, pathname) {
 	return matchRoutePattern(splitPathSegments(pathname), routePatternParts(pattern));
 }
@@ -684,8 +705,14 @@ function getPathnameAndQuery() {
 		};
 	}
 	const resolvedPath = stripBasePath(window.location.pathname, __basePath);
-	const pathname = window.__NEXT_DATA__?.page ?? resolvedPath;
+	const canonicalResolvedPath = removeNavigationLocalePrefix(resolvedPath);
+	const pathname = window.__NEXT_DATA__?.page ?? canonicalResolvedPath;
 	const nextData = window.__NEXT_DATA__;
+	if (!isPagesRouterReady() && !routerRuntimeState.routerDidNavigate && nextData) return {
+		pathname,
+		query: getSerializedRouteQuery(nextData),
+		asPath: getCurrentHistoryAsPath() ?? canonicalResolvedPath + window.location.search + window.location.hash
+	};
 	const routeQuery = getRouteQueryFromNextData(nextData, resolvedPath);
 	const searchQuery = {};
 	const params = new URLSearchParams(window.location.search);
@@ -696,7 +723,7 @@ function getPathnameAndQuery() {
 			...searchQuery,
 			...routeQuery
 		},
-		asPath: getCurrentHistoryAsPath() ?? resolvedPath + window.location.search + window.location.hash
+		asPath: getCurrentHistoryAsPath() ?? canonicalResolvedPath + window.location.search + window.location.hash
 	};
 }
 function getCurrentHistoryAsPath() {
@@ -704,10 +731,12 @@ function getCurrentHistoryAsPath() {
 	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);
+		const stateLocale = state.options.locale === false ? void 0 : state.options.locale;
+		const localizedStateAs = applyNavigationLocale(state.as, stateLocale);
+		const stateUrl = new URL(toBrowserNavigationHref(localizedStateAs, 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}`;
+		const stateAs = removeNavigationLocalePrefix(stripHash(state.as));
+		const visibleAs = `${removeNavigationLocalePrefix(stripBasePath(window.location.pathname, __basePath))}${window.location.search}`;
 		return `${stateAs || visibleAs}${window.location.hash}`;
 	} catch {
 		return null;
@@ -742,9 +771,9 @@ function markPagesRouterReady() {
 	routerRuntimeState.pagesRouterReady = true;
 	return true;
 }
-function initializePagesRouterReadyFromNextData(nextData) {
+function initializePagesRouterReadyFromNextData(nextData, forceReady = false) {
 	if (typeof window === "undefined") return;
-	routerRuntimeState.pagesRouterReady = getPagesNavigationIsReadyFromSerializedState(nextData.page, window.location.search, nextData);
+	routerRuntimeState.pagesRouterReady = forceReady || getPagesNavigationIsReadyFromSerializedState(nextData.page, window.location.search, nextData);
 }
 function markPagesRouterHydrated() {
 	if (typeof window === "undefined" || window.__NEXT_HYDRATED === true) return;
@@ -798,6 +827,7 @@ function cancelPreviousRenderCommit() {
 	routerRuntimeState.cancelPendingRenderCommit = null;
 }
 function scheduleHardNavigationAndThrow(url, message) {
+	assertSafeNavigationUrl(url, HardNavigationScheduledError);
 	if (typeof window === "undefined") throw new HardNavigationScheduledError(message);
 	window.location.href = url;
 	throw new HardNavigationScheduledError(message);
@@ -885,7 +915,7 @@ async function resolveClientConfigRedirect(href) {
 	if (!redirects || redirects.length === 0) return null;
 	const routeContext = getClientConfigRouteContext(href);
 	if (!routeContext) return null;
-	const { isExternalUrl, matchRedirect, preserveRedirectDestinationQuery } = await import("../config/config-matchers.js");
+	const { matchRedirect, preserveRedirectDestinationQuery } = await import("../config/config-matchers.js");
 	const redirect = matchRedirect(routeContext.pathname, redirects, routeContext.context, routeContext.basePathState);
 	if (!redirect) return null;
 	return preserveRedirectDestinationQuery(__basePath && routeContext.basePathState.hadBasePath && !isExternalUrl(redirect.destination) && !hasBasePath(redirect.destination, __basePath) ? __basePath + redirect.destination : redirect.destination, routeContext.search);
@@ -893,7 +923,7 @@ async function resolveClientConfigRedirect(href) {
 async function applyClientConfigRewrite(href, rewrite) {
 	const routeContext = getClientConfigRouteContext(href);
 	if (!routeContext) return null;
-	const { isExternalUrl, matchRewrite } = await import("../config/config-matchers.js");
+	const { matchRewrite } = await import("../config/config-matchers.js");
 	const rewritten = matchRewrite(routeContext.pathname, [rewrite], routeContext.context, routeContext.basePathState);
 	if (rewritten === null) return null;
 	if (isExternalUrl(rewritten)) return { kind: "document" };
@@ -1087,6 +1117,7 @@ function buildPagesNavigationNextData(target, props) {
 		query: mergedQuery,
 		buildId: target.buildId,
 		isFallback: false,
+		isPreview: props.__N_PREVIEW === true,
 		...nextLocale !== void 0 ? { locale: nextLocale } : {}
 	};
 }
@@ -1107,13 +1138,13 @@ async function loadComponentOnlyProps(PageComponent, AppComponent, target, asPat
 		const AppTree = (appProps) => createElement(AppComponent, {
 			...appProps,
 			Component: PageComponent,
-			router: Router
+			router: singletonRouter
 		});
 		return propsObject(await AppComponent.getInitialProps({
 			Component: PageComponent,
 			AppTree,
 			ctx,
-			router: Router
+			router: singletonRouter
 		}));
 	}
 	if (typeof PageComponent.getInitialProps === "function") return { pageProps: propsObject(await PageComponent.getInitialProps(ctx)) };
@@ -1135,7 +1166,7 @@ async function renderPagesNavigationTarget(url, target, props, options, assertSt
 		...props,
 		Component: PageComponent,
 		pageProps: rawPageProps,
-		router: Router
+		router: singletonRouter
 	});
 	else element = React.createElement(PageComponent, pageProps);
 	const nextData = buildPagesNavigationNextData(target, props);
@@ -1190,7 +1221,7 @@ async function navigateClientData(url, initialTarget, controller, navId, assertS
 		};
 		const deploymentId = getDeploymentId();
 		if (deploymentId) headers[NEXT_DEPLOYMENT_ID_HEADER] = deploymentId;
-		res = await (initialTarget.dataKind === "static" ? fetchStaticPagesData : dedupedPagesDataFetch)(initialTarget.dataHref, {
+		res = await (initialTarget.dataKind === "static" && singletonRouter.isPreview !== true ? fetchStaticPagesData : dedupedPagesDataFetch)(initialTarget.dataHref, {
 			headers,
 			signal: controller.signal
 		});
@@ -1231,6 +1262,7 @@ async function navigateClientData(url, initialTarget, controller, navId, assertS
 	const rawPageProps = props.pageProps;
 	const pageProps = isUnknownRecord(rawPageProps) ? rawPageProps : {};
 	if (initialTarget.dataKind === "server") evictPagesDataCache(initialTarget.dataHref);
+	if (props.__N_PREVIEW === true || singletonRouter.isPreview === true) evictPagesDataCache(initialTarget.dataHref);
 	const redirectDestination = pageProps.__N_REDIRECT;
 	if (typeof redirectDestination === "string") {
 		handleDataRedirect(redirectDestination, pageProps.__N_REDIRECT_BASE_PATH, options.mode);
@@ -1324,7 +1356,7 @@ async function navigateClientHtml(url, fetchUrl, controller, navId, assertStillC
 		...props,
 		Component: PageComponent,
 		pageProps: rawPageProps,
-		router: Router
+		router: singletonRouter
 	});
 	else element = React.createElement(PageComponent, pageProps);
 	if (pendingRedirectHistoryUrl) {
@@ -1483,8 +1515,9 @@ function buildRouterValue(pathname, query, asPath, isReady, methods) {
 		locales,
 		defaultLocale,
 		domainLocales,
+		isLocaleDomain: typeof window !== "undefined" && domainLocales?.some((domain) => domain.domain === window.location.hostname) === true,
 		isReady,
-		isPreview: false,
+		isPreview: typeof window !== "undefined" ? nextData?.isPreview === true : _ssrState?.isPreview === true,
 		isFallback: typeof window !== "undefined" ? nextData?.isFallback === true : _ssrState?.isFallback === true,
 		...methods,
 		events: routerEvents
@@ -1572,11 +1605,12 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 	if (typeof window === "undefined") throwNoRouterInstance();
 	assertSafeNavigationUrl(resolveUrl(url));
 	if (as !== void 0) assertSafeNavigationUrl(String(as));
+	const isHydrationQueryUpdate = options?._h === 1;
 	const navigationLocale = resolveTransitionLocale(options?.locale);
-	const replaceInheritedLocale = 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);
-	let resolved = resolveNavigationTarget(url, as, navigationLocale, replaceInheritedLocale);
-	let resolvedRoute = applyNavigationLocale(resolveUrl(url), navigationLocale, replaceInheritedLocale);
-	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))) {
+	const replaceInheritedLocale = as === void 0 && options?.locale !== void 0 && typeof url !== "string" && url.pathname === void 0 && (url.query !== null && typeof url.query === "object" && Object.keys(url.query).length > 0 || typeof url.search === "string" && url.search.length > 0 || typeof url.hash === "string" && url.hash.length > 0);
+	let resolved = isHydrationQueryUpdate ? normalizeHydrationNavigationUrl(as ?? resolveUrl(url)) : resolveNavigationTarget(url, as, navigationLocale, replaceInheritedLocale);
+	let resolvedRoute = isHydrationQueryUpdate ? normalizeHydrationNavigationUrl(resolveUrl(url)) : applyNavigationLocale(resolveUrl(url), navigationLocale, replaceInheritedLocale);
+	if (as === void 0 && (typeof url === "string" && options?._vinextInterpolateDynamicRoute === true || typeof url !== "string" && url.pathname === void 0 && (url.query !== null && typeof url.query === "object" && Object.keys(url.query).length > 0 || typeof url.search === "string" && url.search.length > 0))) {
 		resolved = interpolateCurrentDynamicRoute(resolved);
 		resolvedRoute = interpolateCurrentDynamicRoute(resolvedRoute);
 	}
@@ -1597,7 +1631,7 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 	resolvedRoute = normalizePathTrailingSlash(resolvedRoute, __trailingSlash);
 	let interpolatedRoute = resolvedRoute;
 	if (resolvedRoute.includes("[")) {
-		const projection = interpolateDynamicRouteHref(resolvedRoute, resolved, typeof url === "string" ? void 0 : url.query);
+		const projection = interpolateDynamicRouteHref(resolvedRoute, resolved, typeof url === "string" || !url.query || typeof url.query === "string" ? void 0 : url.query);
 		if (projection?.href) {
 			interpolatedRoute = projection.href;
 			if (as === void 0 && stripHash(resolved).split("?", 1)[0] === projection.routePathname) {
@@ -1737,7 +1771,7 @@ async function prefetchUrl(url, as) {
 function useRouter() {
 	const router = useContext(RouterContext);
 	if (router) return router;
-	if (typeof window !== "undefined" && window.__VINEXT_PAGE_LOADERS__ !== void 0) return Router;
+	if (typeof window !== "undefined" && window.__VINEXT_PAGE_LOADERS__ !== void 0) return singletonRouter;
 	throw new Error("NextRouter was not mounted. https://nextjs.org/docs/messages/next-router-not-mounted");
 }
 function PagesRouterProvider({ children }) {
@@ -1762,12 +1796,13 @@ function PagesRouterProvider({ children }) {
 		};
 	}, []);
 	const router = useMemo(() => buildRouterValue(pathname, query, asPath, isReady, {
-		push: Router.push,
-		replace: Router.replace,
-		back: Router.back,
-		reload: Router.reload,
-		prefetch: Router.prefetch,
-		beforePopState: Router.beforePopState
+		push: singletonRouter.push,
+		replace: singletonRouter.replace,
+		back: singletonRouter.back,
+		forward: singletonRouter.forward,
+		reload: singletonRouter.reload,
+		prefetch: singletonRouter.prefetch,
+		beforePopState: singletonRouter.beforePopState
 	}), [
 		pathname,
 		query,
@@ -1777,23 +1812,23 @@ function PagesRouterProvider({ children }) {
 	const appRouter = useMemo(() => ({
 		bfcacheId: "0",
 		back() {
-			Router.back();
+			singletonRouter.back();
 		},
 		forward() {
 			if (typeof window === "undefined") throwNoRouterInstance();
 			window.history.forward();
 		},
 		refresh() {
-			Router.reload();
+			singletonRouter.reload();
 		},
 		push(href, options) {
-			Router.push(href, void 0, { scroll: options?.scroll });
+			singletonRouter.push(href, void 0, { scroll: options?.scroll });
 		},
 		replace(href, options) {
-			Router.replace(href, void 0, { scroll: options?.scroll });
+			singletonRouter.replace(href, void 0, { scroll: options?.scroll });
 		},
 		prefetch(href) {
-			Router.prefetch(href);
+			singletonRouter.prefetch(href);
 		}
 	}), []);
 	const content = createElement(RouterContext.Provider, { value: router }, createElement(Fragment, null, children, createElement(PagesRouterHydrationMarker)));
@@ -1936,6 +1971,11 @@ function withRouter(ComposedComponent) {
 	return WithRouterWrapper;
 }
 const RouterMethods = {
+	router: null,
+	readyCallbacks: [],
+	ready(callback) {
+		callback();
+	},
 	/** See `_components` comment above for the dual role this map plays. */
 	components: getPagesRouterComponentsMap(),
 	sdc: getPagesStaticDataCache(),
@@ -1955,6 +1995,10 @@ const RouterMethods = {
 		if (typeof window === "undefined") throwNoRouterInstance();
 		window.history.back();
 	},
+	forward: () => {
+		if (typeof window === "undefined") throwNoRouterInstance();
+		window.history.forward();
+	},
 	reload: () => {
 		if (typeof window === "undefined") throwNoRouterInstance();
 		window.location.reload();
@@ -1969,7 +2013,7 @@ const RouterMethods = {
 	},
 	events: routerEvents
 };
-const Router = Object.defineProperties(RouterMethods, {
+const singletonRouter = Object.defineProperties(RouterMethods, {
 	pathname: {
 		enumerable: true,
 		get() {
@@ -2029,6 +2073,14 @@ const Router = Object.defineProperties(RouterMethods, {
 			return window.__NEXT_DATA__?.domainLocales;
 		}
 	},
+	isLocaleDomain: {
+		enumerable: true,
+		get() {
+			const domainLocales = typeof window === "undefined" ? _getSSRContext()?.domainLocales : window.__NEXT_DATA__?.domainLocales;
+			if (!domainLocales || typeof window === "undefined") return false;
+			return domainLocales.some((domain) => domain.domain === window.location.hostname);
+		}
+	},
 	isReady: {
 		enumerable: true,
 		get() {
@@ -2037,8 +2089,10 @@ const Router = Object.defineProperties(RouterMethods, {
 	},
 	isPreview: {
 		enumerable: true,
-		value: false,
-		writable: false
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.isPreview === true;
+			return window.__NEXT_DATA__?.isPreview === true;
+		}
 	},
 	isFallback: {
 		enumerable: true,
@@ -2048,7 +2102,7 @@ const Router = Object.defineProperties(RouterMethods, {
 		}
 	}
 });
-routerRuntimeState.publicRouter = Router;
+routerRuntimeState.publicRouter = singletonRouter;
 const deprecatedRouterEvents = [
 	"routeChangeStart",
 	"beforeHistoryChange",
@@ -2062,7 +2116,7 @@ if (!routerRuntimeState.deprecatedEventBridgeInstalled) {
 	for (const event of deprecatedRouterEvents) {
 		const eventField = `on${event.charAt(0).toUpperCase()}${event.substring(1)}`;
 		routerEvents.on(event, (...args) => {
-			const handler = (routerRuntimeState.publicRouter ?? Router)[eventField];
+			const handler = (routerRuntimeState.publicRouter ?? singletonRouter)[eventField];
 			if (typeof handler === "function") try {
 				handler(...args);
 			} catch (err) {
@@ -2074,9 +2128,87 @@ if (!routerRuntimeState.deprecatedEventBridgeInstalled) {
 }
 if (typeof window !== "undefined") {
 	installPagesRouterRuntime();
-	installWindowNext({ router: Router });
+	installWindowNext({ router: singletonRouter });
 }
 const _PAGES_NAVIGATION_ACCESSOR_KEY = Symbol.for("vinext.navigation.pagesNavigationContextAccessor");
 globalThis[_PAGES_NAVIGATION_ACCESSOR_KEY] = getPagesNavigationContext;
+/**
+* Constructible named export matching `next/router`'s Router class surface.
+* Vinext owns one browser history runtime, so instances delegate to that
+* shared runtime while preserving the class/static-events API used by apps.
+*/
+var Router = class {
+	static events = routerEvents;
+	constructor(..._args) {}
+	get route() {
+		return singletonRouter.route;
+	}
+	get pathname() {
+		return singletonRouter.pathname;
+	}
+	get query() {
+		return singletonRouter.query;
+	}
+	get asPath() {
+		return singletonRouter.asPath;
+	}
+	get basePath() {
+		return singletonRouter.basePath;
+	}
+	get locale() {
+		return singletonRouter.locale;
+	}
+	get locales() {
+		return singletonRouter.locales;
+	}
+	get defaultLocale() {
+		return singletonRouter.defaultLocale;
+	}
+	get domainLocales() {
+		return singletonRouter.domainLocales;
+	}
+	get isLocaleDomain() {
+		return singletonRouter.isLocaleDomain;
+	}
+	get isReady() {
+		return singletonRouter.isReady;
+	}
+	get isPreview() {
+		return singletonRouter.isPreview;
+	}
+	get isFallback() {
+		return singletonRouter.isFallback;
+	}
+	get events() {
+		return singletonRouter.events;
+	}
+	get components() {
+		return singletonRouter.components;
+	}
+	get sdc() {
+		return singletonRouter.sdc;
+	}
+	push(url, as, options) {
+		return singletonRouter.push(url, as, options);
+	}
+	replace(url, as, options) {
+		return singletonRouter.replace(url, as, options);
+	}
+	reload() {
+		singletonRouter.reload();
+	}
+	back() {
+		singletonRouter.back();
+	}
+	forward() {
+		singletonRouter.forward();
+	}
+	prefetch(url, as) {
+		return singletonRouter.prefetch(url, as);
+	}
+	beforePopState(cb) {
+		singletonRouter.beforePopState(cb);
+	}
+};
 //#endregion
-export { initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { Router, initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, singletonRouter as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };

package/dist/shims/script.d.ts

@@ -1,21 +1,18 @@
 import React from "react";
 
 //#region src/shims/script.d.ts
-type ScriptProps = {
+type ScriptProps = React.ScriptHTMLAttributes<HTMLScriptElement> & {
   /** Script source URL */src?: string; /** Loading strategy. Default: "afterInteractive" */
   strategy?: "beforeInteractive" | "afterInteractive" | "lazyOnload" | "worker"; /** Unique identifier for the script */
   id?: string; /** Called when the script has loaded */
-  onLoad?: (e: Event) => void; /** Called when the script is ready (after load, and on every re-render if already loaded) */
+  onLoad?: (e: unknown) => void; /** Called when the script is ready (after load, and on every re-render if already loaded) */
   onReady?: () => void; /** Called on script load error */
-  onError?: (e: Event) => void; /** Inline script content */
-  children?: React.ReactNode; /** Dangerous inner HTML */
-  dangerouslySetInnerHTML?: {
-    __html: string;
-  }; /** Script type attribute */
+  onError?: (e: unknown) => void; /** Inline script content */
+  children?: React.ReactNode; /** Script type attribute */
   type?: string; /** Async attribute */
   async?: boolean; /** Defer attribute */
   defer?: boolean; /** Crossorigin attribute */
-  crossOrigin?: string; /** Nonce for CSP */
+  crossOrigin?: React.ScriptHTMLAttributes<HTMLScriptElement>["crossOrigin"]; /** Nonce for CSP */
   nonce?: string; /** Integrity hash */
   integrity?: string;
   /**
@@ -27,8 +24,7 @@ type ScriptProps = {
    * `.nextjs-ref/packages/next/src/client/script.tsx` (`insertStylesheets`
    * and the `appDir` block).
    */
-  stylesheets?: string[]; /** Additional attributes */
-  [key: string]: unknown;
+  stylesheets?: string[];
 };
 /**
  * Load a script imperatively (outside of React).