vinext 1.1.0 → 1.2.0

package/dist/shims/navigation.js

@@ -9,14 +9,15 @@ import { getPprFallbackShellState, markPprFallbackShellDynamicBoundary } from ".
 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 { disableSmoothScrollDuringRouteTransition } from "./disable-smooth-scroll.js";
+import { retryScrollTo, scrollToHashTarget } from "./hash-scroll.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.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";
 import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent } from "./app-router-scroll-state.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import { getNavigationRuntime, hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
@@ -797,6 +798,22 @@ async function fetchRouteTreeGatedPrefetch(options) {
 	return fetchFullRscPayload();
 }
 /**
+* Whether a prefetch response may be decoded as Flight. A successful response
+* that is not Flight (e.g. a Route Handler's text download) is a miss: decoding
+* its bytes would let text shaped like Flight resource hints insert scripts.
+* Navigation then fetches it and falls back to a document navigation.
+*
+* Ported from Next.js: fetchPrefetchResponse in
+* packages/next/src/client/components/segment-cache/cache.ts, which skips the
+* check in `output: "export"` because a static host, not Next.js, chooses the
+* MIME type of the exported `.txt` payloads.
+*/
+function isFlightPrefetchResponse(response) {
+	if (!response.ok) return false;
+	if (process.env.NODE_ENV === "production" && process.env.__NEXT_CONFIG_OUTPUT === "export") return true;
+	return response.headers.get("content-type")?.toLowerCase().startsWith(VINEXT_RSC_CONTENT_TYPE) === true;
+}
+/**
 * Prefetch an RSC response and snapshot it for later consumption.
 * Stores the in-flight promise so immediate clicks can await it instead
 * of firing a duplicate fetch.
@@ -824,7 +841,7 @@ function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, m
 	addPrefetchInvalidationCallback(entry, options?.onInvalidate);
 	entry.fetchPromise = fetchPromise;
 	entry.pending = fetchPromise.then(async (response) => {
-		if (response.ok) {
+		if (isFlightPrefetchResponse(response)) {
 			const snapshot = await snapshotRscResponse(response);
 			if (cache.get(cacheKey) !== entry) return;
 			const previousSize = getPrefetchCacheEntrySize(entry);
@@ -841,6 +858,7 @@ function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, m
 			evictPrefetchCacheIfNeeded();
 		} else {
 			releaseAppPrefetchFetchSlot(response);
+			response.body?.cancel().catch(() => {});
 			deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, false);
 		}
 	}).catch(() => {
@@ -1333,11 +1351,19 @@ function commitHashOnlyHistoryState(href, mode, scroll) {
 function applyAppRouterScrollFallback(intent) {
 	if (typeof document === "undefined" || typeof window === "undefined") return;
 	if (intent.hash !== null) {
-		scrollToHashTargetOnNextFrame(intent.hash, () => isLatestAppRouterScrollIntent(intent));
+		const hash = intent.hash;
+		requestAnimationFrame(() => {
+			if (!isLatestAppRouterScrollIntent(intent)) return;
+			disableSmoothScrollDuringRouteTransition(() => {
+				scrollToHashTarget(hash);
+			});
+		});
 		return;
 	}
 	if (intent.targetHoistedInHead) return;
-	document.documentElement.scrollTop = 0;
+	disableSmoothScrollDuringRouteTransition(() => {
+		document.documentElement.scrollTop = 0;
+	});
 }
 function scheduleAppRouterScrollFallback(intent) {
 	queueMicrotask(() => {

package/dist/shims/request-context.d.ts

@@ -44,6 +44,8 @@ export type ExecutionContextLike = {
   isInternalPagesRevalidation?: boolean;
   /** Marks a build-secret-authorized Worker request that may run prerender discovery hooks. */
   isPrerenderPathDiscovery?: boolean;
+  /** Marks an adapter-invoked regeneration of an entry stored for this build. */
+  isStoredEntryRegeneration?: boolean;
   /**
    * Installed only by the prerender server: records the page's special error
    * that escaped the shell, with the headers to store, for the build.

package/dist/shims/request-state-types.d.ts

@@ -3,7 +3,8 @@ import { NavigationContext } from "./navigation-context-state.js";
 import "./navigation.js";
 import { CacheLifeConfig, CacheState } from "./cache-request-state.js";
 import { RootParamsState } from "./root-params.js";
-import { FetchCacheState } from "./fetch-cache.js";
+import { FetchCacheState } from "./fetch-cache-state.js";
+import "./fetch-cache.js";
 import { HeadersAccessPhase, VinextHeadersShimState } from "./internal/headers-state.js";
 import { HeadersContext } from "./headers.js";
 import { RouterState, SSRContext } from "./router-state.js";

package/dist/shims/router.js

@@ -1,6 +1,7 @@
 import { isUnknownRecord } from "../utils/record.js";
 import { parseCookieHeader } from "../utils/parse-cookie.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import { substituteDestinationParams } from "../config/destination-params.js";
 import { sortRoutes, splitPathSegments } from "../routing/utils.js";
 import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
@@ -19,6 +20,7 @@ import { resolveDirectHybridClientRouteOwner } from "./internal/hybrid-client-ro
 import { installWindowNext } from "../client/window-next.js";
 import { getWindowOrigin, isAbsoluteOrProtocolRelativeUrl, isAbsoluteUrl, isHashOnlyBrowserUrlChange, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, toSameOriginPath, withBasePath } from "./url-utils.js";
 import { addQueryParam, mergeRewriteQuery, mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
+import { disableSmoothScrollDuringRouteTransition } from "./disable-smooth-scroll.js";
 import { scrollToHashTarget } from "./hash-scroll.js";
 import { installPagesRouterRuntime, setPagesRouterPopStateHandler, setStampInitialHistoryState } from "./pages-router-runtime.js";
 import { interpolateDynamicRouteHref, resolveDynamicRouteHref } from "./internal/interpolate-as.js";
@@ -129,16 +131,9 @@ function scrollToPagesRouterPosition({ x, y }) {
 		window.scrollTo(x, y);
 		return;
 	}
-	const htmlElement = document.documentElement;
-	if (!(htmlElement.dataset.scrollBehavior === "smooth")) {
+	disableSmoothScrollDuringRouteTransition(() => {
 		window.scrollTo(x, y);
-		return;
-	}
-	const previousScrollBehavior = htmlElement.style.scrollBehavior;
-	htmlElement.style.scrollBehavior = "auto";
-	htmlElement.getClientRects();
-	window.scrollTo(x, y);
-	htmlElement.style.scrollBehavior = previousScrollBehavior;
+	});
 }
 function isAtScrollPosition({ x, y }) {
 	return Math.abs(window.scrollX - x) <= SCROLL_RESTORE_TOLERANCE_PX && Math.abs(window.scrollY - y) <= SCROLL_RESTORE_TOLERANCE_PX;
@@ -1020,10 +1015,10 @@ async function resolveClientConfigRedirect(href) {
 	if (!redirects || redirects.length === 0) return null;
 	const routeContext = getClientConfigRouteContext(href);
 	if (!routeContext) return null;
-	const { matchRedirect, preserveRedirectDestinationQuery } = await import("../config/config-matchers.js");
-	const redirect = matchRedirect(routeContext.pathname, redirects, routeContext.context, routeContext.basePathState);
+	const [{ matchClientRedirect }, { preserveRedirectDestinationQuery }] = await Promise.all([import("../client/client-redirect-matcher.js"), import("../config/config-matchers.js")]);
+	const redirect = matchClientRedirect(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);
+	return preserveRedirectDestinationQuery(__basePath && routeContext.basePathState.hadBasePath && !isExternalUrl(redirect.destination) && !hasBasePath(redirect.destination, __basePath) ? __basePath + redirect.destination : redirect.destination, routeContext.search, redirect.destinationQuery);
 }
 async function applyClientConfigRewrite(href, rewrite) {
 	const routeContext = getClientConfigRouteContext(href);
@@ -1076,12 +1071,6 @@ function simpleClientConfigSourceCouldMatch(pathname, source) {
 	const normalizedPathname = removeTrailingSlash(pathname);
 	return normalizedPathname === normalizedPrefix || normalizedPathname.startsWith(`${normalizedPrefix}/`);
 }
-function substituteSimpleClientConfigDestination(destination, params) {
-	const keys = Object.keys(params);
-	if (keys.length === 0) return destination;
-	const alternation = keys.sort((a, b) => b.length - a.length).map((key) => key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
-	return destination.replace(new RegExp(`:(${alternation})([+*])?(?![A-Za-z0-9_])`, "g"), (_token, key) => params[key] ?? _token);
-}
 function isExternalClientConfigUrl(url) {
 	return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
 }
@@ -1111,7 +1100,7 @@ function resolveClientConfigRewriteSync(href) {
 		const params = matchSimpleClientConfigPattern(routeContext.pathname, rewrite.source);
 		if (params === void 0) return void 0;
 		if (params === null) continue;
-		const rewritten = substituteSimpleClientConfigDestination(rewrite.destination, params);
+		const rewritten = substituteDestinationParams(rewrite.destination, params, "rewrite");
 		if (isExternalClientConfigUrl(rewritten)) return { kind: "document" };
 		currentHref = mergeRewriteQuery(currentHref, rewritten);
 		matched = true;
@@ -2018,7 +2007,10 @@ See more info: https://nextjs.org/docs/messages/invalid-relative-url-external-as
 		emitBeforeHistoryChange();
 		if (doScroll) {
 			if (hash) scrollToHashTarget(hash);
-			else window.scrollTo(0, 0);
+			else scrollToPagesRouterPosition({
+				x: 0,
+				y: 0
+			});
 		}
 	}
 	onStateUpdate?.();

package/dist/shims/server.d.ts

@@ -26,6 +26,7 @@ export type RequestInit = globalThis.RequestInit & {
       }>;
     } | null;
     trailingSlash?: boolean;
+    skipTrailingSlashRedirect?: boolean;
   };
   signal?: AbortSignal;
   duplex?: "half";
@@ -109,6 +110,14 @@ export type NextURLConfig = {
      * honour the user's `trailingSlash` config.
      */
     trailingSlash?: boolean;
+    /**
+     * When true, the trailing slash follows the parsed URL instead, and
+     * `trailingSlash` only decides the root, like Next.js's
+     * getNextPathnameInfo. Without the trailing-slash redirect, requests
+     * arrive in either form, so the config can no longer be applied as a
+     * policy.
+     */
+    skipTrailingSlashRedirect?: boolean;
   };
 };
 export declare class NextURL {
@@ -121,6 +130,8 @@ export declare class NextURL {
    */
   private _configBasePath;
   private _basePath;
+  private _configTrailingSlash;
+  private _manualTrailingSlash;
   private _trailingSlash;
   private _locale;
   private _configDefaultLocale;
@@ -129,6 +140,11 @@ export declare class NextURL {
   private _domains;
   private _domainLocale;
   constructor(input: string | URL, base?: string | URL, config?: NextURLConfig);
+  /**
+   * With `skipTrailingSlashRedirect`, take the slash from the parsed pathname
+   * (before basePath and locale are stripped), as getNextPathnameInfo does.
+   */
+  private _analyzeTrailingSlash;
   /** Strip basePath prefix from the internal pathname.
    * Mirrors Next.js's getNextPathnameInfo (re-run by NextURL.analyze() on
    * every parse, including `href` reassignment): basePath is only considered

package/dist/shims/server.js

@@ -131,7 +131,8 @@ var NextRequest = class extends Request {
 			basePath: _nextConfig.basePath,
 			nextConfig: {
 				i18n,
-				trailingSlash: _nextConfig.trailingSlash
+				trailingSlash: _nextConfig.trailingSlash,
+				skipTrailingSlashRedirect: _nextConfig.skipTrailingSlashRedirect
 			}
 		} : void 0;
 		this._nextUrl = new NextURL(url, void 0, urlConfig);
@@ -266,6 +267,8 @@ var NextURL = class NextURL {
 	*/
 	_configBasePath;
 	_basePath;
+	_configTrailingSlash;
+	_manualTrailingSlash;
 	_trailingSlash;
 	_locale;
 	_configDefaultLocale;
@@ -277,7 +280,10 @@ var NextURL = class NextURL {
 		this._url = new URL(input.toString(), base);
 		this._configBasePath = config?.basePath ?? "";
 		this._basePath = this._configBasePath;
-		this._trailingSlash = config?.nextConfig?.trailingSlash ?? false;
+		this._configTrailingSlash = config?.nextConfig?.trailingSlash ?? false;
+		this._manualTrailingSlash = config?.nextConfig?.skipTrailingSlashRedirect === true;
+		this._trailingSlash = this._configTrailingSlash;
+		this._analyzeTrailingSlash();
 		this._stripBasePath();
 		const i18n = config?.nextConfig?.i18n;
 		if (i18n) {
@@ -290,6 +296,15 @@ var NextURL = class NextURL {
 			this._analyzeI18n();
 		}
 	}
+	/**
+	* With `skipTrailingSlashRedirect`, take the slash from the parsed pathname
+	* (before basePath and locale are stripped), as getNextPathnameInfo does.
+	*/
+	_analyzeTrailingSlash() {
+		if (!this._manualTrailingSlash) return;
+		const { pathname } = this._url;
+		this._trailingSlash = pathname !== "/" ? pathname.endsWith("/") : this._configTrailingSlash;
+	}
 	/** Strip basePath prefix from the internal pathname.
 	* Mirrors Next.js's getNextPathnameInfo (re-run by NextURL.analyze() on
 	* every parse, including `href` reassignment): basePath is only considered
@@ -348,7 +363,8 @@ var NextURL = class NextURL {
 	*/
 	_applyTrailingSlash(pathname) {
 		if (pathname === "" || pathname === "/") return pathname;
-		if ((this._basePath ? stripBasePath(pathname, this._basePath) : pathname).startsWith("/_next/")) return removeTrailingSlash(pathname);
+		const pathnameWithoutBasePath = this._basePath ? stripBasePath(pathname, this._basePath) : pathname;
+		if (!this._manualTrailingSlash && pathnameWithoutBasePath.startsWith("/_next/")) return removeTrailingSlash(pathname);
 		if (this._trailingSlash) return pathname.endsWith("/") ? pathname : pathname + "/";
 		return pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
 	}
@@ -361,6 +377,7 @@ var NextURL = class NextURL {
 	}
 	set href(value) {
 		this._url.href = value;
+		this._analyzeTrailingSlash();
 		this._stripBasePath();
 		this._analyzeI18n();
 	}
@@ -467,7 +484,10 @@ var NextURL = class NextURL {
 				locales: domain.locales ? [...domain.locales] : void 0
 			}))
 		};
-		if (this._trailingSlash) nextConfig.trailingSlash = true;
+		if (this._manualTrailingSlash) {
+			nextConfig.skipTrailingSlashRedirect = true;
+			if (this._configTrailingSlash) nextConfig.trailingSlash = true;
+		} else if (this._trailingSlash) nextConfig.trailingSlash = true;
 		const config = {
 			basePath: this._configBasePath,
 			nextConfig: Object.keys(nextConfig).length > 0 ? nextConfig : void 0

package/dist/shims/unified-request-context.d.ts

@@ -1,7 +1,7 @@
 import { ExecutionContextLike } from "./request-context.js";
 import { CacheState } from "./cache-request-state.js";
 import { RootParamsState } from "./root-params.js";
-import { FetchCacheState } from "./fetch-cache.js";
+import { FetchCacheState } from "./fetch-cache-state.js";
 import { VinextHeadersShimState } from "./internal/headers-state.js";
 import { RouterState } from "./router-state.js";
 import { markFullyBufferedBody, preserveFullyBufferedBodyMetadata } from "../server/fully-buffered-response.js";

package/dist/shims/url-utils.d.ts

@@ -30,6 +30,8 @@ export declare function toSameOriginAppPath(url: string, basePath: string): stri
  *   `.well-known`-aware redirect rule shipped in `routes-manifest.json`.
  * - Query strings and hash fragments are preserved verbatim.
  * - Idempotent: already-canonical paths round-trip unchanged.
+ * - With `skipTrailingSlashRedirect`, every path is returned as written, like
+ *   Next.js's `__NEXT_MANUAL_TRAILING_SLASH` short-circuit.
  */
 export declare function normalizePathTrailingSlash(path: string, trailingSlash: boolean): string;
 /**

package/dist/shims/url-utils.js

@@ -99,9 +99,11 @@ function removeRouteTrailingSlash(route) {
 *   `.well-known`-aware redirect rule shipped in `routes-manifest.json`.
 * - Query strings and hash fragments are preserved verbatim.
 * - Idempotent: already-canonical paths round-trip unchanged.
+* - With `skipTrailingSlashRedirect`, every path is returned as written, like
+*   Next.js's `__NEXT_MANUAL_TRAILING_SLASH` short-circuit.
 */
 function normalizePathTrailingSlash(path, trailingSlash) {
-	if (!path.startsWith("/") || path.startsWith("//")) return path;
+	if (!path.startsWith("/") || path.startsWith("//") || process.env.__VINEXT_MANUAL_TRAILING_SLASH === "true") return path;
 	const { pathname, query, hash } = parsePath(path);
 	if (trailingSlash) {
 		if (/\.[^/]+\/?$/.test(pathname)) return `${removeRouteTrailingSlash(pathname)}${query}${hash}`;

package/dist/utils/client-runtime-metadata.js

@@ -1,8 +1,8 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { isAbsoluteAssetPrefix, resolveAssetsDir } from "./asset-prefix.js";
 import { manifestFileWithAssetPrefix, manifestFileWithBase } from "./manifest-paths.js";
-import { findClientEntryFile, findPagesClientEntryFile, readClientBuildManifest } from "./client-build-manifest.js";
 import { findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest } from "./client-entry-manifest.js";
+import { findClientEntryFile, findPagesClientEntryFile, readClientBuildManifest } from "./client-build-manifest.js";
 import { computeDynamicImportPreloads, computeLazyChunks, dynamicImportPreloadsWithBase } from "./lazy-chunks.js";
 //#region src/utils/client-runtime-metadata.ts
 function collectCssGraph(buildManifest, applyBase) {

package/dist/utils/hash.d.ts

@@ -20,4 +20,11 @@ export declare function fnv1a64(input: string): string;
  * key format and produces different values. Do not swap one for the other.
  */
 export declare function fnv1a52(str: string): number;
+/**
+ * Hex-encoded SHA-256 digest of a string's UTF-8 bytes, via Web Crypto so it
+ * runs unchanged in Node.js, Workers and browsers. Used for cache keys built
+ * from inputs a request can influence, where crafted inputs could collide
+ * under a non-cryptographic hash like `fnv1a64`.
+ */
+export declare function sha256Hex(input: string): Promise<string>;
 //#endregion

package/dist/utils/hash.js

@@ -51,5 +51,15 @@ function fnv1a52(str) {
 	}
 	return (v3 & 15) * 281474976710656 + v2 * 4294967296 + v1 * 65536 + (v0 ^ v3 >> 4);
 }
+/**
+* Hex-encoded SHA-256 digest of a string's UTF-8 bytes, via Web Crypto so it
+* runs unchanged in Node.js, Workers and browsers. Used for cache keys built
+* from inputs a request can influence, where crafted inputs could collide
+* under a non-cryptographic hash like `fnv1a64`.
+*/
+async function sha256Hex(input) {
+	const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(input));
+	return Array.from(new Uint8Array(digest), (b) => b.toString(16).padStart(2, "0")).join("");
+}
 //#endregion
-export { fnv1a52, fnv1a64 };
+export { fnv1a52, fnv1a64, sha256Hex };

package/dist/utils/package-name.d.ts

@@ -7,4 +7,10 @@ export declare const BARE_PACKAGE_SPECIFIER_RE: RegExp;
  * scoped names, and Node builtins are not npm package references.
  */
 export declare function packageNameFromSpecifier(specifier: string): string | null;
+/**
+ * Turbopack's "foreign code" condition: a module under node_modules whose
+ * package is not in the (Turbopack) transpile list. Next.js skips its
+ * app-code transforms, such as next/dynamic, for foreign code.
+ */
+export declare function isForeignNodeModule(id: string, transpiledPackages: readonly string[]): boolean;
 //#endregion

package/dist/utils/package-name.js

@@ -1,3 +1,4 @@
+import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { builtinModules } from "node:module";
 //#region src/utils/package-name.ts
 const BUILTIN_MODULES = new Set(builtinModules.flatMap((name) => name.startsWith("node:") ? [name, name.slice(5)] : [name, `node:${name}`]));
@@ -14,5 +15,15 @@ function packageNameFromSpecifier(specifier) {
 	if (!packageName || BUILTIN_MODULES.has(packageName)) return null;
 	return packageName;
 }
+/**
+* Turbopack's "foreign code" condition: a module under node_modules whose
+* package is not in the (Turbopack) transpile list. Next.js skips its
+* app-code transforms, such as next/dynamic, for foreign code.
+*/
+function isForeignNodeModule(id, transpiledPackages) {
+	const normalizedId = toSlash(id);
+	if (!normalizedId.includes("/node_modules/")) return false;
+	return !transpiledPackages.some((packageName) => normalizedId.includes(`/node_modules/${packageName}/`));
+}
 //#endregion
-export { BARE_PACKAGE_SPECIFIER_RE, packageNameFromSpecifier };
+export { BARE_PACKAGE_SPECIFIER_RE, isForeignNodeModule, packageNameFromSpecifier };

package/dist/utils/plugin-rsc-version.d.ts

@@ -0,0 +1,4 @@
+//#region src/utils/plugin-rsc-version.d.ts
+/** Return the installed @vitejs/plugin-rsc version, or throw if it is unsupported. */
+export declare function assertPluginRscVersion(resolvedRscPath: string): string;
+//#endregion

package/dist/utils/plugin-rsc-version.js

@@ -0,0 +1,15 @@
+import { findPackageVersion, isVersionBelow } from "./react-version.js";
+//#region src/utils/plugin-rsc-version.ts
+const MINIMUM_PLUGIN_RSC_VERSION = [
+	0,
+	5,
+	37
+];
+/** Return the installed @vitejs/plugin-rsc version, or throw if it is unsupported. */
+function assertPluginRscVersion(resolvedRscPath) {
+	const version = findPackageVersion(resolvedRscPath, "@vitejs/plugin-rsc");
+	if (!version || isVersionBelow(version, MINIMUM_PLUGIN_RSC_VERSION)) throw new Error(`vinext: App Router requires @vitejs/plugin-rsc ${MINIMUM_PLUGIN_RSC_VERSION.join(".")} or newer (found ${version ?? "an unknown version"}). Upgrade @vitejs/plugin-rsc.`);
+	return version;
+}
+//#endregion
+export { assertPluginRscVersion };

package/dist/utils/prerender-output-paths.js

@@ -1,11 +1,22 @@
 //#region src/utils/prerender-output-paths.ts
 /**
+* Map a prerendered URL to the file path its artifacts are written under, as
+* Next.js's `normalizePagePath` does. `/index` becomes `/index/index` (and
+* `/index/foo` becomes `/index/index/foo`) so it never shares `/`'s files.
+* Unlike Next.js, dynamic fallback-shell paths such as `/index/[slug]` are
+* also prefixed; build and seed both use this mapping, so they stay in step.
+* Source: https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/page-path/normalize-page-path.ts
+*/
+function toOutputUrlPath(urlPath) {
+	return /^\/index(?:\/|$)/.test(urlPath) ? `/index${urlPath}` : urlPath;
+}
+/**
 * Determine the HTML output file path for a prerendered URL.
 * Respects trailingSlash config.
 */
 function getOutputPath(urlPath, trailingSlash, basePath = "") {
 	if (urlPath === "/" && basePath === "") return "index.html";
-	const clean = (basePath === "" ? urlPath : urlPath === "/" ? trailingSlash ? `${basePath}/` : basePath : `${basePath}${urlPath}`).replace(/^\//, "").replace(/\/$/, "");
+	const clean = (basePath === "" ? toOutputUrlPath(urlPath) : urlPath === "/" ? trailingSlash ? `${basePath}/` : basePath : `${basePath}${toOutputUrlPath(urlPath)}`).replace(/^\//, "").replace(/\/$/, "");
 	if (trailingSlash) return `${clean}/index.html`;
 	return `${clean}.html`;
 }
@@ -19,16 +30,16 @@ function getRscOutputPath(urlPath, options = {
 			const cleanBasePath = options.basePath?.replace(/^\//, "");
 			return cleanBasePath ? `${cleanBasePath}/index.txt` : "index.txt";
 		}
-		const clean = (options.basePath ? `${options.basePath}${urlPath}` : urlPath).replace(/^\//, "").replace(/\/$/, "");
+		const clean = `${options.basePath ?? ""}${toOutputUrlPath(urlPath)}`.replace(/^\//, "").replace(/\/$/, "");
 		return options.trailingSlash ? `${clean}/index.txt` : `${clean}.txt`;
 	}
 	if (urlPath === "/") return "index.rsc";
-	return urlPath.replace(/^\//, "") + ".rsc";
+	return toOutputUrlPath(urlPath).replace(/^\//, "") + ".rsc";
 }
 /** Determine the binary artifact path for a prerendered App Route response. */
 function getAppRouteOutputPath(urlPath) {
 	if (urlPath === "/") return "index.route";
-	return urlPath.replace(/^\//, "") + ".route";
+	return toOutputUrlPath(urlPath).replace(/^\//, "") + ".route";
 }
 //#endregion
 export { getAppRouteOutputPath, getOutputPath, getRscOutputPath };

package/dist/utils/public-file-path.d.ts

@@ -1,4 +1,12 @@
 //#region src/utils/public-file-path.d.ts
-/** Precompute keys for both encoded requests and decoded proxy/dev variants. */
-export declare function publicFilePathVariants(pathname: string): string[];
+/**
+ * Key a public file by the normalized pathname a request for it matches with.
+ *
+ * Request pathnames are decoded once per segment with path delimiters kept
+ * encoded, so `public/a b.txt` is `/a b.txt` and `public/C#.txt` is
+ * `/C%23.txt`. Keying only this form keeps a double-encoded alias such as
+ * `/a%2520b.txt`, which middleware matchers see as `/a%20b.txt`, from
+ * reaching `public/a b.txt`.
+ */
+export declare function publicFileRouteKey(pathname: string): string;
 //#endregion

package/dist/utils/public-file-path.js

@@ -1,12 +1,16 @@
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 //#region src/utils/public-file-path.ts
-/** Encode each pathname segment without encoding `/` separators. */
-function encodePublicFilePath(pathname) {
-	return pathname.split("/").map((segment) => encodeURIComponent(segment)).join("/");
-}
-/** Precompute keys for both encoded requests and decoded proxy/dev variants. */
-function publicFilePathVariants(pathname) {
-	const encoded = encodePublicFilePath(pathname);
-	return encoded === pathname ? [pathname] : [pathname, encoded];
+/**
+* Key a public file by the normalized pathname a request for it matches with.
+*
+* Request pathnames are decoded once per segment with path delimiters kept
+* encoded, so `public/a b.txt` is `/a b.txt` and `public/C#.txt` is
+* `/C%23.txt`. Keying only this form keeps a double-encoded alias such as
+* `/a%2520b.txt`, which middleware matchers see as `/a%20b.txt`, from
+* reaching `public/a b.txt`.
+*/
+function publicFileRouteKey(pathname) {
+	return normalizePathnameForRouteMatch(pathname.split("/").map((segment) => encodeURIComponent(segment)).join("/"));
 }
 //#endregion
-export { publicFilePathVariants };
+export { publicFileRouteKey };

package/dist/utils/public-routes.js

@@ -1,5 +1,5 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { publicFilePathVariants } from "./public-file-path.js";
+import { publicFileRouteKey } from "./public-file-path.js";
 import fs from "node:fs";
 //#region src/utils/public-routes.ts
 function scanPublicFileRoutes(root, configuredPublicDir = "public") {
@@ -37,7 +37,7 @@ function scanPublicFileRoutes(root, configuredPublicDir = "public") {
 				if (!stat.isFile()) continue;
 			} else if (!entry.isFile()) continue;
 			const relativePath = path.relative(publicDir, fullPath);
-			routes.push(...publicFilePathVariants("/" + relativePath));
+			routes.push(publicFileRouteKey("/" + relativePath));
 		}
 	}
 	if (fs.existsSync(publicDir)) try {

package/dist/utils/react-version.d.ts

@@ -2,4 +2,7 @@
 export declare function getReactUpgradeDeps(root: string, options?: {
   fromManifest?: boolean;
 }): string[];
+export declare function isVersionBelow(version: string, minimum: [number, number, number]): boolean;
+/** Walk up from a resolved module entry to find its package version. */
+export declare function findPackageVersion(resolvedEntry: string, packageName: string): string | null;
 //#endregion

package/dist/utils/react-version.js

@@ -59,4 +59,4 @@ function findPackageVersion(resolvedEntry, packageName) {
 	return null;
 }
 //#endregion
-export { getReactUpgradeDeps };
+export { findPackageVersion, getReactUpgradeDeps, isVersionBelow };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",
@@ -98,6 +98,10 @@
       "types": "./dist/server/headers.d.ts",
       "import": "./dist/server/headers.js"
     },
+    "./internal/server/http-conditional": {
+      "types": "./dist/server/http-conditional.d.ts",
+      "import": "./dist/server/http-conditional.js"
+    },
     "./internal/server/isr-cache": {
       "types": "./dist/server/isr-cache.d.ts",
       "import": "./dist/server/isr-cache.js"
@@ -234,7 +238,7 @@
     "@types/react-dom": "^19.2.3",
     "@types/ua-parser-js": "0.7.36",
     "@vitejs/plugin-react": "^6.1.0",
-    "@vitejs/plugin-rsc": "^0.5.34",
+    "@vitejs/plugin-rsc": "^0.5.37",
     "am-i-vibing": "^0.5.0",
     "ignore": "5.3.2",
     "image-size": "2.0.2",
@@ -247,7 +251,7 @@
   "peerDependencies": {
     "@mdx-js/rollup": "^3.0.0",
     "@vitejs/plugin-react": "^5.1.4 || ^6.0.0",
-    "@vitejs/plugin-rsc": "^0.5.34",
+    "@vitejs/plugin-rsc": "^0.5.37",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
     "react-server-dom-webpack": "^19.2.6",