npm - vinext - Versions diffs - 0.1.0 → 0.1.2 - Mend

vinext 0.1.0 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (205) hide show

package/README.md +2 -5
package/dist/build/assets-ignore.d.ts +32 -0
package/dist/build/assets-ignore.js +48 -0
package/dist/build/client-build-config.d.ts +33 -1
package/dist/build/client-build-config.js +66 -1
package/dist/check.js +4 -3
package/dist/cli.js +2 -0
package/dist/client/navigation-runtime.d.ts +11 -2
package/dist/client/navigation-runtime.js +1 -1
package/dist/client/vinext-next-data.d.ts +2 -1
package/dist/client/window-next.d.ts +6 -4
package/dist/config/config-matchers.d.ts +31 -5
package/dist/config/config-matchers.js +50 -3
package/dist/config/next-config.d.ts +29 -3
package/dist/config/next-config.js +32 -2
package/dist/deploy.js +47 -304
package/dist/entries/app-rsc-entry.d.ts +8 -2
package/dist/entries/app-rsc-entry.js +61 -5
package/dist/entries/app-rsc-manifest.js +20 -2
package/dist/entries/pages-client-entry.js +1 -1
package/dist/entries/pages-server-entry.js +16 -7
package/dist/index.d.ts +0 -2
package/dist/index.js +233 -280
package/dist/plugins/dynamic-preload-metadata.d.ts +13 -0
package/dist/plugins/dynamic-preload-metadata.js +415 -0
package/dist/plugins/og-assets.js +2 -2
package/dist/plugins/optimize-imports.d.ts +8 -4
package/dist/plugins/optimize-imports.js +16 -12
package/dist/plugins/postcss.js +18 -14
package/dist/plugins/require-context.d.ts +6 -0
package/dist/plugins/require-context.js +184 -0
package/dist/plugins/sass.d.ts +53 -24
package/dist/plugins/sass.js +249 -1
package/dist/plugins/wasm-module-import.d.ts +15 -0
package/dist/plugins/wasm-module-import.js +50 -0
package/dist/routing/app-route-graph.d.ts +35 -2
package/dist/routing/app-route-graph.js +179 -8
package/dist/routing/file-matcher.js +1 -1
package/dist/routing/route-pattern.d.ts +2 -1
package/dist/routing/route-pattern.js +16 -1
package/dist/server/api-handler.js +4 -0
package/dist/server/app-browser-entry.js +155 -215
package/dist/server/app-browser-error.d.ts +4 -1
package/dist/server/app-browser-error.js +7 -1
package/dist/server/app-browser-history-controller.d.ts +104 -0
package/dist/server/app-browser-history-controller.js +210 -0
package/dist/server/app-browser-interception-context.d.ts +2 -1
package/dist/server/app-browser-interception-context.js +15 -2
package/dist/server/app-browser-navigation-controller.d.ts +13 -2
package/dist/server/app-browser-navigation-controller.js +83 -4
package/dist/server/app-browser-popstate.d.ts +12 -3
package/dist/server/app-browser-popstate.js +19 -4
package/dist/server/app-browser-rsc-redirect.d.ts +11 -2
package/dist/server/app-browser-rsc-redirect.js +30 -8
package/dist/server/app-browser-state.d.ts +3 -0
package/dist/server/app-browser-state.js +10 -10
package/dist/server/app-browser-visible-commit.js +10 -8
package/dist/server/app-fallback-renderer.d.ts +2 -1
package/dist/server/app-fallback-renderer.js +3 -1
package/dist/server/app-history-state.d.ts +45 -1
package/dist/server/app-history-state.js +109 -1
package/dist/server/app-middleware.js +1 -0
package/dist/server/app-optimistic-routing.js +22 -1
package/dist/server/app-page-boundary-render.d.ts +2 -1
package/dist/server/app-page-boundary-render.js +45 -21
package/dist/server/app-page-cache.js +9 -7
package/dist/server/app-page-dispatch.d.ts +14 -0
package/dist/server/app-page-dispatch.js +21 -6
package/dist/server/app-page-element-builder.d.ts +23 -2
package/dist/server/app-page-element-builder.js +58 -17
package/dist/server/app-page-execution.d.ts +1 -1
package/dist/server/app-page-execution.js +32 -17
package/dist/server/app-page-render.d.ts +7 -1
package/dist/server/app-page-render.js +11 -16
package/dist/server/app-page-request.d.ts +9 -6
package/dist/server/app-page-request.js +14 -10
package/dist/server/app-page-response.d.ts +2 -2
package/dist/server/app-page-response.js +2 -2
package/dist/server/app-page-route-wiring.d.ts +3 -1
package/dist/server/app-page-route-wiring.js +10 -8
package/dist/server/app-page-stream.d.ts +37 -7
package/dist/server/app-page-stream.js +36 -6
package/dist/server/app-pages-bridge.d.ts +16 -0
package/dist/server/app-pages-bridge.js +23 -3
package/dist/server/app-route-handler-cache.d.ts +1 -0
package/dist/server/app-route-handler-cache.js +1 -0
package/dist/server/app-route-handler-dispatch.d.ts +1 -0
package/dist/server/app-route-handler-dispatch.js +2 -0
package/dist/server/app-route-handler-execution.d.ts +1 -0
package/dist/server/app-route-handler-execution.js +1 -0
package/dist/server/app-route-handler-response.js +11 -10
package/dist/server/app-route-handler-runtime.d.ts +1 -0
package/dist/server/app-route-handler-runtime.js +15 -3
package/dist/server/app-rsc-handler.d.ts +1 -0
package/dist/server/app-rsc-handler.js +5 -4
package/dist/server/app-rsc-response-finalizer.js +1 -1
package/dist/server/app-rsc-route-matching.d.ts +20 -1
package/dist/server/app-rsc-route-matching.js +29 -4
package/dist/server/app-server-action-execution.d.ts +22 -1
package/dist/server/app-server-action-execution.js +73 -12
package/dist/server/app-ssr-entry.d.ts +6 -0
package/dist/server/app-ssr-entry.js +19 -3
package/dist/server/app-ssr-stream.js +9 -1
package/dist/server/dev-lockfile.js +2 -1
package/dist/server/dev-server.d.ts +1 -1
package/dist/server/dev-server.js +97 -43
package/dist/server/headers.d.ts +8 -1
package/dist/server/headers.js +8 -1
package/dist/server/instrumentation-runtime.d.ts +6 -0
package/dist/server/instrumentation-runtime.js +8 -0
package/dist/server/isr-cache.d.ts +37 -1
package/dist/server/isr-cache.js +85 -1
package/dist/server/isr-decision.d.ts +79 -0
package/dist/server/isr-decision.js +70 -0
package/dist/server/metadata-route-response.js +5 -3
package/dist/server/middleware-runtime.d.ts +13 -0
package/dist/server/middleware-runtime.js +11 -7
package/dist/server/middleware.js +1 -0
package/dist/server/navigation-planner.d.ts +62 -1
package/dist/server/navigation-planner.js +193 -3
package/dist/server/navigation-trace.d.ts +12 -2
package/dist/server/navigation-trace.js +11 -1
package/dist/server/normalize-path.d.ts +0 -8
package/dist/server/normalize-path.js +3 -1
package/dist/server/otel-tracer-extension.d.ts +45 -0
package/dist/server/otel-tracer-extension.js +89 -0
package/dist/server/pages-api-route.d.ts +14 -3
package/dist/server/pages-api-route.js +6 -1
package/dist/server/pages-asset-tags.d.ts +15 -4
package/dist/server/pages-asset-tags.js +18 -12
package/dist/server/pages-data-route.js +5 -1
package/dist/server/pages-node-compat.d.ts +5 -11
package/dist/server/pages-node-compat.js +175 -118
package/dist/server/pages-page-data.d.ts +38 -7
package/dist/server/pages-page-data.js +64 -18
package/dist/server/pages-page-handler.d.ts +10 -2
package/dist/server/pages-page-handler.js +49 -20
package/dist/server/pages-page-response.d.ts +55 -2
package/dist/server/pages-page-response.js +74 -6
package/dist/server/pages-readiness.d.ts +36 -0
package/dist/server/pages-readiness.js +21 -0
package/dist/server/pages-request-pipeline.d.ts +113 -0
package/dist/server/pages-request-pipeline.js +230 -0
package/dist/server/pages-revalidate.d.ts +15 -0
package/dist/server/pages-revalidate.js +19 -0
package/dist/server/prod-server.d.ts +45 -3
package/dist/server/prod-server.js +182 -234
package/dist/server/socket-error-backstop.d.ts +19 -1
package/dist/server/socket-error-backstop.js +77 -4
package/dist/shims/app-router-scroll.js +22 -4
package/dist/shims/cache-runtime.js +39 -2
package/dist/shims/dynamic-preload-chunks.d.ts +8 -0
package/dist/shims/dynamic-preload-chunks.js +77 -0
package/dist/shims/dynamic.d.ts +4 -0
package/dist/shims/dynamic.js +4 -2
package/dist/shims/error-boundary.d.ts +17 -7
package/dist/shims/error-boundary.js +8 -1
package/dist/shims/error.js +37 -11
package/dist/shims/fetch-cache.d.ts +22 -1
package/dist/shims/fetch-cache.js +28 -1
package/dist/shims/hash-scroll.d.ts +1 -0
package/dist/shims/hash-scroll.js +3 -1
package/dist/shims/head.js +6 -1
package/dist/shims/headers.d.ts +16 -2
package/dist/shims/headers.js +37 -1
package/dist/shims/image-config.js +7 -1
package/dist/shims/internal/app-route-detection.d.ts +6 -3
package/dist/shims/internal/app-route-detection.js +10 -6
package/dist/shims/internal/app-router-context.d.ts +5 -0
package/dist/shims/internal/link-status-registry.d.ts +43 -0
package/dist/shims/internal/link-status-registry.js +42 -0
package/dist/shims/internal/route-pattern-for-warning.d.ts +27 -0
package/dist/shims/internal/route-pattern-for-warning.js +40 -0
package/dist/shims/internal/utils.d.ts +1 -0
package/dist/shims/link.js +20 -6
package/dist/shims/metadata.d.ts +6 -2
package/dist/shims/metadata.js +32 -14
package/dist/shims/navigation.d.ts +9 -18
package/dist/shims/navigation.js +96 -23
package/dist/shims/router-state.d.ts +1 -0
package/dist/shims/router-state.js +2 -0
package/dist/shims/router.d.ts +6 -3
package/dist/shims/router.js +156 -22
package/dist/shims/script-nonce-context.d.ts +1 -1
package/dist/shims/script-nonce-context.js +11 -3
package/dist/shims/server.d.ts +17 -1
package/dist/shims/server.js +31 -6
package/dist/shims/slot.js +1 -1
package/dist/shims/unified-request-context.js +1 -0
package/dist/typegen.js +1 -0
package/dist/utils/client-build-manifest.d.ts +8 -1
package/dist/utils/client-build-manifest.js +41 -6
package/dist/utils/client-entry-manifest.d.ts +11 -0
package/dist/utils/client-entry-manifest.js +29 -0
package/dist/utils/client-runtime-metadata.d.ts +45 -0
package/dist/utils/client-runtime-metadata.js +63 -0
package/dist/utils/hash.d.ts +17 -1
package/dist/utils/hash.js +36 -1
package/dist/utils/lazy-chunks.d.ts +27 -1
package/dist/utils/lazy-chunks.js +65 -1
package/dist/utils/manifest-paths.d.ts +20 -2
package/dist/utils/manifest-paths.js +38 -3
package/dist/utils/path.d.ts +2 -1
package/dist/utils/path.js +5 -1
package/package.json +6 -2

package/dist/shims/head.js CHANGED Viewed

@@ -104,6 +104,10 @@ const SELF_CLOSING_HEAD_TAGS = new Set([
 ]);
 /** Tags whose content is raw text — closing-tag sequences must be escaped during SSR. */
 const RAW_CONTENT_TAGS = new Set(["script", "style"]);
+const INLINE_CLOSE_TAG_RES = {
+	script: /<\/(script)/gi,
+	style: /<\/(style)/gi
+};
 function warnDisallowedHeadTag(tag) {
 	if (process.env.NODE_ENV !== "production") console.warn(`[vinext] <Head> ignoring disallowed tag <${tag}>. Only ${ALLOWED_HEAD_TAGS_LIST} are allowed.`);
 }
@@ -247,7 +251,8 @@ function escapeAttr(s) {
 * context but prevents the HTML parser from seeing a closing tag.
 */
 function escapeInlineContent(content, tag) {
-	const pattern = new RegExp(`<\\/(${tag})`, "gi");
+	const pattern = INLINE_CLOSE_TAG_RES[tag];
+	if (!pattern) return content;
 	return content.replace(pattern, "<\\/$1");
 }
 function getDangerouslySetInnerHTML(value) {

package/dist/shims/headers.d.ts CHANGED Viewed

@@ -18,12 +18,24 @@ type HeadersAccessPhase = "render" | "action" | "route-handler";
 type VinextHeadersShimState = {
   headersContext: HeadersContext | null;
   dynamicUsageDetected: boolean;
-  renderRequestApiUsage: Set<RenderRequestApiKind>; /** Error recorded by throwIfInsideCacheScope for dev diagnostics, persists even if caught by user code. */
+  renderRequestApiUsage: Set<RenderRequestApiKind>;
+  connectionProbe: ConnectionProbeState | null; /** Error recorded by throwIfInsideCacheScope for dev diagnostics, persists even if caught by user code. */
   invalidDynamicUsageError: unknown;
   pendingSetCookies: string[];
   draftModeCookieHeader: string | null;
   phase: HeadersAccessPhase;
 };
+type ConnectionProbeState = {
+  interrupted: boolean;
+  interrupt: () => void;
+  pending: Promise<never>;
+};
+type ConnectionProbeResult<T> = {
+  completed: true;
+  result: T;
+} | {
+  completed: false;
+};
 /**
  * Dynamic usage flag — set when a component calls connection(), cookies(),
  * headers(), or noStore() during rendering. When true, ISR caching is
@@ -35,6 +47,8 @@ type VinextHeadersShimState = {
  */
 declare function markDynamicUsage(): void;
 declare function markRenderRequestApiUsage(kind: RenderRequestApiKind): void;
+declare function runWithConnectionProbe<T>(fn: () => T | Promise<T>): Promise<ConnectionProbeResult<T>>;
+declare function suspendConnectionProbe(): Promise<never> | null;
 declare function peekRenderRequestApiUsage(): RenderRequestApiKind[];
 declare function consumeRenderRequestApiUsage(): RenderRequestApiKind[];
 /**
@@ -236,4 +250,4 @@ declare class RequestCookies {
   toString(): string;
 }
 //#endregion
-export { HeadersAccessPhase, HeadersContext, type RequestCookies, VinextHeadersShimState, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, throwIfInsideCacheScope };
+export { HeadersAccessPhase, HeadersContext, type RequestCookies, VinextHeadersShimState, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope };

package/dist/shims/headers.js CHANGED Viewed

@@ -21,6 +21,7 @@ const _fallbackState = _g[_FALLBACK_KEY] ??= {
 	headersContext: null,
 	dynamicUsageDetected: false,
 	renderRequestApiUsage: /* @__PURE__ */ new Set(),
+	connectionProbe: null,
 	invalidDynamicUsageError: null,
 	pendingSetCookies: [],
 	draftModeCookieHeader: null,
@@ -115,6 +116,39 @@ function markDynamicUsage() {
 function markRenderRequestApiUsage(kind) {
 	_getState().renderRequestApiUsage.add(kind);
 }
+async function runWithConnectionProbe(fn) {
+	const state = _getState();
+	const previousProbe = state.connectionProbe;
+	let interruptProbe = () => {};
+	const interrupted = new Promise((resolve) => {
+		interruptProbe = () => resolve({ completed: false });
+	});
+	const probe = {
+		interrupted: false,
+		interrupt() {
+			if (probe.interrupted) return;
+			probe.interrupted = true;
+			interruptProbe();
+		},
+		pending: new Promise(() => {})
+	};
+	state.connectionProbe = probe;
+	try {
+		const completed = Promise.resolve().then(fn).then((result) => ({
+			completed: true,
+			result
+		}));
+		return await Promise.race([completed, interrupted]);
+	} finally {
+		state.connectionProbe = previousProbe;
+	}
+}
+function suspendConnectionProbe() {
+	const probe = _getState().connectionProbe;
+	if (!probe) return null;
+	probe.interrupt();
+	return probe.pending;
+}
 function peekRenderRequestApiUsage() {
 	return [..._getState().renderRequestApiUsage].sort();
 }
@@ -260,6 +294,7 @@ function runWithHeadersContext(ctx, fn) {
 		uCtx.headersContext = ctx;
 		uCtx.dynamicUsageDetected = false;
 		uCtx.renderRequestApiUsage = /* @__PURE__ */ new Set();
+		uCtx.connectionProbe = null;
 		uCtx.pendingSetCookies = [];
 		uCtx.draftModeCookieHeader = null;
 		uCtx.phase = "render";
@@ -268,6 +303,7 @@ function runWithHeadersContext(ctx, fn) {
 		headersContext: ctx,
 		dynamicUsageDetected: false,
 		renderRequestApiUsage: /* @__PURE__ */ new Set(),
+		connectionProbe: null,
 		invalidDynamicUsageError: null,
 		pendingSetCookies: [],
 		draftModeCookieHeader: null,
@@ -690,4 +726,4 @@ var RequestCookies = class {
 	}
 };
 //#endregion
-export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, throwIfInsideCacheScope };
+export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope };

package/dist/shims/image-config.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import ipaddr from "ipaddr.js";
 //#region src/shims/image-config.ts
+const globRegexCache = /* @__PURE__ */ new Map();
 /**
 * Convert a glob pattern (with `*` and `**`) to a RegExp.
 *
@@ -14,6 +15,9 @@ import ipaddr from "ipaddr.js";
 * Literal characters are escaped for regex safety.
 */
 function globToRegex(pattern, separator) {
+	const key = `${separator}\0${pattern}`;
+	const cached = globRegexCache.get(key);
+	if (cached !== void 0) return cached;
 	let regexStr = "^";
 	const doubleStar = separator === "." ? ".+" : ".*";
 	const singleStar = separator === "." ? "[^.]+" : "[^/]+";
@@ -27,7 +31,9 @@ function globToRegex(pattern, separator) {
 		}
 	}
 	regexStr += "$";
-	return new RegExp(regexStr);
+	const re = new RegExp(regexStr);
+	globRegexCache.set(key, re);
+	return re;
 }
 /**
 * Check whether a URL matches a single remote pattern.

package/dist/shims/internal/app-route-detection.d.ts CHANGED Viewed

@@ -27,9 +27,12 @@ declare function getPagesRouterComponentsMap(): PagesRouterComponentsMap;
  * Pages Router map when the href matches an App Router route. No-op when the
  * manifest is absent, the URL is external, or no app route matches.
  *
- * `pathname` is the basePath-stripped path — matching Next.js's
- * `router.components[urlPathname]` key (see the source link in this file's
- * leading comment).
+ * `pathname` is the basePath-stripped, trailing-slash-stripped path —
+ * matching Next.js's `removeTrailingSlash(removeBasePath(pathname))` key used
+ * at read time (router.ts:1442). Stripping here ensures the write and read
+ * keys agree regardless of whether the caller normalised trailing slashes
+ * first (e.g. `link.tsx` normalises to match `trailingSlash` config before
+ * calling, while `router.prefetch()` passes the raw user-supplied URL).
  */
 declare function markAppRouteDetectedOnPrefetch(href: string, basePath: string): void;
 //#endregion

package/dist/shims/internal/app-route-detection.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { stripBasePath } from "../../utils/base-path.js";
+import { removeTrailingSlash, stripBasePath } from "../../utils/base-path.js";
 import { createRouteTrieCache, matchRouteWithTrie } from "../../routing/route-matching.js";
 //#region src/shims/internal/app-route-detection.ts
 const appRouteTrieCache = createRouteTrieCache();
@@ -52,15 +52,19 @@ function matchesAppRoute(href, basePath) {
 * Pages Router map when the href matches an App Router route. No-op when the
 * manifest is absent, the URL is external, or no app route matches.
 *
-* `pathname` is the basePath-stripped path — matching Next.js's
-* `router.components[urlPathname]` key (see the source link in this file's
-* leading comment).
+* `pathname` is the basePath-stripped, trailing-slash-stripped path —
+* matching Next.js's `removeTrailingSlash(removeBasePath(pathname))` key used
+* at read time (router.ts:1442). Stripping here ensures the write and read
+* keys agree regardless of whether the caller normalised trailing slashes
+* first (e.g. `link.tsx` normalises to match `trailingSlash` config before
+* calling, while `router.prefetch()` passes the raw user-supplied URL).
 */
 function markAppRouteDetectedOnPrefetch(href, basePath) {
 	if (typeof window === "undefined") return;
 	if (!matchesAppRoute(href, basePath)) return;
-	const pathname = resolveSameOriginPathname(href, basePath);
-	if (pathname === null) return;
+	const rawPathname = resolveSameOriginPathname(href, basePath);
+	if (rawPathname === null) return;
+	const pathname = removeTrailingSlash(rawPathname);
 	getPagesRouterComponentsMap()[pathname] = { __appRouter: true };
 }
 //#endregion

package/dist/shims/internal/app-router-context.d.ts CHANGED Viewed

@@ -16,6 +16,11 @@ type AppRouterInstance = {
   push(href: string, options?: NavigateOptions): void;
   replace(href: string, options?: NavigateOptions): void;
   prefetch(href: string, options?: PrefetchOptions): void;
+  /**
+   * Perform an experimental gesture transition navigation.
+   * Only available when experimental.gestureTransition is enabled.
+   */
+  experimental_gesturePush?(href: string, options?: NavigateOptions): void;
 };
 declare const AppRouterContext: React$1.Context<AppRouterInstance | null> | null;
 declare const GlobalLayoutRouterContext: React$1.Context<unknown> | null;

package/dist/shims/internal/link-status-registry.d.ts ADDED Viewed

@@ -0,0 +1,43 @@
+//#region src/shims/internal/link-status-registry.d.ts
+/**
+ * Link-status pending registry.
+ *
+ * Tracks the single <Link> that started the most recent App Router navigation
+ * so its `useLinkStatus()` pending state can be reset when a *different*
+ * navigation begins — a different <Link> click, `router.push`/`router.replace`,
+ * a form submission, shallow routing via raw `history.pushState`, or browser
+ * back/forward. Without this, a Link's pending indicator stays "sticky" after
+ * an interrupting navigation, because the Link's own completion handler is the
+ * only thing that would otherwise clear it.
+ *
+ * Mirrors Next.js's `linkForMostRecentNavigation` /
+ * `setLinkForCurrentNavigation` in
+ * packages/next/src/client/components/links.ts, adapted to vinext's per-<Link>
+ * React state model: instead of an optimistic-status dispatcher, we hold the
+ * link's `setPending` setter.
+ */
+type PendingLinkSetter = (pending: boolean) => void;
+/**
+ * Mark `setter` as the link that started the most recent navigation, resetting
+ * the previously-tracked link's pending state to idle so only the last-clicked
+ * link shows a pending state.
+ */
+declare function setLinkForCurrentNavigation(setter: PendingLinkSetter): void;
+/**
+ * Stop tracking `setter` if it is the current navigation link. Called when a
+ * <Link> finishes its own navigation or unmounts so we never hold a stale
+ * reference to an unmounted component's setter.
+ */
+declare function clearLinkForCurrentNavigation(setter: PendingLinkSetter): void;
+/**
+ * Reset any link that is currently showing a pending state. Invoked at the
+ * start of every App Router navigation so that navigations not initiated by the
+ * tracked link — `router.push`/`router.replace`, form submissions, shallow
+ * routing, and browser back/forward — clear a stale pending indicator. A
+ * link-initiated navigation registers itself first via
+ * `setLinkForCurrentNavigation`; the matching call here consumes that marker and
+ * keeps the link pending.
+ */
+declare function notifyLinkNavigationStart(): void;
+//#endregion
+export { PendingLinkSetter, clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation };

package/dist/shims/internal/link-status-registry.js ADDED Viewed

@@ -0,0 +1,42 @@
+//#region src/shims/internal/link-status-registry.ts
+let linkSetterForMostRecentNavigation = null;
+let currentNavigationIsLinkInitiated = false;
+/**
+* Mark `setter` as the link that started the most recent navigation, resetting
+* the previously-tracked link's pending state to idle so only the last-clicked
+* link shows a pending state.
+*/
+function setLinkForCurrentNavigation(setter) {
+	if (linkSetterForMostRecentNavigation && linkSetterForMostRecentNavigation !== setter) linkSetterForMostRecentNavigation(false);
+	linkSetterForMostRecentNavigation = setter;
+	currentNavigationIsLinkInitiated = true;
+}
+/**
+* Stop tracking `setter` if it is the current navigation link. Called when a
+* <Link> finishes its own navigation or unmounts so we never hold a stale
+* reference to an unmounted component's setter.
+*/
+function clearLinkForCurrentNavigation(setter) {
+	if (linkSetterForMostRecentNavigation === setter) linkSetterForMostRecentNavigation = null;
+}
+/**
+* Reset any link that is currently showing a pending state. Invoked at the
+* start of every App Router navigation so that navigations not initiated by the
+* tracked link — `router.push`/`router.replace`, form submissions, shallow
+* routing, and browser back/forward — clear a stale pending indicator. A
+* link-initiated navigation registers itself first via
+* `setLinkForCurrentNavigation`; the matching call here consumes that marker and
+* keeps the link pending.
+*/
+function notifyLinkNavigationStart() {
+	if (currentNavigationIsLinkInitiated) {
+		currentNavigationIsLinkInitiated = false;
+		return;
+	}
+	if (linkSetterForMostRecentNavigation) {
+		linkSetterForMostRecentNavigation(false);
+		linkSetterForMostRecentNavigation = null;
+	}
+}
+//#endregion
+export { clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation };

package/dist/shims/internal/route-pattern-for-warning.d.ts ADDED Viewed

@@ -0,0 +1,27 @@
+//#region src/shims/internal/route-pattern-for-warning.d.ts
+/**
+ * Side-effect-free accessor for the current render's route pattern, used by
+ * Next.js-parity diagnostics such as the Link shim's
+ * "Invalid href ... in page: '...'" `console.error`.
+ *
+ * Mirrors Next.js's `router.pathname`, which is the *route pattern* (e.g.
+ * `/posts/[id]`), not the resolved URL. During Pages Router SSR the route
+ * pattern lives on the request-scoped SSR context; the server-only
+ * `router-state.ts` publishes an accessor for it under a well-known
+ * `Symbol.for` handle. We read it through that handle rather than importing
+ * `router.ts` directly — importing `router.ts` would pull its browser-only
+ * `installWindowNext()` side effect into every consumer of the Link shim
+ * (including the App Router client bundle), clobbering `window.next.router`.
+ *
+ * On the client (or when no accessor is registered, e.g. App Router) we fall
+ * back to `window.location.pathname`, then to `"/"`.
+ */
+/**
+ * Register the server-side route-pattern accessor. Called once by the
+ * server-only router-state module on import. Idempotent.
+ * @internal
+ */
+declare function registerRoutePatternForWarningAccessor(accessor: () => string | null): void;
+declare function getCurrentRoutePathnameForWarning(): string;
+//#endregion
+export { getCurrentRoutePathnameForWarning, registerRoutePatternForWarningAccessor };

package/dist/shims/internal/route-pattern-for-warning.js ADDED Viewed

@@ -0,0 +1,40 @@
+//#region src/shims/internal/route-pattern-for-warning.ts
+/**
+* Side-effect-free accessor for the current render's route pattern, used by
+* Next.js-parity diagnostics such as the Link shim's
+* "Invalid href ... in page: '...'" `console.error`.
+*
+* Mirrors Next.js's `router.pathname`, which is the *route pattern* (e.g.
+* `/posts/[id]`), not the resolved URL. During Pages Router SSR the route
+* pattern lives on the request-scoped SSR context; the server-only
+* `router-state.ts` publishes an accessor for it under a well-known
+* `Symbol.for` handle. We read it through that handle rather than importing
+* `router.ts` directly — importing `router.ts` would pull its browser-only
+* `installWindowNext()` side effect into every consumer of the Link shim
+* (including the App Router client bundle), clobbering `window.next.router`.
+*
+* On the client (or when no accessor is registered, e.g. App Router) we fall
+* back to `window.location.pathname`, then to `"/"`.
+*/
+const ROUTE_PATTERN_FOR_WARNING_ACCESSOR_KEY = Symbol.for("vinext.router.routePatternForWarningAccessor");
+/**
+* Register the server-side route-pattern accessor. Called once by the
+* server-only router-state module on import. Idempotent.
+* @internal
+*/
+function registerRoutePatternForWarningAccessor(accessor) {
+	globalThis[ROUTE_PATTERN_FOR_WARNING_ACCESSOR_KEY] = accessor;
+}
+function getCurrentRoutePathnameForWarning() {
+	if (typeof window === "undefined") {
+		const accessor = globalThis[ROUTE_PATTERN_FOR_WARNING_ACCESSOR_KEY];
+		if (accessor) try {
+			const pattern = accessor();
+			if (pattern) return pattern;
+		} catch {}
+		return "/";
+	}
+	return window.location?.pathname ?? "/";
+}
+//#endregion
+export { getCurrentRoutePathnameForWarning, registerRoutePatternForWarningAccessor };

package/dist/shims/internal/utils.d.ts CHANGED Viewed

@@ -21,6 +21,7 @@ type NEXT_DATA = {
     statusCode: number;
     name?: string;
   };
+  isExperimentalCompile?: boolean;
   gsp?: boolean;
   gssp?: boolean;
   customServer?: boolean;

package/dist/shims/link.js CHANGED Viewed

@@ -12,12 +12,14 @@ import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.j
 import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, resolveRelativeHref, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
+import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
 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 { getI18nContext } from "./i18n-context.js";
 import { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchHref } from "./link-prefetch.js";
+import { clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation } from "./internal/link-status-registry.js";
 import React, { createContext, forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";
 //#region src/shims/link.tsx
@@ -37,6 +39,7 @@ const LinkStatusContext = createContext({ pending: false });
 function useLinkStatus() {
 	return useContext(LinkStatusContext);
 }
+if (typeof window !== "undefined") registerNavigationRuntimeFunctions({ notifyLinkNavigationStart });
 /** basePath from next.config.js, injected by the plugin at build time */
 const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
 /** trailingSlash from next.config.js, injected by the plugin at build time */
@@ -45,7 +48,7 @@ const __prefetchInlining = process.env.__VINEXT_PREFETCH_INLINING === "true";
 const linkPrefetchRouteTrieCache = createRouteTrieCache();
 function resolveHref(href) {
 	if (typeof href === "string") return href;
-	let url = href.pathname ?? "/";
+	let url = href.pathname ?? "";
 	if (href.query) {
 		const params = urlQueryToSearchParams(href.query);
 		url = appendSearchParamsToUrl(url, params);
@@ -81,17 +84,19 @@ function normalizeRepeatedSlashes(url) {
 * `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. We do not have
-* cheap access to the route pattern from inside the Link shim, so we
-* fall back to `window.location.pathname` (or `"/"` during SSR). The text
-* is cosmetic and is not asserted by the Next.js compat test.
+* `/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 = typeof window !== "undefined" && window.location ? window.location.pathname : "/";
+	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;
@@ -381,10 +386,16 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 	const fullHref = normalizePathTrailingSlash(withBasePath(normalizedHref, __basePath), __trailingSlash);
 	const [pending, setPending] = useState(false);
 	const mountedRef = useRef(true);
+	const setPendingRef = useRef(null);
+	if (setPendingRef.current === null) setPendingRef.current = (next) => {
+		if (mountedRef.current) setPending(next);
+	};
 	useEffect(() => {
 		mountedRef.current = true;
+		const setter = setPendingRef.current;
 		return () => {
 			mountedRef.current = false;
+			if (setter) clearLinkForCurrentNavigation(setter);
 		};
 	}, []);
 	const internalRef = useRef(null);
@@ -497,10 +508,13 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			if (navEvent.defaultPrevented) return;
 		} catch {}
 		if (getNavigationRuntime()?.functions.navigate) {
+			const setter = setPendingRef.current;
+			if (setter) setLinkForCurrentNavigation(setter);
 			setPending(true);
 			React.startTransition(() => {
 				navigateClientSide(navigateHref, replace ? "replace" : "push", scroll, true).finally(() => {
 					if (mountedRef.current) setPending(false);
+					if (setter) clearLinkForCurrentNavigation(setter);
 				});
 			});
 			return;

package/dist/shims/metadata.d.ts CHANGED Viewed

@@ -271,11 +271,15 @@ declare function resolveModuleMetadata(mod: Record<string, unknown>, params?: Re
 type MetadataHeadProps = {
   metadata: Metadata;
   pathname?: string;
+  trailingSlash?: boolean;
 };
-declare function renderMetadataToHtml(metadata: Metadata, pathname?: string): string;
+declare function renderMetadataToHtml(metadata: Metadata, pathname?: string, options?: {
+  trailingSlash?: boolean;
+}): string;
 declare function MetadataHead({
   metadata,
-  pathname
+  pathname,
+  trailingSlash
 }: MetadataHeadProps): React.JSX.Element;
 //#endregion
 export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };

package/dist/shims/metadata.js CHANGED Viewed

@@ -287,18 +287,35 @@ function formatResolvedMetadataUrl(url) {
 	if (url.pathname === "/" && url.search === "" && url.hash === "") return url.origin;
 	return url.href;
 }
-function resolveMetadataUrl(url, metadataBase) {
+const TRAILING_SLASH_FILE_REGEX = /^(?:\/((?!\.well-known(?:\/.*)?)((?:[^/]+\/)*)([^/]+\.\w+)))(\/?|$)/i;
+function resolveMetadataUrl(url, metadataBase, trailingSlash) {
 	const value = stringifyUrl(url);
-	if (isAbsoluteOrProtocolRelativeUrl(value) || !metadataBase) return value;
+	if (!metadataBase) return value;
 	try {
-		return formatResolvedMetadataUrl(new URL(joinMetadataPath(metadataBase.pathname, value), metadataBase));
+		const isAbsolute = isAbsoluteOrProtocolRelativeUrl(value);
+		const composed = isAbsolute ? new URL(value, metadataBase) : new URL(joinMetadataPath(metadataBase.pathname, value), metadataBase);
+		if (isAbsolute && composed.origin !== metadataBase.origin) return value;
+		if (trailingSlash === true && composed.search === "") {
+			if (composed.pathname !== "/" && !composed.pathname.endsWith("/") && !TRAILING_SLASH_FILE_REGEX.test(composed.pathname)) composed.pathname += "/";
+		}
+		const result = formatResolvedMetadataUrl(composed);
+		if (trailingSlash === true && result === metadataBase.origin) return `${metadataBase.origin}/`;
+		return result;
 	} catch {
 		return value;
 	}
 }
-function resolveCanonicalUrl(url, metadataBase, pathname) {
-	if (url instanceof URL) return resolveMetadataUrl(url, metadataBase);
-	return resolveMetadataUrl(resolveRelativeMetadataUrl(url, pathname), metadataBase);
+function resolveCanonicalUrl(url, metadataBase, pathname, trailingSlash) {
+	if (url instanceof URL) return resolveMetadataUrl(url, metadataBase, trailingSlash);
+	return resolveMetadataUrl(resolveRelativeMetadataUrl(url, pathname), metadataBase, trailingSlash);
+}
+function resolveAlternateUrl(url, metadataBase, pathname, trailingSlash) {
+	if (url instanceof URL) {
+		const resolvedUrl = new URL(pathname, url);
+		url.searchParams.forEach((value, key) => resolvedUrl.searchParams.set(key, value));
+		return resolveMetadataUrl(resolvedUrl, metadataBase, trailingSlash);
+	}
+	return resolveCanonicalUrl(url, metadataBase, pathname, trailingSlash);
 }
 function isSocialImageDescriptor(value) {
 	return typeof value === "object" && !(value instanceof URL);
@@ -359,13 +376,14 @@ function renderMetadataElementToHtml(node) {
 		default: return "";
 	}
 }
-function renderMetadataToHtml(metadata, pathname = "/") {
+function renderMetadataToHtml(metadata, pathname = "/", options) {
 	return renderMetadataElementToHtml(MetadataHead({
 		metadata,
-		pathname
+		pathname,
+		trailingSlash: options?.trailingSlash
 	}));
 }
-function MetadataHead({ metadata, pathname = "/" }) {
+function MetadataHead({ metadata, pathname = "/", trailingSlash }) {
 	const elements = [];
 	let key = 0;
 	const base = metadata.metadataBase;
@@ -474,7 +492,7 @@ function MetadataHead({ metadata, pathname = "/" }) {
 		}, key++));
 		if (og.url) elements.push(/* @__PURE__ */ jsx("meta", {
 			property: "og:url",
-			content: resolveUrl(og.url)
+			content: resolveCanonicalUrl(og.url, base, pathname, trailingSlash)
 		}, key++));
 		if (og.siteName) elements.push(/* @__PURE__ */ jsx("meta", {
 			property: "og:site_name",
@@ -691,22 +709,22 @@ function MetadataHead({ metadata, pathname = "/" }) {
 		const alt = metadata.alternates;
 		if (alt.canonical) elements.push(/* @__PURE__ */ jsx("link", {
 			rel: "canonical",
-			href: resolveCanonicalUrl(alt.canonical, base, pathname)
+			href: resolveCanonicalUrl(alt.canonical, base, pathname, trailingSlash)
 		}, key++));
 		if (alt.languages) for (const [lang, href] of Object.entries(alt.languages)) elements.push(/* @__PURE__ */ jsx("link", {
 			rel: "alternate",
 			hrefLang: lang,
-			href: resolveUrl(href)
+			href: resolveAlternateUrl(href, base, pathname, trailingSlash)
 		}, key++));
 		if (alt.media) for (const [media, href] of Object.entries(alt.media)) elements.push(/* @__PURE__ */ jsx("link", {
 			rel: "alternate",
 			media,
-			href: resolveUrl(href)
+			href: resolveAlternateUrl(href, base, pathname, trailingSlash)
 		}, key++));
 		if (alt.types) for (const [type, href] of Object.entries(alt.types)) elements.push(/* @__PURE__ */ jsx("link", {
 			rel: "alternate",
 			type,
-			href: resolveUrl(href)
+			href: resolveAlternateUrl(href, base, pathname, trailingSlash)
 		}, key++));
 	}
 	if (metadata.verification) {