vinext 1.0.0-beta.1 → 1.0.0-beta.3

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));
 }
@@ -687,6 +708,11 @@ function getPathnameAndQuery() {
 	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);
@@ -801,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);
@@ -888,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);
@@ -896,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" };
@@ -1111,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)) };
@@ -1132,14 +1159,13 @@ async function renderPagesNavigationTarget(url, target, props, options, assertSt
 	assertStillCurrent();
 	const React = (await import("react")).default;
 	assertStillCurrent();
-	const rawPageProps = props.pageProps;
-	const pageProps = isUnknownRecord(rawPageProps) ? rawPageProps : {};
+	const pageProps = Object.assign({}, props.pageProps);
+	props.pageProps = pageProps;
 	let element;
 	if (AppComponent) element = React.createElement(AppComponent, {
 		...props,
 		Component: PageComponent,
-		pageProps: rawPageProps,
-		router: Router
+		router: singletonRouter
 	});
 	else element = React.createElement(PageComponent, pageProps);
 	const nextData = buildPagesNavigationNextData(target, props);
@@ -1194,7 +1220,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" && Router.isPreview !== true ? fetchStaticPagesData : dedupedPagesDataFetch)(initialTarget.dataHref, {
+		res = await (initialTarget.dataKind === "static" && singletonRouter.isPreview !== true ? fetchStaticPagesData : dedupedPagesDataFetch)(initialTarget.dataHref, {
 			headers,
 			signal: controller.signal
 		});
@@ -1235,7 +1261,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 || Router.isPreview === true) 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);
@@ -1285,8 +1311,8 @@ async function navigateClientHtml(url, fetchUrl, controller, navId, assertStillC
 	if (!nextDataJson) scheduleHardNavigationAndThrow(url, "Navigation failed: missing __NEXT_DATA__ in response");
 	const nextData = parseVinextNextDataJson(nextDataJson);
 	const props = nextData.props && typeof nextData.props === "object" ? nextData.props : {};
-	const rawPageProps = props.pageProps;
-	const pageProps = isUnknownRecord(rawPageProps) ? rawPageProps : {};
+	const pageProps = Object.assign({}, props.pageProps);
+	props.pageProps = pageProps;
 	let pageModuleUrl = nextData.__vinext?.pageModuleUrl;
 	if (!pageModuleUrl) {
 		const moduleMatch = html.match(/import\("([^"]+)"\);\s*\n\s*const PageComponent/);
@@ -1328,8 +1354,7 @@ async function navigateClientHtml(url, fetchUrl, controller, navId, assertStillC
 	if (AppComponent) element = React.createElement(AppComponent, {
 		...props,
 		Component: PageComponent,
-		pageProps: rawPageProps,
-		router: Router
+		router: singletonRouter
 	});
 	else element = React.createElement(PageComponent, pageProps);
 	if (pendingRedirectHistoryUrl) {
@@ -1488,6 +1513,7 @@ 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: typeof window !== "undefined" ? nextData?.isPreview === true : _ssrState?.isPreview === true,
 		isFallback: typeof window !== "undefined" ? nextData?.isFallback === true : _ssrState?.isFallback === true,
@@ -1577,11 +1603,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);
 	}
@@ -1602,7 +1629,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) {
@@ -1618,7 +1645,20 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 				const hashStr = extractHash(resolved);
 				resolved = normalizePathTrailingSlash(`${projection.href.split(/[?#]/, 1)[0]}${searchStr ? `?${searchStr}` : ""}${hashStr}`, __trailingSlash);
 			}
-		} else interpolatedRoute = resolved;
+		} else {
+			const missingParams = projection ? routePatternParts(projection.routePathname).filter((part) => part.startsWith(":") && !part.endsWith("*")).map((part) => part.slice(1, part.endsWith("+") ? -1 : void 0)).filter((paramName) => {
+				const value = projection.query[paramName];
+				return value === void 0 || value === "" || Array.isArray(value) && value.length === 0;
+			}) : [];
+			const hasExplicitHrefPathname = typeof url === "string" || url.pathname !== void 0;
+			const isMiddlewareMatch = options?.shallow !== true && getPagesMiddlewareDataHref(resolved, __basePath) !== null;
+			if (missingParams.length > 0 && hasExplicitHrefPathname && !isMiddlewareMatch) {
+				const asPathname = stripHash(resolved).split("?", 1)[0];
+				const routePathname = projection?.routePathname ?? stripHash(resolvedRoute).split("?", 1)[0];
+				throw new HrefInterpolationError(asPathname === routePathname ? `The provided \`href\` (${resolvedRoute}) value is missing query values (${missingParams.join(", ")}) to be interpolated properly. Read more: https://nextjs.org/docs/messages/href-interpolation-failed` : `The provided \`as\` value (${asPathname}) is incompatible with the \`href\` value (${routePathname}). Read more: https://nextjs.org/docs/messages/incompatible-href-as`);
+			}
+			interpolatedRoute = resolved;
+		}
 	}
 	const full = normalizePathTrailingSlash(toBrowserNavigationHref(resolved, window.location.href, __basePath), __trailingSlash);
 	const fullRouteUrl = interpolatedRoute !== resolved ? normalizePathTrailingSlash(toBrowserNavigationHref(interpolatedRoute, window.location.href, __basePath), __trailingSlash) : full;
@@ -1742,7 +1782,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 }) {
@@ -1767,12 +1807,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,
@@ -1782,23 +1823,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)));
@@ -1941,6 +1982,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(),
@@ -1960,6 +2006,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();
@@ -1974,7 +2024,7 @@ const RouterMethods = {
 	},
 	events: routerEvents
 };
-const Router = Object.defineProperties(RouterMethods, {
+const singletonRouter = Object.defineProperties(RouterMethods, {
 	pathname: {
 		enumerable: true,
 		get() {
@@ -2034,6 +2084,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() {
@@ -2055,7 +2113,7 @@ const Router = Object.defineProperties(RouterMethods, {
 		}
 	}
 });
-routerRuntimeState.publicRouter = Router;
+routerRuntimeState.publicRouter = singletonRouter;
 const deprecatedRouterEvents = [
 	"routeChangeStart",
 	"beforeHistoryChange",
@@ -2069,7 +2127,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) {
@@ -2081,9 +2139,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).

package/dist/shims/script.js

@@ -1,8 +1,8 @@
 "use client";
-import { escapeInlineContent } from "./head.js";
 import { useScriptNonce } from "./script-nonce-context.js";
 import { hasAppNavigationRuntimeBootstrap } from "../client/navigation-runtime.js";
 import { useBeforeInteractiveRegister } from "./before-interactive-context.js";
+import { escapeInlineContent } from "./head.js";
 import React, { useEffect, useRef } from "react";
 import * as ReactDOM from "react-dom";
 //#region src/shims/script.tsx
@@ -78,9 +78,12 @@ function buildBeforeInteractiveScriptProps(options) {
 	if (options.src) scriptProps.src = options.src;
 	if (options.id) scriptProps.id = options.id;
 	if (options.resolvedNonce) scriptProps.nonce = options.resolvedNonce;
-	if (options.dangerouslySetInnerHTML) scriptProps.dangerouslySetInnerHTML = { __html: escapeInlineContent(options.dangerouslySetInnerHTML.__html, "script") };
+	if (options.dangerouslySetInnerHTML) scriptProps.dangerouslySetInnerHTML = { __html: escapeInlineContent(stringifyInlineContent(options.dangerouslySetInnerHTML.__html), "script") };
 	return scriptProps;
 }
+function stringifyInlineContent(value) {
+	return String(value);
+}
 /**
 * Extract the inline script content for a `beforeInteractive` Script element
 * with no `src`. Returns `null` when the element has neither a string-shaped
@@ -93,7 +96,7 @@ function buildBeforeInteractiveScriptProps(options) {
 * to the emit point so the rule is obvious at the boundary).
 */
 function extractBeforeInteractiveInlineContent(children, dangerouslySetInnerHTML) {
-	if (dangerouslySetInnerHTML && typeof dangerouslySetInnerHTML.__html === "string" && dangerouslySetInnerHTML.__html.length > 0) return dangerouslySetInnerHTML.__html;
+	if (dangerouslySetInnerHTML && stringifyInlineContent(dangerouslySetInnerHTML.__html).length > 0) return stringifyInlineContent(dangerouslySetInnerHTML.__html);
 	if (typeof children === "string" && children.length > 0) return children;
 	if (Array.isArray(children) && children.every((c) => typeof c === "string")) {
 		const joined = children.join("");
@@ -220,7 +223,7 @@ function loadClientScript(props, options) {
 		onReady?.();
 	};
 	if (dangerouslySetInnerHTML?.__html) {
-		el.innerHTML = dangerouslySetInnerHTML.__html;
+		el.innerHTML = stringifyInlineContent(dangerouslySetInnerHTML.__html);
 		markLoaded();
 	} else if (children && typeof children === "string") {
 		el.textContent = children;