vinext 1.0.1 → 1.2.0

package/dist/config/destination-params.d.ts

@@ -0,0 +1,47 @@
+//#region src/config/destination-params.d.ts
+/**
+ * Destination param substitution for next.config.js redirects and rewrites.
+ *
+ * Kept free of server-only imports so the Pages Router client can apply simple
+ * beforeFiles rewrites with exactly the same substitution as the server.
+ */
+/**
+ * Substitute all matched route params into a redirect/rewrite destination.
+ *
+ * Handles repeated params (e.g. `/api/:id/:id`) and catch-all suffix forms
+ * (`:path*`, `:path+`) in a single pass. Unknown params are left intact.
+ *
+ * Query substitution follows how Next.js consumes each destination kind:
+ *
+ * - A rewrite's query is parsed into an object before substitution, so the
+ *   target sees each param verbatim as one value. vinext encodes the whole
+ *   value so it round-trips back to that verbatim string.
+ * - A redirect's query is emitted as Location text with params inserted
+ *   verbatim, so an already percent-encoded capture is decoded once by the
+ *   client. vinext inserts redirect params verbatim too.
+ *
+ * A rewrite's absolute destination is proxied server-side, so params in its
+ * authority (`https://:tenant.example.com/`) are percent-encoded, keeping the
+ * `%XX` escapes a raw path capture already carries. A decoded `has` capture
+ * carrying `#`, `/`, `?`, `@` or `:` then makes the host invalid instead of
+ * moving the proxy to another host. Next.js substitutes the hostname verbatim
+ * and can be retargeted this way; vinext is stricter.
+ *
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/prepare-destination.ts
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/server-route-utils.ts
+ */
+export declare function substituteDestinationParams(destination: string, params: Record<string, string>, kind: "redirect" | "rewrite"): string;
+/**
+ * Split a redirect destination's query into parts before substituting params,
+ * as Next.js's prepareDestination parses the template query first. Each part
+ * is `[key, keyText, valueText]`: the texts are the part's template text with
+ * params substituted verbatim (`valueText` is `null` without an `=`), and
+ * `key` is the decoded key, used only to match request params. Keeping these
+ * boundaries means a param containing `&` stays one value when the request
+ * query is merged in.
+ *
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/prepare-destination.ts
+ */
+export declare function substituteRedirectDestinationQuery(destination: string, params: Record<string, string>): RedirectDestinationQueryPart[];
+export type RedirectDestinationQueryPart = [key: string, keyText: string, valueText: string | null];
+//#endregion

package/dist/config/destination-params.js

@@ -0,0 +1,116 @@
+//#region src/config/destination-params.ts
+/**
+* Destination param substitution for next.config.js redirects and rewrites.
+*
+* Kept free of server-only imports so the Pages Router client can apply simple
+* beforeFiles rewrites with exactly the same substitution as the server.
+*/
+/**
+* Cache for destination substitution regexes in substituteDestinationParams.
+*
+* The regex depends only on the set of param keys captured from the matched
+* source pattern. Caching by sorted key list avoids recompiling a new RegExp
+* for repeated redirect/rewrite calls that use the same param shape.
+*/
+const _compiledDestinationParamCache = /* @__PURE__ */ new Map();
+/**
+* Substitute all matched route params into a redirect/rewrite destination.
+*
+* Handles repeated params (e.g. `/api/:id/:id`) and catch-all suffix forms
+* (`:path*`, `:path+`) in a single pass. Unknown params are left intact.
+*
+* Query substitution follows how Next.js consumes each destination kind:
+*
+* - A rewrite's query is parsed into an object before substitution, so the
+*   target sees each param verbatim as one value. vinext encodes the whole
+*   value so it round-trips back to that verbatim string.
+* - A redirect's query is emitted as Location text with params inserted
+*   verbatim, so an already percent-encoded capture is decoded once by the
+*   client. vinext inserts redirect params verbatim too.
+*
+* A rewrite's absolute destination is proxied server-side, so params in its
+* authority (`https://:tenant.example.com/`) are percent-encoded, keeping the
+* `%XX` escapes a raw path capture already carries. A decoded `has` capture
+* carrying `#`, `/`, `?`, `@` or `:` then makes the host invalid instead of
+* moving the proxy to another host. Next.js substitutes the hostname verbatim
+* and can be retargeted this way; vinext is stricter.
+*
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/prepare-destination.ts
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/server/server-route-utils.ts
+*/
+function substituteDestinationParams(destination, params, kind) {
+	const paramRe = getDestinationParamRegex(params);
+	if (!paramRe) return destination;
+	const replaceParams = (value, encodeParam) => value.replace(paramRe, (_token, key) => encodeParam(params[key]));
+	if (kind === "redirect") return replaceParams(destination, (value) => value);
+	const hashIndex = destination.indexOf("#");
+	const beforeHash = hashIndex === -1 ? destination : destination.slice(0, hashIndex);
+	const hash = hashIndex === -1 ? "" : destination.slice(hashIndex);
+	const queryIndex = beforeHash.indexOf("?");
+	const beforeQuery = queryIndex === -1 ? beforeHash : beforeHash.slice(0, queryIndex);
+	const authorityEnd = getAbsoluteUrlAuthorityEnd(beforeQuery.replace(paramRe, (token) => "x".repeat(token.length)));
+	return `${`${replaceParams(beforeQuery.slice(0, authorityEnd), encodeAuthorityParam)}${replaceParams(beforeQuery.slice(authorityEnd), (value) => value)}`}${queryIndex === -1 ? "" : `?${replaceParams(beforeHash.slice(queryIndex + 1), encodeRewriteQueryParamValue)}`}${replaceParams(hash, (value) => value)}`;
+}
+function getAbsoluteUrlAuthorityEnd(value) {
+	const scheme = /^[a-z][a-z0-9+.-]*:[/\\\t\n\r]*/i.exec(value);
+	if (!scheme && /^[/\\]/.test(value)) return 0;
+	const start = scheme ? scheme[0].length : 0;
+	const pathStart = value.slice(start).search(/[/\\]/);
+	return pathStart === -1 ? value.length : start + pathStart;
+}
+/**
+* Split a redirect destination's query into parts before substituting params,
+* as Next.js's prepareDestination parses the template query first. Each part
+* is `[key, keyText, valueText]`: the texts are the part's template text with
+* params substituted verbatim (`valueText` is `null` without an `=`), and
+* `key` is the decoded key, used only to match request params. Keeping these
+* boundaries means a param containing `&` stays one value when the request
+* query is merged in.
+*
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/prepare-destination.ts
+*/
+function substituteRedirectDestinationQuery(destination, params) {
+	const hashIndex = destination.indexOf("#");
+	const beforeHash = hashIndex === -1 ? destination : destination.slice(0, hashIndex);
+	const queryIndex = beforeHash.indexOf("?");
+	if (queryIndex === -1) return [];
+	const paramRe = getDestinationParamRegex(params);
+	const substitute = (value) => paramRe ? value.replace(paramRe, (_token, key) => params[key]) : value;
+	return beforeHash.slice(queryIndex + 1).split("&").filter(Boolean).map((part) => {
+		const equalsIndex = part.indexOf("=");
+		const keyText = substitute(equalsIndex === -1 ? part : part.slice(0, equalsIndex));
+		const valueText = equalsIndex === -1 ? null : substitute(part.slice(equalsIndex + 1));
+		return [
+			decodeQueryKey(keyText),
+			keyText,
+			valueText
+		];
+	});
+}
+function decodeQueryKey(keyText) {
+	const [entry] = new URLSearchParams(keyText.replace(/[&=]/g, (char) => encodeURIComponent(char)));
+	return entry?.[0] ?? "";
+}
+function getDestinationParamRegex(params) {
+	const keys = Object.keys(params);
+	if (keys.length === 0) return null;
+	const sortedKeys = [...keys].sort((a, b) => b.length - a.length);
+	const cacheKey = sortedKeys.join("\0");
+	let paramRe = _compiledDestinationParamCache.get(cacheKey);
+	if (!paramRe) {
+		const paramAlternation = sortedKeys.map((key) => key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+		paramRe = new RegExp(`:(${paramAlternation})([+*])?(?![A-Za-z0-9_])`, "g");
+		_compiledDestinationParamCache.set(cacheKey, paramRe);
+	}
+	return paramRe;
+}
+function encodeAuthorityParam(value) {
+	return value.replace(/%(?![0-9a-f]{2})|[^A-Za-z0-9._~%-]/giu, encodeURIComponent);
+}
+function encodeRewriteQueryParamValue(value) {
+	const params = new URLSearchParams();
+	params.set("", value);
+	return params.toString().slice(1);
+}
+//#endregion
+export { substituteDestinationParams, substituteRedirectDestinationQuery };

package/dist/config/next-config.d.ts

@@ -111,6 +111,17 @@ export type NextConfig = {
   crossOrigin?: "anonymous" | "use-credentials";
   /** Whether to add trailing slashes */
   trailingSlash?: boolean;
+  /**
+   * Skip the automatic trailing-slash redirects and keep `<Link>`/router
+   * hrefs exactly as written.
+   * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/skipTrailingSlashRedirect
+   */
+  skipTrailingSlashRedirect?: boolean;
+  /**
+   * Compress responses from the Node production server. Defaults to true.
+   * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/compress
+   */
+  compress?: boolean;
   /** Keep the original request URL visible to middleware/proxy. */
   skipProxyUrlNormalize?: boolean;
   /** @deprecated Use `skipProxyUrlNormalize` instead. */
@@ -312,6 +323,9 @@ export type ResolvedNextConfig = {
    */
   assetPrefix: string;
   trailingSlash: boolean;
+  skipTrailingSlashRedirect: boolean;
+  /** Whether the Node production server compresses responses (`compress`, default true). */
+  compress: boolean;
   skipProxyUrlNormalize: boolean;
   typescript: {
     tsconfigPath?: string;

package/dist/config/next-config.js

@@ -1,5 +1,5 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { normalizePageExtensions } from "../routing/file-matcher.js";
+import { DEFAULT_PAGE_EXTENSIONS, normalizePageExtensions } from "../routing/file-matcher.js";
 import { loadCommonJsModule, shouldRetryAsCommonJs } from "../utils/commonjs-loader.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
@@ -184,11 +184,24 @@ function warnConfigLoadFailure(filename, err) {
 	if (isNextIntlPlugin) console.warn("[vinext] Hint: createNextIntlPlugin() is not needed with vinext. Remove the next-intl/plugin wrapper from your next.config — vinext auto-detects next-intl and registers the i18n config alias automatically.");
 }
 /**
+* The `defaultConfig` handed to a function-form next.config. Next.js passes
+* its full `defaultConfig` (packages/next/src/server/config-shared.ts); vinext
+* passes the subset configs are known to read, with values matching Next.js,
+* so `[...defaultConfig.pageExtensions, "page.js"]` works. Fresh per call so a
+* config that mutates it cannot leak into later loads.
+*/
+function createFunctionConfigDefaults() {
+	return {
+		pageExtensions: [...DEFAULT_PAGE_EXTENSIONS],
+		compress: true
+	};
+}
+/**
 * Resolve a Next-style config value, calling it if it's a function-form config
 * (Next.js supports `module.exports = (phase, opts) => config`).
 */
 async function resolveConfigValue(config, phase = DEFAULT_PHASE) {
-	if (typeof config === "function") return await config(phase, { defaultConfig: {} });
+	if (typeof config === "function") return await config(phase, { defaultConfig: createFunctionConfigDefaults() });
 	return config;
 }
 /**
@@ -360,6 +373,7 @@ function warnDeprecatedConfigOptions(config, root) {
 		["experimental.instrumentationHook", `\`experimental.instrumentationHook\` is no longer needed, because \`instrumentation.js\` is available by default. You can remove it from ${configFileName}.`]
 	];
 	for (const [propertyPath, warning] of warnings) if (hasConfigProperty(config, propertyPath)) warnConfigOnce(warning);
+	if (readOptionalRecord(config.experimental)?.skipTrailingSlashRedirect != null) warnConfigOnce(`\`experimental.skipTrailingSlashRedirect\` has been moved to \`skipTrailingSlashRedirect\`. Please update your ${configFileName} file accordingly.`);
 }
 async function resolveNextConfigInput(config, phase = PHASE_DEVELOPMENT_SERVER) {
 	return await resolveConfigValue(config, phase);
@@ -436,7 +450,7 @@ async function loadNextConfigWithPackageIdentity(root, phase) {
 					},
 					load(id) {
 						if (id !== resolvedVirtualConfigId) return;
-						return `import * as configModule from ${configPathLiteral};\nconst cjsModule = configModule[${JSON.stringify(VINEXT_CJS_EXPORTS_KEY)}];\nconst cjsInitial = configModule[${JSON.stringify(VINEXT_CJS_INITIAL_KEY)}];\nconst cjsExports = cjsModule && cjsModule.exports;\nconst cjsValue = cjsExports != null && (cjsExports !== cjsInitial || (typeof cjsExports === "object" && Object.keys(cjsExports).length > 0)) ? cjsExports : undefined;\nconst value = cjsValue ?? configModule.default ?? configModule;\nexport default typeof value === "function" ? await value(${phaseLiteral}, { defaultConfig: {} }) : value;\n`;
+						return `import * as configModule from ${configPathLiteral};\nconst cjsModule = configModule[${JSON.stringify(VINEXT_CJS_EXPORTS_KEY)}];\nconst cjsInitial = configModule[${JSON.stringify(VINEXT_CJS_INITIAL_KEY)}];\nconst cjsExports = cjsModule && cjsModule.exports;\nconst cjsValue = cjsExports != null && (cjsExports !== cjsInitial || (typeof cjsExports === "object" && Object.keys(cjsExports).length > 0)) ? cjsExports : undefined;\nconst value = cjsValue ?? configModule.default ?? configModule;\nexport default typeof value === "function" ? await value(${phaseLiteral}, { defaultConfig: ${JSON.stringify(createFunctionConfigDefaults())} }) : value;\n`;
 					}
 				},
 				...isTypeScriptConfig ? [cjsGlobalsInjectorPlugin(configPath)] : [],
@@ -748,6 +762,8 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 			basePath: "",
 			assetPrefix: "",
 			trailingSlash: false,
+			skipTrailingSlashRedirect: false,
+			compress: true,
 			skipProxyUrlNormalize: false,
 			typescript: {},
 			output: "",
@@ -933,6 +949,8 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		basePath: config.basePath ?? "",
 		assetPrefix: normalizeAssetPrefix(config.assetPrefix),
 		trailingSlash: config.trailingSlash ?? false,
+		skipTrailingSlashRedirect: (experimental?.skipTrailingSlashRedirect ?? config.skipTrailingSlashRedirect) === true,
+		compress: config.compress !== false,
 		skipProxyUrlNormalize: config.skipProxyUrlNormalize ?? config.skipMiddlewareUrlNormalize ?? false,
 		typescript: typeof config.typescript?.tsconfigPath === "string" ? { tsconfigPath: config.typescript.tsconfigPath } : {},
 		output: output === "export" || output === "standalone" ? output : "",

package/dist/entries/app-rsc-entry.d.ts

@@ -60,6 +60,8 @@ type AppRouterConfig = {
   globalNotFound?: boolean;
   /** Enables Next.js Cache Components semantics for App Router document HTML. */
   cacheComponents?: boolean;
+  /** Reads an MDX source's ESM exports, as the prerender listing does. */
+  readMdxEsm?: ((source: string) => string) | null;
   /** Resolved `experimental.prefetchInlining` thresholds. */
   prefetchInlining?: PrefetchInliningConfig;
   /** Whether the RSC build discovered any server references. Defaults to true. */
@@ -91,6 +93,10 @@ type AppRouterConfig = {
   draftModeSecret?: string;
   /** Server-only token used to authorize build-time prerender endpoints. */
   prerenderSecret?: string;
+  /** next.config `skipTrailingSlashRedirect`. */
+  skipTrailingSlashRedirect?: boolean;
+  /** Dev-only key authenticating the hybrid Pages handler's forwarded middleware context. */
+  devForwardedMiddlewareContextKey?: string;
 };
 /** Generate the module-free App request stage used by multi-stage Worker outputs. */
 export declare function generateAppRequestRscEntry(appDir: string, routes: AppRoute[], middlewarePath?: string | null, metadataRoutes?: MetadataFileRoute[], _globalErrorPath?: string | null, basePath?: string, trailingSlash?: boolean, config?: AppRouterConfig, instrumentationPath?: string | null): string;

package/dist/entries/app-rsc-entry.js

@@ -2,11 +2,12 @@ import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index
 import { appRouteHasMainTreeLoadingBoundary } from "../routing/app-router.js";
 import { resolveEntryPath } from "./runtime-entry-module.js";
 import { isProxyFile } from "../server/middleware.js";
-import { extractExportConstString } from "../build/report.js";
+import { extractExportConstString, getAppRouteRenderEntryPath } from "../build/report.js";
 import { routePatternParts } from "../routing/route-pattern.js";
 import { safeJsonStringify } from "../server/html.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES } from "../server/image-optimization.js";
 import { buildAppRscManifestCode } from "./app-rsc-manifest.js";
+import { classifyAppPageRouteStaticEligibility } from "../build/app-page-static-eligibility.js";
 import { generateDevOriginCheckCode } from "../server/dev-origin-check.js";
 import { ACTION_OWNER_MANIFEST_ID } from "../plugins/action-owner-manifest.js";
 import fs from "node:fs";
@@ -24,12 +25,12 @@ import { randomUUID } from "node:crypto";
 const DEFAULT_EXPIRE_TIME = 31536e3;
 const DEFAULT_REACT_MAX_HEADERS_LENGTH = 6e3;
 const middlewareRequestHeadersPath = resolveEntryPath("../utils/middleware-request-headers.js", import.meta.url);
-const normalizePathModulePath = resolveEntryPath("../server/normalize-path.js", import.meta.url);
 const appRouteHandlerDispatchPath = resolveEntryPath("../server/app-route-handler-dispatch.js", import.meta.url);
 const appRouteRequestBuiltInsPath = resolveEntryPath("../server/app-route-request-built-ins.js", import.meta.url);
 const appRouteHandlerResponsePath = resolveEntryPath("../server/app-route-handler-response.js", import.meta.url);
 const appRouteHandlerMiddlewareContextPath = resolveEntryPath("../server/app-route-handler-middleware-context.js", import.meta.url);
 const appServerActionExecutionPath = resolveEntryPath("../server/app-server-action-execution.js", import.meta.url);
+const serverReferenceLoaderPath = resolveEntryPath("../server/server-reference-loader.js", import.meta.url);
 const appActionForwardingPath = resolveEntryPath("../server/app-action-forwarding.js", import.meta.url);
 const appMiddlewarePath = resolveEntryPath("../server/app-middleware.js", import.meta.url);
 const metadataRouteResponsePath = resolveEntryPath("../server/metadata-route-response.js", import.meta.url);
@@ -38,7 +39,6 @@ const appPageExecutionPath = resolveEntryPath("../server/app-page-execution.js",
 const appFallbackRendererPath = resolveEntryPath("../server/app-fallback-renderer.js", import.meta.url);
 const appElementsPath = resolveEntryPath("../server/app-elements.js", import.meta.url);
 const appPageRouteWiringPath = resolveEntryPath("../server/app-page-route-wiring.js", import.meta.url);
-const appPageProbePath = resolveEntryPath("../server/app-page-probe.js", import.meta.url);
 const appPageDispatchPath = resolveEntryPath("../server/app-page-dispatch.js", import.meta.url);
 const appPagePprRuntimePath = resolveEntryPath("../server/app-page-ppr-runtime.js", import.meta.url);
 const fileBasedMetadataPath = resolveEntryPath("../server/file-based-metadata.js", import.meta.url);
@@ -63,10 +63,10 @@ const appHookWarningSuppressionPath = resolveEntryPath("../server/app-hook-warni
 const serverGlobalsPath = resolveEntryPath("../server/server-globals.js", import.meta.url);
 const appPagesBridgePath = resolveEntryPath("../server/app-pages-bridge.js", import.meta.url);
 const routePatternPath = resolveEntryPath("../routing/route-pattern.js", import.meta.url);
-function buildAppRequestRouteMetadata(routes) {
+function createSegmentSourceReader() {
 	const sourceCache = /* @__PURE__ */ new Map();
-	const forcesDynamic = (filePath) => {
-		if (!filePath) return false;
+	return (filePath) => {
+		if (!filePath) return null;
 		let source = sourceCache.get(filePath);
 		if (source === void 0) {
 			try {
@@ -76,19 +76,57 @@ function buildAppRequestRouteMetadata(routes) {
 			}
 			sourceCache.set(filePath, source);
 		}
+		return source;
+	};
+}
+/** Segment config files of the tree a direct request to a page route renders. */
+function appPageSegmentConfigPaths(route) {
+	return [
+		...route.layouts,
+		route.pagePath,
+		...route.parallelSlots.flatMap((slot) => [
+			slot.layoutPath,
+			...slot.configLayoutPaths ?? [],
+			slot.pagePath ?? slot.defaultPath
+		])
+	];
+}
+/**
+* Patterns of the static App pages that answer a request whose raw pathname
+* reaches a dynamic sibling but whose segment-decoded pathname names them, so
+* `/%61` and `/caf%C3%A9` render `/a` and `/café` rather than `/[slug]`.
+*
+* Next.js serves those requests from the response cached under the decoded
+* pathname, which exists only for a page it prerendered. The prerender listing
+* classifies those: a page whose effective segment config renders it
+* dynamically (`dynamic = "force-dynamic"`, `revalidate = 0` or the edge
+* runtime on any segment) and a Route Handler have no such entry, so the
+* dynamic sibling renders. So does a page whose sources can't be read here;
+* its sibling's render stays out of the shared caches. A cacheComponents
+* build lists every page route, as the prerender listing does.
+*/
+function buildAppDecodedPathnamePatterns(routes, config) {
+	const isPrerenderedPage = (route) => {
+		if (config?.cacheComponents) return true;
+		try {
+			return classifyAppPageRouteStaticEligibility(route, config?.readMdxEsm ?? null) === "eligible";
+		} catch {
+			return false;
+		}
+	};
+	return routes.filter((route) => !route.isDynamic && !route.routePath && getAppRouteRenderEntryPath(route) !== null && isPrerenderedPage(route)).map((route) => route.pattern);
+}
+function buildAppRequestRouteMetadata(routes) {
+	const readSource = createSegmentSourceReader();
+	const forcesDynamic = (filePath) => {
+		const source = readSource(filePath);
 		return source !== null && extractExportConstString(source, "dynamic") === "force-dynamic";
 	};
 	return routes.map((route) => ({
 		canUseCanonicalLoadingShell: appRouteHasMainTreeLoadingBoundary(route),
 		forceDynamic: route.routePath ? forcesDynamic(route.routePath) : [
-			...route.layouts,
-			route.pagePath,
-			...route.parallelSlots.flatMap((slot) => [
-				slot.layoutPath,
-				...slot.configLayoutPaths ?? [],
-				slot.pagePath ?? slot.defaultPath,
-				...slot.interceptingRoutes.flatMap((intercept) => [...intercept.layoutPaths, intercept.pagePath])
-			]),
+			...appPageSegmentConfigPaths(route),
+			...route.parallelSlots.flatMap((slot) => slot.interceptingRoutes.flatMap((intercept) => [...intercept.layoutPaths, intercept.pagePath])),
 			...route.siblingIntercepts.flatMap((intercept) => [...intercept.layoutPaths, intercept.pagePath])
 		].some(forcesDynamic),
 		ids: route.ids ?? null,
@@ -162,6 +200,7 @@ import { dispatchAppRequestStage as __dispatchAppRequestStage } from ${JSON.stri
 import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cdn-cache-adapter";
 import { clearAppRequestStageContext as __clearRequestContext, setAppRequestStageNavigationContext as setNavigationContext } from ${JSON.stringify(appRequestStageContextPath)};
 import { matchRoutePattern as __matchRoutePattern } from ${JSON.stringify(routePatternPath)};
+import __pagesClientAssets from "virtual:vinext-pages-client-assets";
 ${middlewarePath ? `import { applyAppMiddleware as __applyAppMiddleware } from ${JSON.stringify(appMiddlewarePath)};` : ""}
 ${instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(toSlash(instrumentationPath))};
 import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(instrumentationRuntimePath)};
@@ -178,7 +217,6 @@ ${hasPagesDir ? `import { getDraftModeCookieHeader } from "next/headers";
 import * as __pagesRequestEntry from "virtual:vinext-pages-request-entry";
 import { renderPagesFallback as __renderPagesFallback } from ${JSON.stringify(appPagesBridgePath)};
 import { buildRequestHeadersFromMiddlewareResponse as __buildRequestHeadersFromMiddlewareResponse } from ${JSON.stringify(middlewareRequestHeadersPath)};
-import { decodePathParams as __decodePathParams } from ${JSON.stringify(normalizePathModulePath)};
 import { applyRouteHandlerMiddlewareContext as __applyRouteHandlerMiddlewareContext } from ${JSON.stringify(appRouteHandlerMiddlewareContextPath)};` : ""}
 
 ${hasPagesDir ? `export function __ensureHybridPagesApplication() {
@@ -200,12 +238,14 @@ export const __imageConfig = ${JSON.stringify({
 		contentDispositionType: config?.imageConfig?.contentDispositionType,
 		contentSecurityPolicy: config?.imageConfig?.contentSecurityPolicy
 	})};
+export const __clientBuildFiles = __pagesClientAssets.clientBuildFiles ?? [];
 const __routes = ${JSON.stringify(requestRoutes)};
-const __routeMatcher = __createAppRscRouteMatcher(__routes);
+const __routeMatcher = __createAppRscRouteMatcher(__routes, ${JSON.stringify(buildAppDecodedPathnamePatterns(routes, config))});
 const __metadataRouteMatchers = ${JSON.stringify(metadataRouteMatchers)};
 
 function matchRoute(pathname) { return __routeMatcher.matchRoute(pathname); }
 function matchRequestRoute(pathname) { return __routeMatcher.matchRequestRoute(pathname); }
+function matchRawRequestRoute(pathname) { return __routeMatcher.matchRawRequestRoute(pathname); }
 function hasInterceptionId(interceptionId) { return __routeMatcher.hasInterceptionId(interceptionId); }
 function __isMetadataPath(pathname) {
   const parts = pathname.split("/").filter(Boolean);
@@ -252,6 +292,7 @@ const __requestHandler = createAppRscRequestHandler({
 		fallback: []
 	})},
   draftModeSecret: __draftModeSecret,
+  devForwardedMiddlewareContextKey: ${JSON.stringify(config?.devForwardedMiddlewareContextKey ?? null)},
   dispatchMatchedPage() { throw new Error("App request stage attempted to render a page inline"); },
   dispatchMatchedRouteHandler() { throw new Error("App request stage attempted to render a route handler inline"); },
   ${instrumentationPath ? "ensureInstrumentation() { return __ensureInstrumentation(); }," : ""}
@@ -262,6 +303,7 @@ const __requestHandler = createAppRscRequestHandler({
   hasInterceptionId,
   matchRoute,
   matchRequestRoute,
+  matchRawRequestRoute,
   matchInterceptRoute(pathname, sourcePathname, interceptionId) {
     const intercept = __routeMatcher.findIntercept(pathname, sourcePathname, interceptionId);
     if (!intercept) return null;
@@ -293,6 +335,7 @@ const __requestHandler = createAppRscRequestHandler({
       middlewareRequest,
       module: middlewareModule,
       request,
+      skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
       trailingSlash: __trailingSlash,
       validateExternalRewriteRequest,
     });
@@ -318,7 +361,6 @@ const __requestHandler = createAppRscRequestHandler({
           };
         },
         buildRequestHeaders: __buildRequestHeadersFromMiddlewareResponse,
-        decodePathParams: __decodePathParams,
         applyRouteHandlerMiddlewareContext: __applyRouteHandlerMiddlewareContext,
         getDraftModeCookieHeader,
       }
@@ -326,6 +368,7 @@ const __requestHandler = createAppRscRequestHandler({
   },` : ""}
   rootParamNamesByPattern: {},
   setNavigationContext,
+  skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
   staticParamsMap: {},
   trailingSlash: __trailingSlash,
   validateDevRequestOrigin: __validateDevRequestOrigin,
@@ -480,14 +523,15 @@ import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters }
 import __pagesClientAssets from "virtual:vinext-pages-client-assets";
 ${actionOwners === void 0 ? `import __vinextActionOwners from ${JSON.stringify(ACTION_OWNER_MANIFEST_ID)};` : ""}
 import { setPagesClientAssets as __setPagesClientAssets } from "vinext/server/pages-client-assets";
-import { decodePathParams as __decodePathParams } from ${JSON.stringify(normalizePathModulePath)};
 import { buildRequestHeadersFromMiddlewareResponse as __buildRequestHeadersFromMiddlewareResponse } from ${JSON.stringify(middlewareRequestHeadersPath)};
 ${hasPagesDir ? `import {
   applyRouteHandlerMiddlewareContext as __applyRouteHandlerMiddlewareContext,
 } from ${JSON.stringify(appRouteHandlerResponsePath)};` : ""}
 const __loadAppRouteHandlerDispatch = () => import(${JSON.stringify(appRouteHandlerDispatchPath)});
 ${hasServerActions ? `const __loadAppServerActionExecution = () => import(${JSON.stringify(appServerActionExecutionPath)});
-const __loadAppActionForwarding = () => import(${JSON.stringify(appActionForwardingPath)});` : ""}
+const __loadAppActionForwarding = () => import(${JSON.stringify(appActionForwardingPath)});
+import { isolateServerReferenceLoads as __isolateServerReferenceLoads } from ${JSON.stringify(serverReferenceLoaderPath)};
+__isolateServerReferenceLoads();` : ""}
 ${(metadataRoutes?.length ?? 0) > 0 ? `const __loadMetadataRouteResponse = () => import(${JSON.stringify(metadataRouteResponsePath)});` : ""}
 ${(metadataRoutes?.length ?? 0) > 0 ? `const __loadFileBasedMetadata = () => import(${JSON.stringify(fileBasedMetadataPath)});
 async function __applyFileBasedMetadata(...args) {
@@ -513,7 +557,6 @@ import {
   resolveAppPageChildSegments as __resolveAppPageChildSegments,
 } from ${JSON.stringify(appPageRouteWiringPath)};
 import { buildPageElements as __buildPageElements } from ${JSON.stringify(appPageElementBuilderPath)};
-import { buildAppPageProbes as __buildAppPageProbes } from ${JSON.stringify(appPageProbePath)};
 import {
   dispatchAppPage as __dispatchAppPage,
 } from ${JSON.stringify(appPageDispatchPath)};
@@ -539,6 +582,8 @@ import {
   SIBLING_PAGE_INTERCEPT_SLOT_KEY as __SIBLING_PAGE_INTERCEPT_SLOT_KEY,
 } from ${JSON.stringify(appRscRouteMatchingPath)};
 import {
+  appIsrFallbackShellHtmlKey as __isrFallbackShellHtmlKey,
+  appIsrFallbackShellKey as __isrFallbackShellKey,
   appIsrHtmlKey as __isrHtmlKey,
   appIsrRscKey as __isrRscKey,
   appIsrRouteKey as __isrRouteKey,
@@ -566,7 +611,7 @@ import { suppressHookWarningAls } from ${JSON.stringify(appHookWarningSuppressio
 import { clearAppRequestContext as __clearRequestContext, setAppNavigationContext as setNavigationContext } from ${JSON.stringify(appRequestContextPath)};
 __configureMemoryCacheHandler({ cacheMaxMemorySize: ${JSON.stringify(cacheMaxMemorySize)} });
 import { createAppPrerenderStaticParamsResolver as __createAppPrerenderStaticParamsResolver } from ${JSON.stringify(appPrerenderStaticParamsPath)};
-import { ensureAppRouteModulesLoaded as __ensureRouteLoaded, loadAppInterceptPage as __loadAppInterceptPage } from ${JSON.stringify(appRouteModuleLoaderPath)};
+import { ensureAppRouteModulesLoaded as __ensureRouteLoaded } from ${JSON.stringify(appRouteModuleLoaderPath)};
 import {
   getRenderedConcreteUrlPathsForRoute as __getRenderedConcreteUrlPathsForRoute,
   initPregeneratedPathsFromGlobals as __initPregeneratedPathsFromGlobals,
@@ -744,7 +789,7 @@ function __VINEXT_CLASS_REASONS(routeIdx) {
 const routes = [
 ${routeEntries.join(",\n")}
 ];
-const __routeMatcher = __createAppRscRouteMatcher(routes);
+const __routeMatcher = __createAppRscRouteMatcher(routes, ${JSON.stringify(buildAppDecodedPathnamePatterns(routes, config))});
 
 ${instrumentationPath ? "let metadataRoutes;" : `const metadataRoutes = [
 ${metaRouteEntries.join(",\n")}
@@ -841,6 +886,10 @@ function matchRequestRoute(url) {
   return __routeMatcher.matchRequestRoute(url);
 }
 
+function matchRawRequestRoute(url) {
+  return __routeMatcher.matchRawRequestRoute(url);
+}
+
 /**
  * Check if a pathname matches any intercepting route.
  * Returns the match info or null.
@@ -906,6 +955,9 @@ export async function seedMemoryCacheFromPrerender(serverDir) {
     buildAppPageHtmlKey(pathname) {
       return __isrHtmlKey(pathname);
     },
+    buildAppPageFallbackShellKey(pathname, suffix) {
+      return __isrFallbackShellKey(pathname, suffix);
+    },
     buildAppPageRscKey(pathname) {
       return __isrRscKey(pathname);
     },
@@ -950,6 +1002,7 @@ ${rootParamNameEntries.join("\n")}
 };
 
 __setPagesClientAssets(__pagesClientAssets);
+export const __clientBuildFiles = __pagesClientAssets.clientBuildFiles ?? [];
 function __VINEXT_ACTION_OWNERS() { return ${actionOwners === void 0 ? "__vinextActionOwners" : safeJsonStringify(actionOwners)}; }
 ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandler = createAppRscHandler({"}
   assetPrefix: __assetPrefix,
@@ -970,6 +1023,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
   imageConfig: __runtimeImageConfig,
   isDev: process.env.NODE_ENV !== "production",
   draftModeSecret: __draftModeSecret,
+  devForwardedMiddlewareContextKey: ${JSON.stringify(config?.devForwardedMiddlewareContextKey ?? null)},
   dispatchMatchedPage({
     bypassInterceptionContextCache,
     cachePathname,
@@ -1000,6 +1054,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
     scriptNonce,
     searchParams,
     renderMode,
+    renderWholeDocument,
   }) {
     const PageComponent = route.page?.default;
     const __segmentConfigBranches = __resolveRouteSegmentConfigBranches(route);
@@ -1021,7 +1076,6 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       routePatternParts: route.patternParts,
       routeSegments: route.routeSegments,
     });
-    const _asyncRouteParams = makeThenableParams(params);
     return __dispatchAppPage({
       basePath: __basePath,
       bypassInterceptionContextCache,
@@ -1040,6 +1094,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
           observePageSearchParamsAccess: buildOptions?.observePageSearchParamsAccess === true,
           isForceStatic: buildOptions?.isForceStatic === true,
           serveStreamingMetadata: buildOptions?.serveStreamingMetadata,
+          placeStreamedMetadataInHead: buildOptions?.placeStreamedMetadataInHead === true,
           isProduction: process.env.NODE_ENV === "production",
         }, layoutParamAccess, displayPathname, scriptNonce);
       },
@@ -1092,6 +1147,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       isRscRequest,
       isrDebug: __isrDebug,
       isrGet: __isrGet,
+      isrFallbackShellHtmlKey: __isrFallbackShellHtmlKey,
       isrHtmlKey(pathname) {
         return __isrHtmlKey(pathname === cleanPathname ? cachePathname : pathname);
       },
@@ -1127,31 +1183,6 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
           route,
         });
       },
-      async probePage(probeSearchParams = searchParams) {
-        const __probeIntercept = findIntercept(
-          interceptionPathname,
-          interceptionContext,
-          interceptionId,
-        );
-        // The intercepting-route page module is lazy (page: null + __pageLoader).
-        // Resolve it before probing so buildAppPageProbes inspects the real page
-        // component for dynamic bailout — matching the render path, which also
-        // hydrates it (resolveAppPageInterceptState). Without this the intercept
-        // probe branch silently inspects an undefined component and never
-        // observes the page's searchParams/headers access. Shared loader, so
-        // the import is isolated from the request context here too.
-        if (__probeIntercept) await __loadAppInterceptPage(__probeIntercept);
-        return Promise.all(__buildAppPageProbes({
-          route,
-          pageComponent: PageComponent,
-          asyncRouteParams: _asyncRouteParams,
-          searchParams: probeSearchParams,
-          intercept: __probeIntercept,
-          isRscRequest,
-          matchedParams: params,
-          makeThenableParams,
-        }));
-      },
       renderErrorBoundaryPage(renderErr, errorOrigin) {
         const __activeIntercept = findIntercept(
           interceptionPathname,
@@ -1210,6 +1241,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       searchParams,
       setNavigationContext,
       renderMode,
+      renderWholeDocument,
     });
   },
   async dispatchMatchedRouteHandler({
@@ -1234,6 +1266,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       draftModeSecret: __draftModeSecret,
       i18n: __i18nConfig,
       trailingSlash: __trailingSlash,
+      skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
       isrDebug: __isrDebug,
       isrGet: __isrGet,
       isrRouteKey(pathname) {
@@ -1564,6 +1597,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
   },` : ""}
   matchRoute,
   matchRequestRoute,
+  matchRawRequestRoute,
   hasInterceptionId,
   matchInterceptRoute(pathname, sourcePathname, interceptionId) {
     const intercept = findIntercept(pathname, sourcePathname, interceptionId);
@@ -1596,6 +1630,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       middlewareRequest,
       module: middlewareModule,
       request,
+      skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
       trailingSlash: __trailingSlash,
       validateExternalRewriteRequest,
     });
@@ -1634,7 +1669,6 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
           };
         },
         buildRequestHeaders: __buildRequestHeadersFromMiddlewareResponse,
-        decodePathParams: __decodePathParams,
         applyRouteHandlerMiddlewareContext: __applyRouteHandlerMiddlewareContext,
         getDraftModeCookieHeader,
       }
@@ -1642,6 +1676,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
   },` : ""}
   rootParamNamesByPattern: rootParamNamesMap,
   setNavigationContext,
+  skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
   staticParamsMap: generateStaticParamsMap,
   trailingSlash: __trailingSlash,
   validateDevRequestOrigin: __validateDevRequestOrigin,