vinext 1.0.0-beta.3 → 1.0.0-beta.5

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

@@ -217,7 +217,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,
@@ -414,7 +414,7 @@ function findIntercept(pathname, sourcePathname = null) {
   return __routeMatcher.findIntercept(pathname, sourcePathname);
 }
 
-async function buildPageElements(route, params, routePath, pageRequest, layoutParamAccess, displayPathname = routePath) {
+async function buildPageElements(route, params, routePath, pageRequest, layoutParamAccess, displayPathname = routePath, scriptNonce) {
   // Hydrate lazy page/route-handler modules before any synchronous read.
   await __ensureRouteLoaded(route);
   return __buildPageElements({
@@ -433,6 +433,7 @@ async function buildPageElements(route, params, routePath, pageRequest, layoutPa
     basePath: __basePath,
     trailingSlash: __trailingSlash,
     htmlLimitedBots: __htmlLimitedBots,
+    scriptNonce,
   });
 }
 
@@ -598,7 +599,7 @@ export default createAppRscHandler({
           observePageSearchParamsAccess: buildOptions?.observePageSearchParamsAccess === true,
           serveStreamingMetadata: buildOptions?.serveStreamingMetadata,
           isProduction: process.env.NODE_ENV === "production",
-        }, layoutParamAccess, displayPathname);
+        }, layoutParamAccess, displayPathname, scriptNonce);
       },
       clientReuseManifest,
       cleanPathname,
@@ -676,12 +677,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,
@@ -842,8 +842,11 @@ export default createAppRscHandler({
     middlewareContext,
     mountedSlotsHeader,
     request,
+    scriptNonce,
     routeMatch,
     routePathname,
+    dispatchRedirectTargetRequest,
+    sourceConfigHeaders,
     searchParams,
   }) {
     const {
@@ -874,6 +877,7 @@ export default createAppRscHandler({
         renderMode: actionRenderMode,
         observeMetadataSearchParamsAccess,
         observePageSearchParamsAccess,
+        scriptNonce: targetScriptNonce,
       }) {
         return buildPageElements(actionRoute, actionParams, actionCleanPathname, {
           opts: interceptOpts,
@@ -884,7 +888,7 @@ export default createAppRscHandler({
           renderMode: actionRenderMode,
           observeMetadataSearchParamsAccess: observeMetadataSearchParamsAccess === true,
           observePageSearchParamsAccess: observePageSearchParamsAccess === true,
-        });
+        }, undefined, actionCleanPathname, targetScriptNonce ?? scriptNonce);
       },
       cleanPathname,
       clearRequestContext() {
@@ -925,12 +929,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,
@@ -945,6 +952,8 @@ export default createAppRscHandler({
       },
       resolveRouteRuntime: __resolveRouteRuntime,
       request,
+      dispatchRedirectTargetRequest,
+      sourceConfigHeaders,
       sanitizeErrorForClient(error) {
         return __sanitizeErrorForClient(error);
       },
@@ -953,6 +962,7 @@ export default createAppRscHandler({
       setNavigationContext,
       toInterceptOpts(intercept) {
         return {
+          interceptGraphId: intercept.interceptionGraphId,
           interceptionContext,
           interceptLayouts: intercept.interceptLayouts,
           interceptLayoutSegments: intercept.interceptLayoutSegments,
@@ -964,6 +974,8 @@ export default createAppRscHandler({
           interceptSlotKey: intercept.slotKey,
           interceptSourceMatchedUrl: interceptionContext,
           interceptSourcePageSegments: intercept.sourcePageSegments,
+          interceptTargetPatternParts: intercept.targetPatternParts,
+          interceptTargetRouteGraphId: intercept.targetRouteGraphId,
           interceptPage: intercept.page,
           interceptParams: intercept.matchedParams,
         };
@@ -984,19 +996,35 @@ export default createAppRscHandler({
   },` : ""}
   matchRoute,
   matchRequestRoute,
-  ${middlewarePath ? `runMiddleware({ cleanPathname, context, hadBasePath, isDataRequest, request }) {
+  matchInterceptRoute(pathname, sourcePathname) {
+    const intercept = findIntercept(pathname, sourcePathname);
+    if (!intercept) return null;
+    const route = routes[intercept.sourceRouteIndex];
+    if (!route) return null;
+    const params = Object.create(null);
+    for (const name of route.params) {
+      if (Object.prototype.hasOwnProperty.call(intercept.sourceMatchedParams, name)) {
+        params[name] = intercept.sourceMatchedParams[name];
+      }
+    }
+    return { route, params };
+  },
+  ${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) {

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: [],
@@ -77,6 +78,7 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 		htmlLimitedBots: nextConfig?.htmlLimitedBots,
 		i18n: nextConfig?.i18n ?? null,
 		disableOptimizedLoading: nextConfig?.disableOptimizedLoading === true,
+		crossOrigin: nextConfig?.crossOrigin,
 		clientTraceMetadata: nextConfig?.clientTraceMetadata,
 		images: {
 			deviceSizes: nextConfig?.images?.deviceSizes,
@@ -150,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)};
@@ -176,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))};
@@ -201,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.
@@ -210,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;
+          }),
+        ),
       ),
     ),
   );
@@ -226,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",
@@ -298,6 +315,7 @@ const _renderPage = __createPagesPageHandler({
     htmlLimitedBots: vinextConfig.htmlLimitedBots,
     clientTraceMetadata: vinextConfig.clientTraceMetadata,
     disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
+    crossOrigin: vinextConfig.crossOrigin,
   },
   buildId,
   hasMiddleware,
@@ -385,11 +403,12 @@ export async function renderPage(request, url, manifest, ctx, middlewareHeaders,
 
 
 
-export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin) {
+export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin, edgeRuntime = "worker") {
   __registerConfiguredCacheAdapters();
   const match = matchRoute(url, apiRoutes);
   return __handlePagesApiRoute({
     ctx,
+    edgeRuntime,
     match,
     nextConfig: vinextConfig,
     request,

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 = {
   /**