vinext 1.0.0-beta.4 → 1.0.0-beta.6

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

@@ -1,7 +1,6 @@
 import { NextRewrite } from "../config/next-config.js";
 import { AppRoute, RouteManifest } from "../routing/app-route-graph.js";
 import { VinextLinkPrefetchRoute, VinextPagesLinkPrefetchRoute } from "../client/vinext-next-data.js";
-
 //#region src/entries/app-browser-entry.d.ts
 /**
  * Generate the virtual browser entry module.

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

@@ -1,4 +1,5 @@
 import { resolveClientRuntimeModule, resolveRuntimeEntryModule } from "./runtime-entry-module.js";
+import { toClientRewrites } from "../client/client-rewrites.js";
 import { patternsStructurallyEquivalent } from "../routing/app-route-graph.js";
 //#region src/entries/app-browser-entry.ts
 /**
@@ -14,9 +15,12 @@ function generateBrowserEntry(routes = [], routeManifest = null, pagesPrefetchRo
 	fallback: []
 }) {
 	const entryPath = resolveRuntimeEntryModule("app-browser-entry");
+	const reactInstanceBootstrapPath = resolveClientRuntimeModule("react-instance-bootstrap");
 	const navigationRuntimePath = resolveClientRuntimeModule("navigation-runtime");
 	const prefetchRoutes = toLinkPrefetchRoutes(routes);
-	return `import { registerNavigationRuntimeBootstrap } from ${JSON.stringify(navigationRuntimePath)};
+	const clientRewrites = toClientRewrites(rewrites);
+	return `import ${JSON.stringify(reactInstanceBootstrapPath)};
+import { registerNavigationRuntimeBootstrap } from ${JSON.stringify(navigationRuntimePath)};
 
 window.__VINEXT_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(prefetchRoutes)};
 // Pages route manifest for hybrid ownership decisions. In a hybrid
@@ -24,7 +28,7 @@ window.__VINEXT_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(prefetchRoutes)};
 // entry must also expose the Pages manifest (the Pages client entry does
 // the same — whichever entry runs first emits both globals).
 window.__VINEXT_PAGES_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(pagesPrefetchRoutes)};
-window.__VINEXT_CLIENT_REWRITES__ = ${JSON.stringify(rewrites)};
+window.__VINEXT_CLIENT_REWRITES__ = ${JSON.stringify(clientRewrites)};
 registerNavigationRuntimeBootstrap({
     routeManifest: ${buildRouteManifestExpression(routeManifest)}
 });
@@ -66,7 +70,8 @@ function toLinkPrefetchRoute(route, hasSiblingInterceptLoading = route.siblingIn
 		canPrefetchLoadingShell: hasLoadingBoundary(route, hasSiblingInterceptLoading),
 		patternParts: [...route.patternParts],
 		isDynamic: route.isDynamic,
-		...requiresDynamicNavigationRequest(route) ? { requiresDynamicNavigationRequest: true } : {}
+		...requiresDynamicNavigationRequest(route) ? { requiresDynamicNavigationRequest: true } : {},
+		...(route.rootParamNames?.length ?? 0) > 0 ? { hasRootParams: true } : {}
 	};
 }
 /** Project App routes together so sibling-intercept loading is applied to its target route. */

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

@@ -2,7 +2,6 @@ import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite, PrefetchInlining
 import { AppRoute } from "../routing/app-route-graph.js";
 import { MetadataFileRoute } from "../server/metadata-routes.js";
 import { ImageConfig } from "../server/image-optimization.js";
-
 //#region src/entries/app-rsc-entry.d.ts
 /**
  * Resolved config options relevant to App Router request handling.
@@ -15,11 +14,16 @@ type AppRouterConfig = {
     afterFiles: NextRewrite[];
     fallback: NextRewrite[];
   };
-  headers?: NextHeader[]; /** Extra origins allowed for server action CSRF checks (from experimental.serverActions.allowedOrigins). */
-  allowedOrigins?: string[]; /** Extra origins allowed for dev server access (from allowedDevOrigins). */
-  allowedDevOrigins?: string[]; /** Body size limit for server actions in bytes (from experimental.serverActions.bodySizeLimit). */
-  bodySizeLimit?: number; /** Verbatim body size limit config value (e.g. "2mb") for the "Body exceeded {limit} limit" error. */
-  bodySizeLimitLabel?: string; /** Serialized next.config htmlLimitedBots regexp source. */
+  headers?: NextHeader[];
+  /** Extra origins allowed for server action CSRF checks (from experimental.serverActions.allowedOrigins). */
+  allowedOrigins?: string[];
+  /** Extra origins allowed for dev server access (from allowedDevOrigins). */
+  allowedDevOrigins?: string[];
+  /** Body size limit for server actions in bytes (from experimental.serverActions.bodySizeLimit). */
+  bodySizeLimit?: number;
+  /** Verbatim body size limit config value (e.g. "2mb") for the "Body exceeded {limit} limit" error. */
+  bodySizeLimitLabel?: string;
+  /** Serialized next.config htmlLimitedBots regexp source. */
   htmlLimitedBots?: string;
   /**
    * Allow-list of keys (from `experimental.clientTraceMetadata`) to surface
@@ -35,19 +39,27 @@ type AppRouterConfig = {
    *
    * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/assetPrefix
    */
-  assetPrefix?: string; /** Route-level expire fallback in seconds for ISR entries with numeric revalidate. */
+  assetPrefix?: string;
+  /** Route-level expire fallback in seconds for ISR entries with numeric revalidate. */
   expireTime?: number;
   /**
    * Maximum total length (in characters) of the preload `Link` header emitted
    * during App Router SSR. `0` disables emission. Defaults to 6000.
    */
-  reactMaxHeadersLength?: number; /** Maximum in-memory cache size in bytes. 0 disables the default memory cache. */
-  cacheMaxMemorySize?: number; /** Inline app CSS into production HTML (from experimental.inlineCss). */
-  inlineCss?: boolean; /** Enable standalone route-miss 404 handling (from experimental.globalNotFound). */
-  globalNotFound?: boolean; /** Enables Next.js Cache Components semantics for App Router document HTML. */
-  cacheComponents?: boolean; /** Resolved `experimental.prefetchInlining` thresholds. */
-  prefetchInlining?: PrefetchInliningConfig; /** Whether the RSC build discovered any server references. Defaults to true. */
-  hasServerActions?: boolean; /** Internationalization routing config for middleware matcher locale handling. */
+  reactMaxHeadersLength?: number;
+  /** Maximum in-memory cache size in bytes. 0 disables the default memory cache. */
+  cacheMaxMemorySize?: number;
+  /** Inline app CSS into production HTML (from experimental.inlineCss). */
+  inlineCss?: boolean;
+  /** Enable standalone route-miss 404 handling (from experimental.globalNotFound). */
+  globalNotFound?: boolean;
+  /** Enables Next.js Cache Components semantics for App Router document HTML. */
+  cacheComponents?: boolean;
+  /** Resolved `experimental.prefetchInlining` thresholds. */
+  prefetchInlining?: PrefetchInliningConfig;
+  /** Whether the RSC build discovered any server references. Defaults to true. */
+  hasServerActions?: boolean;
+  /** Internationalization routing config for middleware matcher locale handling. */
   i18n?: NextI18nConfig | null;
   imageConfig?: ImageConfig;
   /**
@@ -67,8 +79,10 @@ type AppRouterConfig = {
    * `import("./ssr/index.js")`, which re-exports it from
    * `virtual:vinext-server-entry` when this flag is set.
    */
-  hasPagesDir?: boolean; /** Exact public/ file routes, using normalized leading-slash pathnames. */
-  publicFiles?: string[]; /** Server-only token used to validate the draft-mode bypass cookie. */
+  hasPagesDir?: boolean;
+  /** Exact public/ file routes, using normalized leading-slash pathnames. */
+  publicFiles?: string[];
+  /** Server-only token used to validate the draft-mode bypass cookie. */
   draftModeSecret?: string;
 };
 /**

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

@@ -20,6 +20,7 @@ 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 appMiddlewarePath = resolveEntryPath("../server/app-middleware.js", import.meta.url);
 const metadataRouteResponsePath = resolveEntryPath("../server/metadata-route-response.js", import.meta.url);
@@ -80,6 +81,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const cacheComponents = config?.cacheComponents === true;
 	const prefetchInlining = config?.prefetchInlining ?? false;
 	const hasServerActions = config?.hasServerActions !== false;
+	const hasAppRouteHandlers = routes.some((route) => route.routePath !== null);
 	const i18nConfig = config?.i18n ?? null;
 	const hasPagesDir = config?.hasPagesDir ?? false;
 	const publicFiles = config?.publicFiles ?? [];
@@ -105,6 +107,9 @@ async function __loadPrerenderPagesRoutes() {
 }
 ` : "";
 	return `
+${hasAppRouteHandlers ? `// Capture the canonical Request surface before any user module can extend it.
+// The global-backed snapshot remains available to the lazy dispatch chunk.
+import ${JSON.stringify(appRouteRequestBuiltInsPath)};` : ""}
 import ${JSON.stringify(serverGlobalsPath)};
 import {
   renderToReadableStream as _renderToReadableStream,
@@ -217,7 +222,7 @@ import { clearAppRequestContext as __clearRequestContext, setAppNavigationContex
 
 __configureMemoryCacheHandler({ cacheMaxMemorySize: ${JSON.stringify(cacheMaxMemorySize)} });
 import { createAppPrerenderStaticParamsResolver as __createAppPrerenderStaticParamsResolver } from ${JSON.stringify(appPrerenderStaticParamsPath)};
-import { ensureAppRouteModulesLoaded as __ensureRouteLoaded } from ${JSON.stringify(appRouteModuleLoaderPath)};
+import { ensureAppRouteModulesLoaded as __ensureRouteLoaded, loadAppInterceptPage as __loadAppInterceptPage } from ${JSON.stringify(appRouteModuleLoaderPath)};
 import {
   getRenderedConcreteUrlPathsForRoute as __getRenderedConcreteUrlPathsForRoute,
   initPregeneratedPathsFromGlobals as __initPregeneratedPathsFromGlobals,
@@ -469,9 +474,15 @@ export async function seedMemoryCacheFromPrerender(serverDir) {
     buildAppPageRscKey(pathname) {
       return __isrRscKey(pathname);
     },
+    buildAppRouteKey(pathname) {
+      return __isrRouteKey(pathname);
+    },
     writeAppPageEntry(key, data, metadata) {
       return __isrSetPrerenderedAppPage(key, data, metadata);
     },
+    writeAppRouteEntry(key, data, policy) {
+      return __isrSet(key, data, policy);
+    },
   });
 }
 
@@ -677,12 +688,11 @@ export default createAppRscHandler({
         // 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
-        // awaits __pageLoader (resolveAppPageInterceptState). Without this the
-        // intercept probe branch silently inspects an undefined component and
-        // never observes the page's searchParams/headers access.
-        if (__probeIntercept && __probeIntercept.__pageLoader && __probeIntercept.page == null) {
-          __probeIntercept.page = await __probeIntercept.__pageLoader();
-        }
+        // 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,
@@ -846,6 +856,8 @@ export default createAppRscHandler({
     scriptNonce,
     routeMatch,
     routePathname,
+    dispatchRedirectTargetRequest,
+    sourceConfigHeaders,
     searchParams,
   }) {
     const {
@@ -876,6 +888,7 @@ export default createAppRscHandler({
         renderMode: actionRenderMode,
         observeMetadataSearchParamsAccess,
         observePageSearchParamsAccess,
+        scriptNonce: targetScriptNonce,
       }) {
         return buildPageElements(actionRoute, actionParams, actionCleanPathname, {
           opts: interceptOpts,
@@ -886,7 +899,7 @@ export default createAppRscHandler({
           renderMode: actionRenderMode,
           observeMetadataSearchParamsAccess: observeMetadataSearchParamsAccess === true,
           observePageSearchParamsAccess: observePageSearchParamsAccess === true,
-        }, undefined, actionCleanPathname, scriptNonce);
+        }, undefined, actionCleanPathname, targetScriptNonce ?? scriptNonce);
       },
       cleanPathname,
       clearRequestContext() {
@@ -927,12 +940,15 @@ export default createAppRscHandler({
       },
       isRscRequest,
       loadServerAction,
+      // Redirect targets are rendered as if the client had navigated to them,
+      // so they must route on the raw pathname a real request would use.
       matchRoute(pathnameToMatch) {
-        return matchRoute(pathnameToMatch);
+        return matchRequestRoute(pathnameToMatch);
       },
       maxActionBodySize: __MAX_ACTION_BODY_SIZE,
       maxActionBodySizeLabel: __MAX_ACTION_BODY_SIZE_LABEL,
       middlewareHeaders: middlewareContext.headers,
+      middlewareRequestHeaders: middlewareContext.requestHeaders,
       middlewareStatus: middlewareContext.status,
       mountedSlotsHeader,
       readBodyWithLimit: __readBodyWithLimit,
@@ -947,6 +963,8 @@ export default createAppRscHandler({
       },
       resolveRouteRuntime: __resolveRouteRuntime,
       request,
+      dispatchRedirectTargetRequest,
+      sourceConfigHeaders,
       sanitizeErrorForClient(error) {
         return __sanitizeErrorForClient(error);
       },
@@ -955,6 +973,7 @@ export default createAppRscHandler({
       setNavigationContext,
       toInterceptOpts(intercept) {
         return {
+          interceptGraphId: intercept.interceptionGraphId,
           interceptionContext,
           interceptLayouts: intercept.interceptLayouts,
           interceptLayoutSegments: intercept.interceptLayoutSegments,
@@ -966,6 +985,8 @@ export default createAppRscHandler({
           interceptSlotKey: intercept.slotKey,
           interceptSourceMatchedUrl: interceptionContext,
           interceptSourcePageSegments: intercept.sourcePageSegments,
+          interceptTargetPatternParts: intercept.targetPatternParts,
+          interceptTargetRouteGraphId: intercept.targetRouteGraphId,
           interceptPage: intercept.page,
           interceptParams: intercept.matchedParams,
         };
@@ -975,13 +996,27 @@ export default createAppRscHandler({
   ` : ""}
   i18nConfig: __i18nConfig,
   ${hasPagesDir ? `loadPrerenderPagesRoutes: __loadPrerenderPagesRoutes,` : ""}
+  ${(metadataRoutes?.length ?? 0) > 0 ? `async getPrerenderMetadataRoutePaths() {
+    const { getPrerenderableMetadataRoutePaths: __getPrerenderableMetadataRoutePaths } =
+      await __loadMetadataRouteResponse();
+    return __getPrerenderableMetadataRoutePaths(metadataRoutes);
+  },` : ""}
+  ${(metadataRoutes?.length ?? 0) > 0 ? `async isMetadataRoutePath(cleanPathname) {
+    const { isMetadataRouteRequestPath: __isMetadataRouteRequestPath } =
+      await __loadMetadataRouteResponse();
+    return __isMetadataRouteRequestPath(metadataRoutes, cleanPathname);
+  },` : ""}
   ${(metadataRoutes?.length ?? 0) > 0 ? `async handleMetadataRouteRequest(cleanPathname) {
     const { handleMetadataRouteRequest: __handleMetadataRouteRequest } =
       await __loadMetadataRouteResponse();
     return __handleMetadataRouteRequest({
       metadataRoutes,
       cleanPathname,
+      isrGet: __isrGet,
+      isrRouteKey: __isrRouteKey,
+      isrSet: __isrSet,
       makeThenableParams,
+      scheduleBackgroundRegeneration: __triggerBackgroundRegeneration,
     });
   },` : ""}
   matchRoute,
@@ -999,19 +1034,22 @@ export default createAppRscHandler({
     }
     return { route, params };
   },
-  ${middlewarePath ? `runMiddleware({ cleanPathname, context, hadBasePath, isDataRequest, request }) {
+  ${middlewarePath ? `runMiddleware({ cleanPathname, context, externalRewriteRequest, hadBasePath, isDataRequest, middlewareRequest, request, validateExternalRewriteRequest }) {
     return __applyAppMiddleware({
       basePath: __basePath,
       cleanPathname,
       context,
+      externalRewriteRequest,
       hadBasePath,
       filePath: ${JSON.stringify(middlewarePath ? toSlash(middlewarePath) : "")},
       i18nConfig: __i18nConfig,
       isDataRequest,
       isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},
+      middlewareRequest,
       module: middlewareModule,
       request,
       trailingSlash: __trailingSlash,
+      validateExternalRewriteRequest,
     });
   },` : ""}
   publicFiles: __publicFiles,

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

@@ -1,6 +1,5 @@
 import { AppRoute } from "../routing/app-route-graph.js";
 import { MetadataFileRoute } from "../server/metadata-routes.js";
-
 //#region src/entries/app-rsc-manifest.d.ts
 type AppRscManifestCode = {
   imports: string[];

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

@@ -115,6 +115,7 @@ function buildRouteEntries(routes, imports) {
 		const forbiddenLoaders = lazyLoaderArray(forbiddenPaths, imports);
 		const unauthorizedLoaders = lazyLoaderArray(unauthorizedPaths, imports);
 		const siblingInterceptEntries = (route.siblingIntercepts ?? []).map((ir) => `    {
+      id: ${JSON.stringify(ir.id ?? null)},
       convention: ${JSON.stringify(ir.convention)},
       targetPattern: ${JSON.stringify(ir.targetPattern)},
       sourceMatchPattern: ${JSON.stringify(ir.sourceMatchPattern)},

package/dist/entries/pages-client-entry.d.ts

@@ -2,7 +2,6 @@ import { ResolvedNextConfig } from "../config/next-config.js";
 import { createValidFileMatcher } from "../routing/file-matcher.js";
 import { StaticMiddlewareMatcher } from "../build/report.js";
 import { VinextLinkPrefetchRoute } from "../client/vinext-next-data.js";
-
 //#region src/entries/pages-client-entry.d.ts
 declare function generateClientEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, options?: {
   appPrefetchRoutes?: readonly VinextLinkPrefetchRoute[];

package/dist/entries/pages-client-entry.js

@@ -2,7 +2,9 @@ import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index
 import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { apiRouter, pagesRouter } from "../routing/pages-router.js";
+import { resolveClientRuntimeModule } from "./runtime-entry-module.js";
 import { hasExportedName } from "../build/report.js";
+import { toClientRewrites } from "../client/client-rewrites.js";
 import { readFile } from "node:fs/promises";
 //#region src/entries/pages-client-entry.ts
 /**
@@ -51,6 +53,8 @@ async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options =
 	const pagesSsgPatterns = (await Promise.all(pageRoutes.map(async (route) => await hasGetStaticPropsExport(route.filePath) ? patternToNextFormat(route.pattern) : null))).filter((pattern) => pattern !== null);
 	const pagesSspPatterns = (await Promise.all(pageRoutes.map(async (route) => await hasGetServerSidePropsExport(route.filePath) ? patternToNextFormat(route.pattern) : null))).filter((pattern) => pattern !== null);
 	const instrumentationClientPath = options.instrumentationClientPath ?? null;
+	const clientRewrites = toClientRewrites(nextConfig.rewrites);
+	const reactInstanceBootstrapPath = resolveClientRuntimeModule("react-instance-bootstrap");
 	const loaderEntries = pageRoutes.map((r) => {
 		const absPath = r.filePath;
 		const nextFormatPattern = patternToNextFormat(r.pattern);
@@ -61,7 +65,8 @@ async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options =
 	const userInstrumentationImport = instrumentationClientPath ? `import ${JSON.stringify(toSlash(instrumentationClientPath))};\n` : "";
 	const reactPreambleImport = options.reactPreamble === false ? "" : "import \"@vitejs/plugin-react/preamble\";\n";
 	const reactStrictModeEnabled = nextConfig.reactStrictMode === true;
-	return `${userInstrumentationImport}${reactPreambleImport}
+	return `import ${JSON.stringify(reactInstanceBootstrapPath)};
+${userInstrumentationImport}${reactPreambleImport}
 import "vinext/instrumentation-client";
 import React from "react";
 import { hydrateRoot } from "react-dom/client";
@@ -121,7 +126,7 @@ window.__VINEXT_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(appPrefetchRoutes)};
 // so whichever entry runs first emits the Pages manifest.
 window.__VINEXT_PAGES_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(pagesPrefetchRoutes)};
 window.__VINEXT_CLIENT_REDIRECTS__ = ${JSON.stringify(nextConfig.redirects)};
-window.__VINEXT_CLIENT_REWRITES__ = ${JSON.stringify(nextConfig.rewrites)};
+window.__VINEXT_CLIENT_REWRITES__ = ${JSON.stringify(clientRewrites)};
 
 const nextDataElement = document.getElementById("__NEXT_DATA__");
 if (nextDataElement?.textContent) {
@@ -212,13 +217,18 @@ async function hydrate() {
   window.__NEXT_HYDRATED_AT = hydratedAt;
   window.__NEXT_HYDRATED_CB?.();
 
-  if (nextData.isFallback) {
+  const initialMatchesMiddleware =
+    nextData.__vinext?.hasMiddleware === true || nextData.__vinext?.hasRewrites === true;
+  const shouldHydrateQuery =
+    nextData.isFallback ||
+    (nextData.gsp === true && (initialMatchesMiddleware || window.location.search !== ""));
+  if (shouldHydrateQuery) {
     const currentUrl = window.location.pathname + window.location.search + window.location.hash;
-    const routeUrl = nextData.__vinext?.routeUrl;
+    const routeUrl = nextData.isFallback ? nextData.__vinext?.routeUrl : undefined;
     await Router.replace(
       routeUrl || currentUrl,
       routeUrl ? currentUrl : undefined,
-      { _h: 1, scroll: false },
+      { _h: 1, scroll: false, shallow: !nextData.isFallback && !initialMatchesMiddleware },
     );
   }
 }

package/dist/entries/pages-server-entry.d.ts

@@ -1,11 +1,10 @@
 import { ResolvedNextConfig } from "../config/next-config.js";
 import { createValidFileMatcher } from "../routing/file-matcher.js";
-
 //#region src/entries/pages-server-entry.d.ts
 /**
  * Generate the virtual SSR server entry module.
  * This is the entry point for `vite build --ssr`.
  */
-declare function generateServerEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null): Promise<string>;
+declare function generateServerEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null, publicFiles?: string[]): Promise<string>;
 //#endregion
 export { generateServerEntry };

package/dist/entries/pages-server-entry.js

@@ -35,7 +35,7 @@ async function getPagesDataKind(filePath) {
 * Generate the virtual SSR server entry module.
 * This is the entry point for `vite build --ssr`.
 */
-async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath) {
+async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles = []) {
 	const pageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const pageImports = pageRoutes.map((r, i) => `import * as page_${i} from ${JSON.stringify(r.filePath)};`);
@@ -64,6 +64,7 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 		basePath: nextConfig?.basePath ?? "",
 		assetPrefix: nextConfig?.assetPrefix ?? "",
 		trailingSlash: nextConfig?.trailingSlash ?? false,
+		skipProxyUrlNormalize: nextConfig?.skipProxyUrlNormalize ?? false,
 		redirects: nextConfig?.redirects ?? [],
 		rewrites: nextConfig?.rewrites ?? {
 			beforeFiles: [],
@@ -151,7 +152,7 @@ import { buildRouteTrie as _buildRouteTrie, trieMatch as _trieMatch } from ${JSO
 import { reportRequestError as _reportRequestError } from "vinext/instrumentation";
 import { resolvePagesI18nRequest } from ${JSON.stringify(_pagesI18nPath)};
 import { handlePagesApiRoute as __handlePagesApiRoute } from ${JSON.stringify(_pagesApiRoutePath)};
-import { normalizePagesDataRequest as __normalizePagesDataRequest, buildNextDataNotFoundResponse as __buildNextDataNotFoundResponse } from ${JSON.stringify(_pagesDataRoutePath)};
+import { normalizePagesDataRequest as __normalizePagesDataRequest, shouldAddTrailingSlashToPagesDataPath as __shouldAddTrailingSlashToPagesDataPath, buildNextDataNotFoundResponse as __buildNextDataNotFoundResponse } from ${JSON.stringify(_pagesDataRoutePath)};
 import { buildDefaultPagesNotFoundResponse as __buildDefaultPagesNotFoundResponse } from ${JSON.stringify(_pagesDefault404Path)};
 import { createPagesPageHandler as __createPagesPageHandler } from ${JSON.stringify(_pagesPageHandlerPath)};
 import { isOnDemandRevalidateRequest as __isOnDemandRevalidateRequest } from ${JSON.stringify(_isrCachePath)};
@@ -177,7 +178,11 @@ export function normalizeDataRequest(request) {
     request,
     buildId,
     vinextConfig.basePath,
-    hasMiddleware && vinextConfig.trailingSlash,
+    __shouldAddTrailingSlashToPagesDataPath(
+      hasMiddleware,
+      vinextConfig.trailingSlash,
+      vinextConfig.skipProxyUrlNormalize,
+    ),
   );
 }
 export const hasMiddleware = ${JSON.stringify(Boolean(middlewarePath))};
@@ -202,7 +207,7 @@ async function _renderToStringAsync(element) {
   return new Response(stream).text();
 }
 
-async function _renderIsrPassToStringAsync(element) {
+async function _renderIsrPassToStringAsync(element, onHeadReady) {
   // The cache-fill render is a second render pass for the same request.
   // Reset render-scoped state so it cannot leak from the streamed response
   // render or affect async work that is still draining from that stream.
@@ -211,7 +216,17 @@ async function _renderIsrPassToStringAsync(element) {
   return await runWithServerInsertedHTMLState(() =>
     runWithHeadState(() =>
       _runWithCacheState(() =>
-        runWithPrivateCache(() => runWithFetchCache(async () => _renderToStringAsync(element))),
+        runWithPrivateCache(() =>
+          runWithFetchCache(async () => {
+            const html = await _renderToStringAsync(element);
+            // next/head tags are collected as a side effect of the render
+            // above and live in this ALS scope only, so a caller that wants
+            // the regenerated head has to read it here — after the render,
+            // before the scope unwinds.
+            await onHeadReady?.();
+            return html;
+          }),
+        ),
       ),
     ),
   );
@@ -227,6 +242,7 @@ ${errorImportCode}
 export const pageRoutes = [
 ${pageRouteEntries.join(",\n")}
 ];
+export const publicFiles = new Set(${JSON.stringify(publicFiles)});
 const _pageRouteTrie = _buildRouteTrie(pageRoutes);
 const _errorPageRoute = {
   pattern: "/_error",

package/dist/image/image-adapters-virtual.d.ts

@@ -31,7 +31,8 @@ type ImageAdapterDescriptor<O extends Record<string, unknown> = Record<string, u
    * Module specifier (or absolute path, e.g. from `require.resolve(...)`) whose
    * default export is an image optimizer factory.
    */
-  adapter: string; /** JSON-serializable options forwarded to the factory at runtime. */
+  adapter: string;
+  /** JSON-serializable options forwarded to the factory at runtime. */
   options?: O;
 };
 /**
@@ -46,7 +47,8 @@ type ImageAdapterDescriptor<O extends Record<string, unknown> = Record<string, u
  * serializable next.config data.
  */
 type VinextImageConfig = {
-  /** Server-side image optimizer adapter (the `/_next/image` transform backend). */optimizer?: ImageAdapterDescriptor;
+  /** Server-side image optimizer adapter (the `/_next/image` transform backend). */
+  optimizer?: ImageAdapterDescriptor;
 };
 /** Public virtual module id imported by the server entries. */
 declare const VIRTUAL_IMAGE_ADAPTERS = "virtual:vinext-image-adapters";

package/dist/index.d.ts

@@ -5,7 +5,6 @@ import { AppStaticExportOptions, StaticExportOptions, StaticExportResult, static
 import { VinextImageConfig } from "./image/image-adapters-virtual.js";
 import { PluginOption } from "vite";
 import { Options } from "@vitejs/plugin-react";
-
 //#region src/index.d.ts
 type VinextOptions = {
   /**