vinext 1.0.0-beta.11 → 1.0.0-beta.13

package/dist/shims/link.js

@@ -1,15 +1,16 @@
 "use client";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { isDangerousScheme, reportBlockedDangerousNavigation } from "./url-safety.js";
 import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
 import { RouterContext } from "./internal/router-context.js";
 import { getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
 import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
 import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, toCanonicalBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
-import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
 import { interpolateDynamicRouteHref, resolveDynamicRouteHref } from "./internal/interpolate-as.js";
-import { getCurrentBrowserLocale } from "./client-locale.js";
+import { formatUrlObject, formatUrlObjectWithValidation } from "./internal/format-url-object.js";
+import { normalizeRouterHref, resolvePagesRouterHref } from "./internal/normalize-router-href.js";
 import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { getCurrentBrowserLocale } from "./client-locale.js";
 import { getNavigationRuntime, hasAppNavigationRuntime, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref } from "../client/pages-router-link-navigation.js";
 import { scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
@@ -65,15 +66,15 @@ const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
 /** trailingSlash from next.config.js, injected by the plugin at build time */
 const __trailingSlash = process.env.__VINEXT_TRAILING_SLASH === "true";
 const __prefetchInlining = process.env.__VINEXT_PREFETCH_INLINING === "true";
-function resolveHref(href) {
+function resolveHref(href, validate = false) {
 	if (typeof href === "string") return href;
-	let url = href.pathname ?? "";
-	if (href.query) {
-		const params = urlQueryToSearchParams(href.query);
-		url = appendSearchParamsToUrl(url, params);
-	}
-	if (href.hash) url += href.hash.startsWith("#") ? href.hash : `#${href.hash}`;
-	return url;
+	return validate ? formatUrlObjectWithValidation(href) : formatUrlObject(href);
+}
+function resolvePagesLinkValue(value, pagesRouter, routePathnameForWarning) {
+	const formatted = resolveHref(value, pagesRouter !== null);
+	if (pagesRouter === null) return formatted;
+	if (typeof pagesRouter.pathname === "string" && typeof pagesRouter.asPath === "string" && !formatted.startsWith("?") && !formatted.startsWith("#")) return resolvePagesRouterHref(formatted, pagesRouter, __basePath);
+	return normalizeRouterHref(formatted, routePathnameForWarning);
 }
 function resolvePagesQueryOnlyHref(href) {
 	if (!HAS_PAGES_ROUTER) return href;
@@ -95,52 +96,6 @@ function applyPagesNavigationFallback(href, replace) {
 	else window.history.pushState({}, "", href);
 	window.dispatchEvent(new PopStateEvent("popstate"));
 }
-/**
-* Collapse repeated forward-slashes (and convert backslashes to forward-slashes)
-* in the path portion of a URL, preserving any query string.
-*
-* Ported from Next.js: packages/next/src/shared/lib/utils/normalize-repeated-slashes.ts
-* https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/utils/normalize-repeated-slashes.ts
-*/
-function normalizeRepeatedSlashes(url) {
-	const urlParts = url.split("?");
-	const urlNoQueryString = urlParts.shift() ?? "";
-	const queryString = urlParts.join("?");
-	return urlNoQueryString.replace(/\\/g, "/").replace(/\/\/+/g, "/") + (queryString ? `?${queryString}` : "");
-}
-/**
-* Emit Next.js's "Invalid href" `console.error` when `href` contains repeated
-* forward slashes or backslashes in its path portion, and return the
-* normalized URL (with `\\` converted to `/` and runs of `/` collapsed). If
-* the href is already well-formed, the original string is returned unchanged.
-*
-* Ported from Next.js: packages/next/src/client/resolve-href.ts
-* https://github.com/vercel/next.js/blob/canary/packages/next/src/client/resolve-href.ts
-*
-* Matches the message asserted by:
-* test/e2e/repeated-forward-slashes-error/repeated-forward-slashes-error.test.ts
-*
-* Note: Next.js fires this warning unconditionally on every call to
-* `resolveHref`. We mirror that behaviour (no dedup) for exact parity.
-*
-* Note: Next.js uses `router.pathname` (the route pattern, e.g.
-* `/posts/[id]`) for the "in page" segment of the message. The Next.js
-* compat test asserts this exact text (`in page: '/my/path/[name]'`), so we
-* source it from the current render's route pattern via
-* `getCurrentRoutePathnameForWarning()`: the Pages Router SSR context's route
-* pattern on the server, `window.location.pathname` on the client, falling
-* back to `"/"`.
-*/
-function warnAndNormalizeRepeatedSlashesInHref(urlAsString) {
-	if (urlAsString.startsWith("//")) return urlAsString;
-	const urlProtoMatch = urlAsString.match(/^[a-z][a-z0-9+.-]*:\/\//i);
-	const urlAsStringNoProto = urlProtoMatch ? urlAsString.slice(urlProtoMatch[0].length) : urlAsString;
-	if (!(urlAsStringNoProto.split("?", 1)[0] || "").match(/(\/\/|\\)/)) return urlAsString;
-	const pathname = getCurrentRoutePathnameForWarning();
-	console.error(`Invalid href '${urlAsString}' passed to next/router in page: '${pathname}'. Repeated forward-slashes (//) or backslashes \\ are not valid in the href.`);
-	const normalizedNoProto = normalizeRepeatedSlashes(urlAsStringNoProto);
-	return (urlProtoMatch ? urlProtoMatch[0] : "") + normalizedNoProto;
-}
 function resolveLinkPrefetchMode(prefetchProp, isDangerous) {
 	if (isDangerous || prefetchProp === false) return "disabled";
 	if (prefetchProp === true) return "full";
@@ -335,7 +290,7 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 			} else if (HAS_PAGES_ROUTER && window.__NEXT_DATA__) {
 				const dataTarget = resolvePagesDataNavigationTarget(fullRouteHref, __basePath, { locale });
 				if (dataTarget) {
-					const middlewareDataHref = fullRouteHref === fullHref ? dataTarget.middlewareDataHref : getPagesMiddlewareDataHref(fullHref, __basePath, { locale }) ?? void 0;
+					const middlewareDataHref = fullRouteHref === fullHref ? dataTarget.middlewareDataHref : getPagesMiddlewareDataHref(fullHref, __basePath, { locale }, fullRouteHref) ?? void 0;
 					prefetchPagesData({
 						...dataTarget,
 						middlewareDataHref
@@ -497,50 +452,34 @@ function applyLocaleToHref(href, locale) {
 	}
 	return addLocalePrefix(href, resolvedLocale, defaultLocale);
 }
-/**
-* For the `<Link href="/blog/[slug]" as="/blog/test-post">` case, project the
-* bracket-pattern href + the resolved `as` back into a concrete route URL the
-* Pages Router can fetch (`/blog/test-post`). Returns null when:
-*   - `href` has no bracket params (already concrete; the existing forwarding
-*     path works as-is)
-*   - interpolation fails because a required param could not be resolved
-*     (caller falls back to `as`, matching pre-PR behavior)
-*
-* The query for interpolation is the href's own query — `as` is the matcher
-* input rather than the source of param values. For string hrefs the search
-* portion is parsed into the query record; for object hrefs we take
-* `href.query` directly.
-*/
+/** Resolve a dynamic route pattern to the concrete URL used for prefetching. */
 function resolveConcreteRouteHref(href, as) {
 	if (typeof as !== "string") return null;
-	const hrefStr = typeof href === "string" ? href : resolveHref(href);
-	return interpolateDynamicRouteHref(hrefStr, as, typeof href === "string" || !href.query || typeof href.query === "string" ? void 0 : href.query)?.href || null;
+	return interpolateDynamicRouteHref(href, as)?.href || null;
 }
 const Link = forwardRef(function Link({ href, as, replace = false, prefetch: prefetchProp, scroll = true, shallow = false, children: childrenProp, onClick, onMouseEnter, onTouchStart, onNavigate, unstable_dynamicOnHover = false, legacyBehavior = false, passHref = false, transitionTypes: _transitionTypes, ...rest }, forwardedRef) {
 	const pagesRouter = useContext(RouterContext);
-	const asHref = as === void 0 ? void 0 : resolveHref(as);
-	const hrefStr = resolveHref(href);
+	const routePathnameForWarning = getCurrentRoutePathnameForWarning();
+	const hrefStr = resolvePagesLinkValue(href, pagesRouter, routePathnameForWarning);
+	const asHref = as === void 0 ? void 0 : resolvePagesLinkValue(as, pagesRouter, routePathnameForWarning);
 	const { locale, ...restWithoutLocale } = rest;
 	let children = childrenProp;
 	if (legacyBehavior && (typeof childrenProp === "string" || typeof childrenProp === "number")) children = React.createElement("a", null, childrenProp);
 	const hrefForImplicitInterpolation = isAbsoluteOrProtocolRelativeUrl(hrefStr) ? hrefStr.startsWith("//") ? null : toSameOriginAppPath(hrefStr, __basePath) : hrefStr;
 	const implicitDynamicRouteHref = HAS_PAGES_ROUTER && pagesRouter !== null && asHref === void 0 && hrefForImplicitInterpolation !== null ? resolveDynamicRouteHref(hrefForImplicitInterpolation) : null;
-	const dynamicRouteHref = implicitDynamicRouteHref ? {
-		...implicitDynamicRouteHref,
-		href: hrefStr
-	} : null;
-	const pagesAsHref = asHref ?? dynamicRouteHref?.as;
+	const pagesAsHref = asHref ?? implicitDynamicRouteHref?.as;
 	const unresolvedHref = pagesAsHref ?? hrefStr;
-	const rawResolvedHref = typeof unresolvedHref === "string" && unresolvedHref.startsWith("#") && !getNavigationRuntime()?.functions.navigate ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
-	const concreteRouteHref = HAS_PAGES_ROUTER ? resolveConcreteRouteHref(dynamicRouteHref ? hrefForImplicitInterpolation ?? href : href, pagesAsHref) : null;
-	const routeHrefRaw = dynamicRouteHref?.href ?? concreteRouteHref ?? hrefStr;
+	const resolvedHref = unresolvedHref.startsWith("#") && !getNavigationRuntime()?.functions.navigate ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
+	const concreteRouteHref = HAS_PAGES_ROUTER ? resolveConcreteRouteHref(hrefForImplicitInterpolation ?? hrefStr, pagesAsHref) : null;
+	const routeHrefRaw = hrefStr;
 	const prefetchRouteHrefRaw = concreteRouteHref ?? routeHrefRaw;
-	const hasPagesHrefAsPair = HAS_PAGES_ROUTER && typeof pagesAsHref === "string" && typeof routeHrefRaw === "string" && pagesAsHref !== routeHrefRaw;
-	const resolvedHref = typeof rawResolvedHref === "string" ? warnAndNormalizeRepeatedSlashesInHref(rawResolvedHref) : rawResolvedHref;
-	const isDangerous = typeof resolvedHref === "string" && isDangerousScheme(resolvedHref);
+	const hasPagesHrefAsPair = HAS_PAGES_ROUTER && pagesAsHref !== void 0 && pagesAsHref !== routeHrefRaw;
+	const isDangerous = isDangerousScheme(resolvedHref);
+	const isRouteDangerous = isDangerousScheme(prefetchRouteHrefRaw);
+	const isPrefetchDangerous = isDangerous || pagesRouter !== null && isRouteDangerous;
 	const localizedHref = applyLocaleToHref(isDangerous ? "/" : resolvedHref, locale);
 	const normalizedHref = normalizePathTrailingSlash(localizedHref, __trailingSlash);
-	const normalizedRouteHref = hasPagesHrefAsPair ? normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : prefetchRouteHrefRaw, locale), __trailingSlash) : normalizedHref;
+	const normalizedRouteHref = hasPagesHrefAsPair ? normalizePathTrailingSlash(applyLocaleToHref(isRouteDangerous ? "/" : prefetchRouteHrefRaw, locale), __trailingSlash) : normalizedHref;
 	const fullHref = normalizePathTrailingSlash(withBasePath(normalizedHref, __basePath), __trailingSlash);
 	const [pending, setPending] = useState(false);
 	const mountedRef = useRef(true);
@@ -562,11 +501,11 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 	const prefetchRouterMode = getLinkPrefetchRouterMode();
 	const isShallowPagesLink = prefetchRouterMode === "pages" && shallow;
 	const effectivePrefetchProp = isShallowPagesLink ? false : prefetchProp;
-	const prefetchMode = resolveLinkPrefetchMode(effectivePrefetchProp, isDangerous);
+	const prefetchMode = resolveLinkPrefetchMode(effectivePrefetchProp, isPrefetchDangerous);
 	const shouldViewportPrefetch = canLinkPrefetch({
 		nodeEnv: process.env.NODE_ENV,
 		prefetch: effectivePrefetchProp,
-		isDangerous
+		isDangerous: isPrefetchDangerous
 	});
 	const setRefs = useCallback((node) => {
 		internalRef.current = node;
@@ -620,7 +559,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		if (isShallowPagesLink || !canLinkIntentPrefetch({
 			nodeEnv: process.env.NODE_ENV,
 			prefetch: effectivePrefetchProp,
-			isDangerous,
+			isDangerous: isPrefetchDangerous,
 			routerMode: prefetchRouterMode
 		})) return;
 		const intentMode = unstable_dynamicOnHover ? "full-after-shell" : prefetchMode;
@@ -632,7 +571,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		prefetchUrl(normalizedHref, intentMode, "high", normalizedRouteHref === normalizedHref ? void 0 : normalizedRouteHref, locale);
 	}, [
 		effectivePrefetchProp,
-		isDangerous,
+		isPrefetchDangerous,
 		isShallowPagesLink,
 		prefetchMode,
 		prefetchRouterMode,

package/dist/shims/metadata.js

@@ -1,5 +1,6 @@
 import { isAbsoluteOrProtocolRelativeUrl } from "./url-utils.js";
 import { makeThenableParams } from "./thenable-params.js";
+import { withUseCachePageMarker } from "./internal/app-page-props-cache-key.js";
 import React from "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 //#region src/shims/metadata.tsx
@@ -18,10 +19,10 @@ const USE_CACHE_ACCEPTS_SECOND_ARGUMENT_SYMBOL = Symbol.for("vinext.useCacheAcce
 async function resolveModuleViewport(mod, params = {}, searchParams, parent = Promise.resolve(mergeViewport([])), searchParamsObserver) {
 	if (typeof mod.generateViewport === "function") {
 		const asyncParams = makeThenableParams(params);
-		const props = searchParams === void 0 ? { params: asyncParams } : {
+		const props = searchParams === void 0 ? { params: asyncParams } : withUseCachePageMarker(mod.generateViewport, {
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams, searchParamsObserver)
-		};
+		});
 		return await mod.generateViewport(props, parent);
 	}
 	if (mod.viewport && typeof mod.viewport === "object") return mod.viewport;
@@ -267,10 +268,10 @@ async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Pr
 	if (typeof mod.generateMetadata === "function") {
 		const generateMetadata = mod.generateMetadata;
 		const asyncParams = makeThenableParams(params);
-		const props = searchParams === void 0 ? { params: asyncParams } : {
+		const props = searchParams === void 0 ? { params: asyncParams } : withUseCachePageMarker(generateMetadata, {
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams, searchParamsObserver)
-		};
+		});
 		const isUseCacheFunction = Reflect.get(generateMetadata, USE_CACHE_FUNCTION_SYMBOL) === true;
 		const acceptsSecondArgument = Reflect.get(generateMetadata, USE_CACHE_ACCEPTS_SECOND_ARGUMENT_SYMBOL);
 		return await (!isUseCacheFunction || (typeof acceptsSecondArgument === "boolean" ? acceptsSecondArgument : generateMetadata.length >= 2) ? generateMetadata(props, parent) : generateMetadata(props));

package/dist/shims/navigation.js

@@ -1,8 +1,9 @@
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { stripBasePath } from "../utils/base-path.js";
 import { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "../server/app-rsc-vary.js";
 import { NEXT_ROUTER_STALE_TIME_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_COMPLETION_METADATA_HEADER, VINEXT_STALE_TIME_PENDING_HEADER } from "../server/headers.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
-import { isExternalUrl } from "../utils/external-url.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "../server/app-rsc-render-mode.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
@@ -11,7 +12,6 @@ import { AppRouterContext } from "./internal/app-router-context.js";
 import { resolveDirectHybridClientRouteOwner } from "./internal/hybrid-client-route-owner-direct.js";
 import { isHashOnlyBrowserUrlChange, toCanonicalBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { retryScrollTo, scrollToHashTarget, scrollToHashTargetOnNextFrame } from "./hash-scroll.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";

package/dist/shims/router-state.js

@@ -1,7 +1,7 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { _registerRouterStateAccessors } from "./router.js";
 import { registerRoutePatternForWarningAccessor } from "./internal/route-pattern-for-warning.js";
+import { _registerRouterStateAccessors } from "./router.js";
 //#region src/shims/router-state.ts
 /**
 * Server-only Pages Router state backed by AsyncLocalStorage.

package/dist/shims/router.d.ts

@@ -11,6 +11,8 @@ type BeforePopStateCallback = (state: {
   as: string;
   options: TransitionOptions;
 }) => boolean;
+type UrlObject$1 = UrlObject;
+type Url = string | UrlObject$1;
 export type NextRouter = {
   /** Current pathname */
   pathname: string;
@@ -39,9 +41,9 @@ export type NextRouter = {
   /** Whether this is a fallback page */
   isFallback: boolean;
   /** Navigate to a new URL */
-  push(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  push(url: Url, as?: Url, options?: TransitionOptions): Promise<boolean>;
   /** Replace current URL */
-  replace(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  replace(url: Url, as?: Url, options?: TransitionOptions): Promise<boolean>;
   /** Go back */
   back(): void;
   /** Go forward */
@@ -55,7 +57,6 @@ export type NextRouter = {
   /** Listen for route changes */
   events: RouterEvents;
 };
-type UrlObject$1 = UrlObject;
 type TransitionOptions = {
   _h?: 1;
   shallow?: boolean;
@@ -200,8 +201,8 @@ declare const RouterMethods: {
   /** See `_components` comment above for the dual role this map plays. */
   components: PagesRouterComponentsMap;
   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>;
+  push: (url: Url, as?: Url, options?: TransitionOptions) => Promise<boolean>;
+  replace: (url: Url, as?: Url, options?: TransitionOptions) => Promise<boolean>;
   back: () => void;
   forward: () => void;
   reload: () => void;
@@ -234,8 +235,8 @@ export declare class Router {
   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>;
+  push(url: Url, as?: Url, options?: TransitionOptions): Promise<boolean>;
+  replace(url: Url, as?: Url, options?: TransitionOptions): Promise<boolean>;
   reload(): void;
   back(): void;
   forward(): void;