vinext 0.0.50 → 0.0.52

package/dist/server/app-elements.d.ts

@@ -1,9 +1,10 @@
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, isAppElementsRecord, normalizeAppElements, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
+import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SLOT_BINDINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 
 //#region src/server/app-elements.d.ts
+declare const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
 declare function getMountedSlotIds(elements: AppElements): string[];
 declare function getMountedSlotIdsHeader(elements: AppElements): string | null;
 declare function resolveVisitedResponseInterceptionContext(requestInterceptionContext: string | null, payloadInterceptionContext: string | null): string | null;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SLOT_BINDINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
 //# sourceMappingURL=app-elements.d.ts.map

package/dist/server/app-elements.js

@@ -1,6 +1,7 @@
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, isAppElementsRecord, normalizeAppElements, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
+import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SLOT_BINDINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 //#region src/server/app-elements.ts
+const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
 function getMountedSlotIds(elements) {
 	return Object.keys(elements).filter((key) => {
 		const value = elements[key];
@@ -14,6 +15,6 @@ function resolveVisitedResponseInterceptionContext(requestInterceptionContext, p
 	return payloadInterceptionContext ?? requestInterceptionContext;
 }
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SLOT_BINDINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
 
 //# sourceMappingURL=app-elements.js.map

package/dist/server/app-elements.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-elements.js","names":[],"sources":["../../src/server/app-elements.ts"],"sourcesContent":["import { normalizeMountedSlotsHeader } from \"./app-mounted-slots-header.js\";\nimport { AppElementsWire, UNMATCHED_SLOT, type AppElements } from \"./app-elements-wire.js\";\n\nexport {\n  AppElementsWire,\n  APP_ARTIFACT_COMPATIBILITY_KEY,\n  APP_INTERCEPTION_CONTEXT_KEY,\n  APP_LAYOUT_IDS_KEY,\n  APP_LAYOUT_FLAGS_KEY,\n  APP_ROOT_LAYOUT_KEY,\n  APP_ROUTE_KEY,\n  APP_UNMATCHED_SLOT_WIRE_VALUE,\n  UNMATCHED_SLOT,\n  buildOutgoingAppPayload,\n  isAppElementsRecord,\n  normalizeAppElements,\n  readAppElementsMetadata,\n  withLayoutFlags,\n  type AppElementValue,\n  type AppElements,\n  type AppOutgoingElements,\n  type AppWireElements,\n  type LayoutFlags,\n} from \"./app-elements-wire.js\";\n\n// Raw constructor helpers stay private because callers use AppElementsWire codecs.\n\nexport function getMountedSlotIds(elements: AppElements): string[] {\n  return Object.keys(elements)\n    .filter((key) => {\n      const value = elements[key];\n      return (\n        AppElementsWire.isSlotId(key) &&\n        value !== null &&\n        value !== undefined &&\n        value !== UNMATCHED_SLOT\n      );\n    })\n    .sort();\n}\n\nexport function getMountedSlotIdsHeader(elements: AppElements): string | null {\n  return normalizeMountedSlotsHeader(getMountedSlotIds(elements).join(\" \"));\n}\n\nexport function resolveVisitedResponseInterceptionContext(\n  requestInterceptionContext: string | null,\n  payloadInterceptionContext: string | null,\n): string | null {\n  return payloadInterceptionContext ?? requestInterceptionContext;\n}\n"],"mappings":";;;AA2BA,SAAgB,kBAAkB,UAAiC;CACjE,OAAO,OAAO,KAAK,SAAS,CACzB,QAAQ,QAAQ;EACf,MAAM,QAAQ,SAAS;EACvB,OACE,gBAAgB,SAAS,IAAI,IAC7B,UAAU,QACV,UAAU,KAAA,KACV,UAAU;GAEZ,CACD,MAAM;;AAGX,SAAgB,wBAAwB,UAAsC;CAC5E,OAAO,4BAA4B,kBAAkB,SAAS,CAAC,KAAK,IAAI,CAAC;;AAG3E,SAAgB,0CACd,4BACA,4BACe;CACf,OAAO,8BAA8B"}
+{"version":3,"file":"app-elements.js","names":[],"sources":["../../src/server/app-elements.ts"],"sourcesContent":["import { normalizeMountedSlotsHeader } from \"./app-mounted-slots-header.js\";\nimport { AppElementsWire, UNMATCHED_SLOT, type AppElements } from \"./app-elements-wire.js\";\n\nexport const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = \"__prefetchLoadingShell\";\n\nexport {\n  AppElementsWire,\n  APP_ARTIFACT_COMPATIBILITY_KEY,\n  APP_CACHE_ENTRY_REUSE_PROOF_KEY,\n  APP_INTERCEPTION_KEY,\n  APP_INTERCEPTION_CONTEXT_KEY,\n  APP_LAYOUT_IDS_KEY,\n  APP_LAYOUT_FLAGS_KEY,\n  APP_RENDER_OBSERVATION_KEY,\n  APP_ROOT_LAYOUT_KEY,\n  APP_ROUTE_KEY,\n  APP_SLOT_BINDINGS_KEY,\n  APP_UNMATCHED_SLOT_WIRE_VALUE,\n  UNMATCHED_SLOT,\n  buildOutgoingAppPayload,\n  compareAppElementsSlotIds,\n  isAppElementsRecord,\n  normalizeAppElementsSlotBindings,\n  normalizeAppElements,\n  readAppElementsMetadata,\n  withLayoutFlags,\n  type AppElementValue,\n  type AppElementsInterception,\n  type AppElementsSlotBinding,\n  type AppElements,\n  type AppOutgoingElements,\n  type AppWireElements,\n  type LayoutFlags,\n} from \"./app-elements-wire.js\";\n\n// Raw constructor helpers stay private because callers use AppElementsWire codecs.\n\nexport function getMountedSlotIds(elements: AppElements): string[] {\n  return Object.keys(elements)\n    .filter((key) => {\n      const value = elements[key];\n      return (\n        AppElementsWire.isSlotId(key) &&\n        value !== null &&\n        value !== undefined &&\n        value !== UNMATCHED_SLOT\n      );\n    })\n    .sort();\n}\n\nexport function getMountedSlotIdsHeader(elements: AppElements): string | null {\n  return normalizeMountedSlotsHeader(getMountedSlotIds(elements).join(\" \"));\n}\n\nexport function resolveVisitedResponseInterceptionContext(\n  requestInterceptionContext: string | null,\n  payloadInterceptionContext: string | null,\n): string | null {\n  return payloadInterceptionContext ?? requestInterceptionContext;\n}\n"],"mappings":";;;AAGA,MAAa,wCAAwC;AAkCrD,SAAgB,kBAAkB,UAAiC;CACjE,OAAO,OAAO,KAAK,SAAS,CACzB,QAAQ,QAAQ;EACf,MAAM,QAAQ,SAAS;EACvB,OACE,gBAAgB,SAAS,IAAI,IAC7B,UAAU,QACV,UAAU,KAAA,KACV,UAAU;GAEZ,CACD,MAAM;;AAGX,SAAgB,wBAAwB,UAAsC;CAC5E,OAAO,4BAA4B,kBAAkB,SAAS,CAAC,KAAK,IAAI,CAAC;;AAG3E,SAAgB,0CACd,4BACA,4BACe;CACf,OAAO,8BAA8B"}

package/dist/server/app-fallback-renderer.d.ts

@@ -32,8 +32,17 @@ type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> =
   fontProviders: AppFallbackRendererFontProviders;
   getNavigationContext: () => unknown;
   globalErrorModule?: TModule | null;
+  /**
+   * Optional `app/global-not-found.tsx` module. When provided, route-miss 404s
+   * render this module as a standalone document (skipping the root layout)
+   * because it ships its own `<html>` and `<body>`. Page-triggered `notFound()`
+   * calls continue to use the regular `not-found.tsx` boundary inside layouts.
+   * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/app-render.tsx
+   */
+  globalNotFoundModule?: TModule | null;
   makeThenableParams: (params: AppPageParams) => unknown;
-  metadataRoutes: MetadataFileRoute[];
+  metadataRoutes: MetadataFileRoute[]; /** Configured next.config `basePath`, threaded into file-based metadata href emission. */
+  basePath?: string;
   resolveChildSegments: (routeSegments: readonly string[], treePosition: number, params: AppPageParams) => string[];
   rootBoundaries: AppFallbackRendererRootBoundaries<TModule>;
   rscRenderer: (element: ReactNode | AppElements, options: {

package/dist/server/app-fallback-renderer.js

@@ -1,15 +1,52 @@
 import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
+import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
 //#region src/server/app-fallback-renderer.ts
 const EMPTY_MW_CTX = {
 	headers: null,
 	status: null
 };
 function createAppFallbackRenderer(options) {
-	const { clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader } = options;
+	const { basePath = "", clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, globalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader } = options;
 	const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } = rootBoundaries;
+	const effectiveGlobalErrorModule = globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE;
 	return {
 		renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, middlewareContext) {
+			if (statusCode === 404 && !!globalNotFoundModule && !route && !opts?.boundaryComponent) {
+				const globalNotFoundComponent = globalNotFoundModule?.default ?? null;
+				if (globalNotFoundComponent) return renderAppPageHttpAccessFallback({
+					boundaryComponent: globalNotFoundComponent,
+					buildFontLinkHeader: fontProviders.buildFontLinkHeader,
+					clearRequestContext,
+					createRscOnErrorHandler(pathname, routePath) {
+						return buildRscOnErrorHandler(request, pathname, routePath);
+					},
+					getFontLinks: fontProviders.getFontLinks,
+					getFontPreloads: fontProviders.getFontPreloads,
+					getFontStyles: fontProviders.getFontStyles,
+					getNavigationContext,
+					globalErrorModule: effectiveGlobalErrorModule,
+					isRscRequest,
+					layoutModules: [],
+					loadSsrHandler: ssrLoader,
+					makeThenableParams,
+					matchedParams: opts?.matchedParams ?? {},
+					middlewareContext: middlewareContext ?? EMPTY_MW_CTX,
+					metadataRoutes,
+					requestUrl: request.url,
+					resolveChildSegments,
+					rootForbiddenModule: null,
+					rootLayouts: [],
+					rootNotFoundModule: null,
+					rootUnauthorizedModule: null,
+					route: null,
+					renderToReadableStream: rscRenderer,
+					scriptNonce,
+					skipLayoutWrapping: true,
+					statusCode
+				});
+			}
 			return renderAppPageHttpAccessFallback({
+				basePath,
 				boundaryComponent: opts?.boundaryComponent ?? null,
 				buildFontLinkHeader: fontProviders.buildFontLinkHeader,
 				clearRequestContext,
@@ -20,7 +57,7 @@ function createAppFallbackRenderer(options) {
 				getFontPreloads: fontProviders.getFontPreloads,
 				getFontStyles: fontProviders.getFontStyles,
 				getNavigationContext,
-				globalErrorModule,
+				globalErrorModule: effectiveGlobalErrorModule,
 				isRscRequest,
 				layoutModules: opts?.layouts ?? null,
 				loadSsrHandler: ssrLoader,
@@ -45,6 +82,7 @@ function createAppFallbackRenderer(options) {
 		},
 		renderErrorBoundary(route, error, isRscRequest, request, matchedParams, scriptNonce, middlewareContext) {
 			return renderAppPageErrorBoundary({
+				basePath,
 				buildFontLinkHeader: fontProviders.buildFontLinkHeader,
 				clearRequestContext,
 				createRscOnErrorHandler(pathname, routePath) {
@@ -55,7 +93,7 @@ function createAppFallbackRenderer(options) {
 				getFontPreloads: fontProviders.getFontPreloads,
 				getFontStyles: fontProviders.getFontStyles,
 				getNavigationContext,
-				globalErrorModule,
+				globalErrorModule: effectiveGlobalErrorModule,
 				isRscRequest,
 				loadSsrHandler: ssrLoader,
 				makeThenableParams,

package/dist/server/app-fallback-renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-fallback-renderer.js","names":[],"sources":["../../src/server/app-fallback-renderer.ts"],"sourcesContent":["import type { ReactNode } from \"react\";\nimport type { AppPageParams } from \"./app-page-boundary.js\";\nimport {\n  renderAppPageErrorBoundary,\n  renderAppPageHttpAccessFallback,\n  type AppPageBoundaryRoute,\n} from \"./app-page-boundary-render.js\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport type { AppPageSsrHandler } from \"./app-page-stream.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\nimport type { AppElements } from \"./app-elements.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = import(\"react\").ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype AppFallbackRendererRootBoundaries<TModule extends AppPageModule = AppPageModule> = {\n  rootForbiddenModule?: TModule | null;\n  rootLayouts: readonly (TModule | null | undefined)[];\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n};\n\ntype AppFallbackRendererFontProviders = {\n  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n};\n\ntype AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> = {\n  clearRequestContext: () => void;\n  createRscOnErrorHandler: (\n    request: Request,\n    pathname: string,\n    routePath: string,\n  ) => AppPageBoundaryOnError;\n  fontProviders: AppFallbackRendererFontProviders;\n  getNavigationContext: () => unknown;\n  globalErrorModule?: TModule | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  metadataRoutes: MetadataFileRoute[];\n  resolveChildSegments: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => string[];\n  rootBoundaries: AppFallbackRendererRootBoundaries<TModule>;\n  rscRenderer: (\n    element: ReactNode | AppElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  sanitizer: (error: Error) => Error;\n  ssrLoader: () => Promise<AppPageSsrHandler>;\n};\n\ntype AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {\n  renderErrorBoundary: (\n    route: AppPageBoundaryRoute<TModule> | null,\n    error: unknown,\n    isRscRequest: boolean,\n    request: Request,\n    matchedParams: AppPageParams | undefined,\n    scriptNonce: string | undefined,\n    middlewareContext: AppPageMiddlewareContext,\n  ) => Promise<Response | null>;\n  renderHttpAccessFallback: (\n    route: AppPageBoundaryRoute<TModule> | null,\n    statusCode: number,\n    isRscRequest: boolean,\n    request: Request,\n    opts: {\n      boundaryComponent?: AppPageComponent | null;\n      layouts?: readonly (TModule | null | undefined)[] | null;\n      matchedParams?: AppPageParams;\n    },\n    scriptNonce: string | undefined,\n    middlewareContext: AppPageMiddlewareContext,\n  ) => Promise<Response | null>;\n  renderNotFound: (\n    route: AppPageBoundaryRoute<TModule> | null,\n    isRscRequest: boolean,\n    request: Request,\n    matchedParams: AppPageParams | undefined,\n    scriptNonce: string | undefined,\n    middlewareContext: AppPageMiddlewareContext,\n  ) => Promise<Response | null>;\n};\n\nconst EMPTY_MW_CTX: AppPageMiddlewareContext = { headers: null, status: null };\n\nexport function createAppFallbackRenderer<TModule extends AppPageModule>(\n  options: AppFallbackRendererOptions<TModule>,\n): AppFallbackRenderer<TModule> {\n  const {\n    clearRequestContext,\n    createRscOnErrorHandler: buildRscOnErrorHandler,\n    fontProviders,\n    getNavigationContext,\n    globalErrorModule,\n    makeThenableParams,\n    metadataRoutes,\n    resolveChildSegments,\n    rootBoundaries,\n    rscRenderer,\n    sanitizer,\n    ssrLoader,\n  } = options;\n\n  const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } =\n    rootBoundaries;\n\n  return {\n    renderHttpAccessFallback(\n      route,\n      statusCode,\n      isRscRequest,\n      request,\n      opts,\n      scriptNonce,\n      middlewareContext,\n    ) {\n      return renderAppPageHttpAccessFallback({\n        boundaryComponent: opts?.boundaryComponent ?? null,\n        buildFontLinkHeader: fontProviders.buildFontLinkHeader,\n        clearRequestContext,\n        createRscOnErrorHandler(pathname, routePath) {\n          return buildRscOnErrorHandler(request, pathname, routePath);\n        },\n        getFontLinks: fontProviders.getFontLinks,\n        getFontPreloads: fontProviders.getFontPreloads,\n        getFontStyles: fontProviders.getFontStyles,\n        getNavigationContext,\n        globalErrorModule,\n        isRscRequest,\n        layoutModules: opts?.layouts ?? null,\n        loadSsrHandler: ssrLoader,\n        makeThenableParams,\n        matchedParams: opts?.matchedParams ?? route?.params ?? {},\n        middlewareContext: middlewareContext ?? EMPTY_MW_CTX,\n        metadataRoutes,\n        requestUrl: request.url,\n        resolveChildSegments,\n        rootForbiddenModule,\n        rootLayouts,\n        rootNotFoundModule,\n        rootUnauthorizedModule,\n        route,\n        renderToReadableStream: rscRenderer,\n        scriptNonce,\n        statusCode,\n      });\n    },\n\n    renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext) {\n      return this.renderHttpAccessFallback(\n        route,\n        404,\n        isRscRequest,\n        request,\n        { matchedParams },\n        scriptNonce,\n        middlewareContext,\n      );\n    },\n\n    renderErrorBoundary(\n      route,\n      error,\n      isRscRequest,\n      request,\n      matchedParams,\n      scriptNonce,\n      middlewareContext,\n    ) {\n      return renderAppPageErrorBoundary({\n        buildFontLinkHeader: fontProviders.buildFontLinkHeader,\n        clearRequestContext,\n        createRscOnErrorHandler(pathname, routePath) {\n          return buildRscOnErrorHandler(request, pathname, routePath);\n        },\n        error,\n        getFontLinks: fontProviders.getFontLinks,\n        getFontPreloads: fontProviders.getFontPreloads,\n        getFontStyles: fontProviders.getFontStyles,\n        getNavigationContext,\n        globalErrorModule,\n        isRscRequest,\n        loadSsrHandler: ssrLoader,\n        makeThenableParams,\n        matchedParams: matchedParams ?? route?.params ?? {},\n        middlewareContext: middlewareContext ?? EMPTY_MW_CTX,\n        metadataRoutes,\n        requestUrl: request.url,\n        resolveChildSegments,\n        rootLayouts,\n        route,\n        renderToReadableStream: rscRenderer,\n        sanitizeErrorForClient: sanitizer,\n        scriptNonce,\n      });\n    },\n  };\n}\n"],"mappings":";;AAiGA,MAAM,eAAyC;CAAE,SAAS;CAAM,QAAQ;CAAM;AAE9E,SAAgB,0BACd,SAC8B;CAC9B,MAAM,EACJ,qBACA,yBAAyB,wBACzB,eACA,sBACA,mBACA,oBACA,gBACA,sBACA,gBACA,aACA,WACA,cACE;CAEJ,MAAM,EAAE,qBAAqB,aAAa,oBAAoB,2BAC5D;CAEF,OAAO;EACL,yBACE,OACA,YACA,cACA,SACA,MACA,aACA,mBACA;GACA,OAAO,gCAAgC;IACrC,mBAAmB,MAAM,qBAAqB;IAC9C,qBAAqB,cAAc;IACnC;IACA,wBAAwB,UAAU,WAAW;KAC3C,OAAO,uBAAuB,SAAS,UAAU,UAAU;;IAE7D,cAAc,cAAc;IAC5B,iBAAiB,cAAc;IAC/B,eAAe,cAAc;IAC7B;IACA;IACA;IACA,eAAe,MAAM,WAAW;IAChC,gBAAgB;IAChB;IACA,eAAe,MAAM,iBAAiB,OAAO,UAAU,EAAE;IACzD,mBAAmB,qBAAqB;IACxC;IACA,YAAY,QAAQ;IACpB;IACA;IACA;IACA;IACA;IACA;IACA,wBAAwB;IACxB;IACA;IACD,CAAC;;EAGJ,eAAe,OAAO,cAAc,SAAS,eAAe,aAAa,mBAAmB;GAC1F,OAAO,KAAK,yBACV,OACA,KACA,cACA,SACA,EAAE,eAAe,EACjB,aACA,kBACD;;EAGH,oBACE,OACA,OACA,cACA,SACA,eACA,aACA,mBACA;GACA,OAAO,2BAA2B;IAChC,qBAAqB,cAAc;IACnC;IACA,wBAAwB,UAAU,WAAW;KAC3C,OAAO,uBAAuB,SAAS,UAAU,UAAU;;IAE7D;IACA,cAAc,cAAc;IAC5B,iBAAiB,cAAc;IAC/B,eAAe,cAAc;IAC7B;IACA;IACA;IACA,gBAAgB;IAChB;IACA,eAAe,iBAAiB,OAAO,UAAU,EAAE;IACnD,mBAAmB,qBAAqB;IACxC;IACA,YAAY,QAAQ;IACpB;IACA;IACA;IACA,wBAAwB;IACxB,wBAAwB;IACxB;IACD,CAAC;;EAEL"}
+{"version":3,"file":"app-fallback-renderer.js","names":[],"sources":["../../src/server/app-fallback-renderer.ts"],"sourcesContent":["import type { ReactNode } from \"react\";\nimport type { AppPageParams } from \"./app-page-boundary.js\";\nimport {\n  renderAppPageErrorBoundary,\n  renderAppPageHttpAccessFallback,\n  type AppPageBoundaryRoute,\n} from \"./app-page-boundary-render.js\";\nimport { DEFAULT_GLOBAL_ERROR_MODULE } from \"./default-global-error-module.js\";\nimport type { AppPageFontPreload } from \"./app-page-execution.js\";\nimport type { AppPageMiddlewareContext } from \"./app-page-response.js\";\nimport type { AppPageSsrHandler } from \"./app-page-stream.js\";\nimport type { MetadataFileRoute } from \"./metadata-routes.js\";\nimport type { AppElements } from \"./app-elements.js\";\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AppPageComponent = import(\"react\").ComponentType<any>;\ntype AppPageModule = Record<string, unknown> & {\n  default?: AppPageComponent | null | undefined;\n};\ntype AppPageBoundaryOnError = (\n  error: unknown,\n  requestInfo: unknown,\n  errorContext: unknown,\n) => unknown;\n\ntype AppFallbackRendererRootBoundaries<TModule extends AppPageModule = AppPageModule> = {\n  rootForbiddenModule?: TModule | null;\n  rootLayouts: readonly (TModule | null | undefined)[];\n  rootNotFoundModule?: TModule | null;\n  rootUnauthorizedModule?: TModule | null;\n};\n\ntype AppFallbackRendererFontProviders = {\n  buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;\n  getFontLinks: () => string[];\n  getFontPreloads: () => AppPageFontPreload[];\n  getFontStyles: () => string[];\n};\n\ntype AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> = {\n  clearRequestContext: () => void;\n  createRscOnErrorHandler: (\n    request: Request,\n    pathname: string,\n    routePath: string,\n  ) => AppPageBoundaryOnError;\n  fontProviders: AppFallbackRendererFontProviders;\n  getNavigationContext: () => unknown;\n  globalErrorModule?: TModule | null;\n  /**\n   * Optional `app/global-not-found.tsx` module. When provided, route-miss 404s\n   * render this module as a standalone document (skipping the root layout)\n   * because it ships its own `<html>` and `<body>`. Page-triggered `notFound()`\n   * calls continue to use the regular `not-found.tsx` boundary inside layouts.\n   * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/app-render.tsx\n   */\n  globalNotFoundModule?: TModule | null;\n  makeThenableParams: (params: AppPageParams) => unknown;\n  metadataRoutes: MetadataFileRoute[];\n  /** Configured next.config `basePath`, threaded into file-based metadata href emission. */\n  basePath?: string;\n  resolveChildSegments: (\n    routeSegments: readonly string[],\n    treePosition: number,\n    params: AppPageParams,\n  ) => string[];\n  rootBoundaries: AppFallbackRendererRootBoundaries<TModule>;\n  rscRenderer: (\n    element: ReactNode | AppElements,\n    options: { onError: AppPageBoundaryOnError },\n  ) => ReadableStream<Uint8Array>;\n  sanitizer: (error: Error) => Error;\n  ssrLoader: () => Promise<AppPageSsrHandler>;\n};\n\ntype AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {\n  renderErrorBoundary: (\n    route: AppPageBoundaryRoute<TModule> | null,\n    error: unknown,\n    isRscRequest: boolean,\n    request: Request,\n    matchedParams: AppPageParams | undefined,\n    scriptNonce: string | undefined,\n    middlewareContext: AppPageMiddlewareContext,\n  ) => Promise<Response | null>;\n  renderHttpAccessFallback: (\n    route: AppPageBoundaryRoute<TModule> | null,\n    statusCode: number,\n    isRscRequest: boolean,\n    request: Request,\n    opts: {\n      boundaryComponent?: AppPageComponent | null;\n      layouts?: readonly (TModule | null | undefined)[] | null;\n      matchedParams?: AppPageParams;\n    },\n    scriptNonce: string | undefined,\n    middlewareContext: AppPageMiddlewareContext,\n  ) => Promise<Response | null>;\n  renderNotFound: (\n    route: AppPageBoundaryRoute<TModule> | null,\n    isRscRequest: boolean,\n    request: Request,\n    matchedParams: AppPageParams | undefined,\n    scriptNonce: string | undefined,\n    middlewareContext: AppPageMiddlewareContext,\n  ) => Promise<Response | null>;\n};\n\nconst EMPTY_MW_CTX: AppPageMiddlewareContext = { headers: null, status: null };\n\nexport function createAppFallbackRenderer<TModule extends AppPageModule>(\n  options: AppFallbackRendererOptions<TModule>,\n): AppFallbackRenderer<TModule> {\n  const {\n    basePath = \"\",\n    clearRequestContext,\n    createRscOnErrorHandler: buildRscOnErrorHandler,\n    fontProviders,\n    getNavigationContext,\n    globalErrorModule,\n    globalNotFoundModule,\n    makeThenableParams,\n    metadataRoutes,\n    resolveChildSegments,\n    rootBoundaries,\n    rscRenderer,\n    sanitizer,\n    ssrLoader,\n  } = options;\n\n  const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } =\n    rootBoundaries;\n\n  // When the app does not define `app/global-error.tsx`, fall back to vinext's\n  // built-in default global error component so that uncaught render errors\n  // produce the same UI Next.js ships out of the box (matching markup, inline\n  // styles, theme CSS, and the \"ERROR <digest>\" footer for server errors).\n  // See packages/vinext/src/shims/default-global-error.tsx and\n  // packages/vinext/src/server/default-global-error-module.ts.\n  const effectiveGlobalErrorModule: TModule | null =\n    globalErrorModule ?? (DEFAULT_GLOBAL_ERROR_MODULE as unknown as TModule);\n\n  return {\n    renderHttpAccessFallback(\n      route,\n      statusCode,\n      isRscRequest,\n      request,\n      opts,\n      scriptNonce,\n      middlewareContext,\n    ) {\n      // global-not-found.tsx replaces the root layout for route-miss 404s.\n      // Only applies when:\n      //   - The user defined app/global-not-found.tsx\n      //   - The 404 originates from a route miss (no matched route)\n      //   - The caller did not already pick a specific boundary component\n      // Page-triggered notFound() calls (route is non-null) keep using the\n      // regular not-found.tsx boundary inside the route's layouts.\n      // See https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/app-render.tsx#L495-L520\n      const useGlobalNotFound =\n        statusCode === 404 && !!globalNotFoundModule && !route && !opts?.boundaryComponent;\n\n      if (useGlobalNotFound) {\n        const globalNotFoundComponent = globalNotFoundModule?.default ?? null;\n        if (globalNotFoundComponent) {\n          return renderAppPageHttpAccessFallback({\n            boundaryComponent: globalNotFoundComponent,\n            buildFontLinkHeader: fontProviders.buildFontLinkHeader,\n            clearRequestContext,\n            createRscOnErrorHandler(pathname, routePath) {\n              return buildRscOnErrorHandler(request, pathname, routePath);\n            },\n            getFontLinks: fontProviders.getFontLinks,\n            getFontPreloads: fontProviders.getFontPreloads,\n            getFontStyles: fontProviders.getFontStyles,\n            getNavigationContext,\n            globalErrorModule: effectiveGlobalErrorModule,\n            isRscRequest,\n            layoutModules: [],\n            loadSsrHandler: ssrLoader,\n            makeThenableParams,\n            matchedParams: opts?.matchedParams ?? {},\n            middlewareContext: middlewareContext ?? EMPTY_MW_CTX,\n            metadataRoutes,\n            requestUrl: request.url,\n            resolveChildSegments,\n            rootForbiddenModule: null,\n            rootLayouts: [],\n            rootNotFoundModule: null,\n            rootUnauthorizedModule: null,\n            route: null,\n            renderToReadableStream: rscRenderer,\n            scriptNonce,\n            skipLayoutWrapping: true,\n            statusCode,\n          });\n        }\n      }\n\n      return renderAppPageHttpAccessFallback({\n        basePath,\n        boundaryComponent: opts?.boundaryComponent ?? null,\n        buildFontLinkHeader: fontProviders.buildFontLinkHeader,\n        clearRequestContext,\n        createRscOnErrorHandler(pathname, routePath) {\n          return buildRscOnErrorHandler(request, pathname, routePath);\n        },\n        getFontLinks: fontProviders.getFontLinks,\n        getFontPreloads: fontProviders.getFontPreloads,\n        getFontStyles: fontProviders.getFontStyles,\n        getNavigationContext,\n        globalErrorModule: effectiveGlobalErrorModule,\n        isRscRequest,\n        layoutModules: opts?.layouts ?? null,\n        loadSsrHandler: ssrLoader,\n        makeThenableParams,\n        matchedParams: opts?.matchedParams ?? route?.params ?? {},\n        middlewareContext: middlewareContext ?? EMPTY_MW_CTX,\n        metadataRoutes,\n        requestUrl: request.url,\n        resolveChildSegments,\n        rootForbiddenModule,\n        rootLayouts,\n        rootNotFoundModule,\n        rootUnauthorizedModule,\n        route,\n        renderToReadableStream: rscRenderer,\n        scriptNonce,\n        statusCode,\n      });\n    },\n\n    renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext) {\n      return this.renderHttpAccessFallback(\n        route,\n        404,\n        isRscRequest,\n        request,\n        { matchedParams },\n        scriptNonce,\n        middlewareContext,\n      );\n    },\n\n    renderErrorBoundary(\n      route,\n      error,\n      isRscRequest,\n      request,\n      matchedParams,\n      scriptNonce,\n      middlewareContext,\n    ) {\n      return renderAppPageErrorBoundary({\n        basePath,\n        buildFontLinkHeader: fontProviders.buildFontLinkHeader,\n        clearRequestContext,\n        createRscOnErrorHandler(pathname, routePath) {\n          return buildRscOnErrorHandler(request, pathname, routePath);\n        },\n        error,\n        getFontLinks: fontProviders.getFontLinks,\n        getFontPreloads: fontProviders.getFontPreloads,\n        getFontStyles: fontProviders.getFontStyles,\n        getNavigationContext,\n        globalErrorModule: effectiveGlobalErrorModule,\n        isRscRequest,\n        loadSsrHandler: ssrLoader,\n        makeThenableParams,\n        matchedParams: matchedParams ?? route?.params ?? {},\n        middlewareContext: middlewareContext ?? EMPTY_MW_CTX,\n        metadataRoutes,\n        requestUrl: request.url,\n        resolveChildSegments,\n        rootLayouts,\n        route,\n        renderToReadableStream: rscRenderer,\n        sanitizeErrorForClient: sanitizer,\n        scriptNonce,\n      });\n    },\n  };\n}\n"],"mappings":";;;AA4GA,MAAM,eAAyC;CAAE,SAAS;CAAM,QAAQ;CAAM;AAE9E,SAAgB,0BACd,SAC8B;CAC9B,MAAM,EACJ,WAAW,IACX,qBACA,yBAAyB,wBACzB,eACA,sBACA,mBACA,sBACA,oBACA,gBACA,sBACA,gBACA,aACA,WACA,cACE;CAEJ,MAAM,EAAE,qBAAqB,aAAa,oBAAoB,2BAC5D;CAQF,MAAM,6BACJ,qBAAsB;CAExB,OAAO;EACL,yBACE,OACA,YACA,cACA,SACA,MACA,aACA,mBACA;GAYA,IAFE,eAAe,OAAO,CAAC,CAAC,wBAAwB,CAAC,SAAS,CAAC,MAAM,mBAE5C;IACrB,MAAM,0BAA0B,sBAAsB,WAAW;IACjE,IAAI,yBACF,OAAO,gCAAgC;KACrC,mBAAmB;KACnB,qBAAqB,cAAc;KACnC;KACA,wBAAwB,UAAU,WAAW;MAC3C,OAAO,uBAAuB,SAAS,UAAU,UAAU;;KAE7D,cAAc,cAAc;KAC5B,iBAAiB,cAAc;KAC/B,eAAe,cAAc;KAC7B;KACA,mBAAmB;KACnB;KACA,eAAe,EAAE;KACjB,gBAAgB;KAChB;KACA,eAAe,MAAM,iBAAiB,EAAE;KACxC,mBAAmB,qBAAqB;KACxC;KACA,YAAY,QAAQ;KACpB;KACA,qBAAqB;KACrB,aAAa,EAAE;KACf,oBAAoB;KACpB,wBAAwB;KACxB,OAAO;KACP,wBAAwB;KACxB;KACA,oBAAoB;KACpB;KACD,CAAC;;GAIN,OAAO,gCAAgC;IACrC;IACA,mBAAmB,MAAM,qBAAqB;IAC9C,qBAAqB,cAAc;IACnC;IACA,wBAAwB,UAAU,WAAW;KAC3C,OAAO,uBAAuB,SAAS,UAAU,UAAU;;IAE7D,cAAc,cAAc;IAC5B,iBAAiB,cAAc;IAC/B,eAAe,cAAc;IAC7B;IACA,mBAAmB;IACnB;IACA,eAAe,MAAM,WAAW;IAChC,gBAAgB;IAChB;IACA,eAAe,MAAM,iBAAiB,OAAO,UAAU,EAAE;IACzD,mBAAmB,qBAAqB;IACxC;IACA,YAAY,QAAQ;IACpB;IACA;IACA;IACA;IACA;IACA;IACA,wBAAwB;IACxB;IACA;IACD,CAAC;;EAGJ,eAAe,OAAO,cAAc,SAAS,eAAe,aAAa,mBAAmB;GAC1F,OAAO,KAAK,yBACV,OACA,KACA,cACA,SACA,EAAE,eAAe,EACjB,aACA,kBACD;;EAGH,oBACE,OACA,OACA,cACA,SACA,eACA,aACA,mBACA;GACA,OAAO,2BAA2B;IAChC;IACA,qBAAqB,cAAc;IACnC;IACA,wBAAwB,UAAU,WAAW;KAC3C,OAAO,uBAAuB,SAAS,UAAU,UAAU;;IAE7D;IACA,cAAc,cAAc;IAC5B,iBAAiB,cAAc;IAC/B,eAAe,cAAc;IAC7B;IACA,mBAAmB;IACnB;IACA,gBAAgB;IAChB;IACA,eAAe,iBAAiB,OAAO,UAAU,EAAE;IACnD,mBAAmB,qBAAqB;IACxC;IACA,YAAY,QAAQ;IACpB;IACA;IACA;IACA,wBAAwB;IACxB,wBAAwB;IACxB;IACD,CAAC;;EAEL"}

package/dist/server/app-history-state.d.ts

@@ -0,0 +1,26 @@
+import { TraverseDirection } from "./navigation-planner.js";
+
+//#region src/server/app-history-state.d.ts
+type HistoryStateRecord = {
+  [key: string]: unknown;
+};
+type HistoryTraversalIntent = {
+  direction: TraverseDirection;
+  historyState: unknown;
+  targetHistoryIndex: number | null;
+};
+declare function createHistoryStateWithPreviousNextUrl(state: unknown, previousNextUrl: string | null): HistoryStateRecord | null;
+declare function createHistoryStateWithNavigationMetadata(state: unknown, metadata: {
+  previousNextUrl: string | null;
+  traversalIndex?: number | null;
+}): HistoryStateRecord | null;
+declare function createExternalHistoryStatePreservingMetadata(callerState: unknown, currentHistoryState: unknown): unknown;
+declare function readHistoryStatePreviousNextUrl(state: unknown): string | null;
+declare function readHistoryStateTraversalIndex(state: unknown): number | null;
+declare function resolveHistoryTraversalIntent(options: {
+  currentHistoryIndex: number | null;
+  historyState: unknown;
+}): HistoryTraversalIntent;
+//#endregion
+export { HistoryTraversalIntent, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent };
+//# sourceMappingURL=app-history-state.d.ts.map

package/dist/server/app-history-state.js

@@ -0,0 +1,53 @@
+//#region src/server/app-history-state.ts
+const VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY = "__vinext_previousNextUrl";
+const VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY = "__vinext_historyIndex";
+function cloneHistoryState(state) {
+	if (!state || typeof state !== "object") return {};
+	const nextState = {};
+	for (const [key, value] of Object.entries(state)) nextState[key] = value;
+	return nextState;
+}
+function createHistoryStateWithPreviousNextUrl(state, previousNextUrl) {
+	return createHistoryStateWithNavigationMetadata(state, { previousNextUrl });
+}
+function createHistoryStateWithNavigationMetadata(state, metadata) {
+	const nextState = cloneHistoryState(state);
+	if (metadata.previousNextUrl === null) delete nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];
+	else nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY] = metadata.previousNextUrl;
+	if (metadata.traversalIndex !== void 0) if (isValidHistoryTraversalIndex(metadata.traversalIndex)) nextState[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY] = metadata.traversalIndex;
+	else delete nextState[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY];
+	return Object.keys(nextState).length > 0 ? nextState : null;
+}
+function createExternalHistoryStatePreservingMetadata(callerState, currentHistoryState) {
+	const previousNextUrl = readHistoryStatePreviousNextUrl(currentHistoryState);
+	if (previousNextUrl === null) return callerState;
+	return createHistoryStateWithPreviousNextUrl(callerState, previousNextUrl);
+}
+function readHistoryStatePreviousNextUrl(state) {
+	const value = cloneHistoryState(state)[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];
+	return typeof value === "string" ? value : null;
+}
+function isValidHistoryTraversalIndex(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
+}
+function readHistoryStateTraversalIndex(state) {
+	const value = cloneHistoryState(state)[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY];
+	return isValidHistoryTraversalIndex(value) ? value : null;
+}
+function resolveHistoryTraversalIntent(options) {
+	const targetHistoryIndex = readHistoryStateTraversalIndex(options.historyState);
+	let direction = "unknown";
+	if (options.currentHistoryIndex !== null && targetHistoryIndex !== null) {
+		if (targetHistoryIndex < options.currentHistoryIndex) direction = "back";
+		else if (targetHistoryIndex > options.currentHistoryIndex) direction = "forward";
+	}
+	return {
+		direction,
+		historyState: options.historyState,
+		targetHistoryIndex
+	};
+}
+//#endregion
+export { createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent };
+
+//# sourceMappingURL=app-history-state.js.map

package/dist/server/app-history-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-history-state.js","names":[],"sources":["../../src/server/app-history-state.ts"],"sourcesContent":["import type { TraverseDirection } from \"./navigation-planner.js\";\n\nconst VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY = \"__vinext_previousNextUrl\";\nconst VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY = \"__vinext_historyIndex\";\n\ntype HistoryStateRecord = {\n  [key: string]: unknown;\n};\n\nexport type HistoryTraversalIntent = {\n  direction: TraverseDirection;\n  historyState: unknown;\n  targetHistoryIndex: number | null;\n};\n\nfunction cloneHistoryState(state: unknown): HistoryStateRecord {\n  if (!state || typeof state !== \"object\") {\n    return {};\n  }\n\n  const nextState: HistoryStateRecord = {};\n  for (const [key, value] of Object.entries(state)) {\n    nextState[key] = value;\n  }\n  return nextState;\n}\n\nexport function createHistoryStateWithPreviousNextUrl(\n  state: unknown,\n  previousNextUrl: string | null,\n): HistoryStateRecord | null {\n  return createHistoryStateWithNavigationMetadata(state, { previousNextUrl });\n}\n\nexport function createHistoryStateWithNavigationMetadata(\n  state: unknown,\n  metadata: {\n    previousNextUrl: string | null;\n    traversalIndex?: number | null;\n  },\n): HistoryStateRecord | null {\n  const nextState = cloneHistoryState(state);\n\n  if (metadata.previousNextUrl === null) {\n    delete nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];\n  } else {\n    nextState[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY] = metadata.previousNextUrl;\n  }\n\n  if (metadata.traversalIndex !== undefined) {\n    if (isValidHistoryTraversalIndex(metadata.traversalIndex)) {\n      nextState[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY] = metadata.traversalIndex;\n    } else {\n      delete nextState[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY];\n    }\n  }\n\n  return Object.keys(nextState).length > 0 ? nextState : null;\n}\n\nexport function createExternalHistoryStatePreservingMetadata(\n  callerState: unknown,\n  currentHistoryState: unknown,\n): unknown {\n  const previousNextUrl = readHistoryStatePreviousNextUrl(currentHistoryState);\n  if (previousNextUrl === null) {\n    return callerState;\n  }\n\n  return createHistoryStateWithPreviousNextUrl(callerState, previousNextUrl);\n}\n\nexport function readHistoryStatePreviousNextUrl(state: unknown): string | null {\n  const value = cloneHistoryState(state)[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];\n  return typeof value === \"string\" ? value : null;\n}\n\nfunction isValidHistoryTraversalIndex(value: unknown): value is number {\n  return typeof value === \"number\" && Number.isSafeInteger(value) && value >= 0;\n}\n\nexport function readHistoryStateTraversalIndex(state: unknown): number | null {\n  const value = cloneHistoryState(state)[VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY];\n  return isValidHistoryTraversalIndex(value) ? value : null;\n}\n\nexport function resolveHistoryTraversalIntent(options: {\n  currentHistoryIndex: number | null;\n  historyState: unknown;\n}): HistoryTraversalIntent {\n  const targetHistoryIndex = readHistoryStateTraversalIndex(options.historyState);\n  let direction: TraverseDirection = \"unknown\";\n\n  if (options.currentHistoryIndex !== null && targetHistoryIndex !== null) {\n    if (targetHistoryIndex < options.currentHistoryIndex) {\n      direction = \"back\";\n    } else if (targetHistoryIndex > options.currentHistoryIndex) {\n      direction = \"forward\";\n    }\n  }\n\n  return {\n    direction,\n    historyState: options.historyState,\n    targetHistoryIndex,\n  };\n}\n"],"mappings":";AAEA,MAAM,6CAA6C;AACnD,MAAM,yCAAyC;AAY/C,SAAS,kBAAkB,OAAoC;CAC7D,IAAI,CAAC,SAAS,OAAO,UAAU,UAC7B,OAAO,EAAE;CAGX,MAAM,YAAgC,EAAE;CACxC,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,MAAM,EAC9C,UAAU,OAAO;CAEnB,OAAO;;AAGT,SAAgB,sCACd,OACA,iBAC2B;CAC3B,OAAO,yCAAyC,OAAO,EAAE,iBAAiB,CAAC;;AAG7E,SAAgB,yCACd,OACA,UAI2B;CAC3B,MAAM,YAAY,kBAAkB,MAAM;CAE1C,IAAI,SAAS,oBAAoB,MAC/B,OAAO,UAAU;MAEjB,UAAU,8CAA8C,SAAS;CAGnE,IAAI,SAAS,mBAAmB,KAAA,GAC9B,IAAI,6BAA6B,SAAS,eAAe,EACvD,UAAU,0CAA0C,SAAS;MAE7D,OAAO,UAAU;CAIrB,OAAO,OAAO,KAAK,UAAU,CAAC,SAAS,IAAI,YAAY;;AAGzD,SAAgB,6CACd,aACA,qBACS;CACT,MAAM,kBAAkB,gCAAgC,oBAAoB;CAC5E,IAAI,oBAAoB,MACtB,OAAO;CAGT,OAAO,sCAAsC,aAAa,gBAAgB;;AAG5E,SAAgB,gCAAgC,OAA+B;CAC7E,MAAM,QAAQ,kBAAkB,MAAM,CAAC;CACvC,OAAO,OAAO,UAAU,WAAW,QAAQ;;AAG7C,SAAS,6BAA6B,OAAiC;CACrE,OAAO,OAAO,UAAU,YAAY,OAAO,cAAc,MAAM,IAAI,SAAS;;AAG9E,SAAgB,+BAA+B,OAA+B;CAC5E,MAAM,QAAQ,kBAAkB,MAAM,CAAC;CACvC,OAAO,6BAA6B,MAAM,GAAG,QAAQ;;AAGvD,SAAgB,8BAA8B,SAGnB;CACzB,MAAM,qBAAqB,+BAA+B,QAAQ,aAAa;CAC/E,IAAI,YAA+B;CAEnC,IAAI,QAAQ,wBAAwB,QAAQ,uBAAuB;MAC7D,qBAAqB,QAAQ,qBAC/B,YAAY;OACP,IAAI,qBAAqB,QAAQ,qBACtC,YAAY;;CAIhB,OAAO;EACL;EACA,cAAc,QAAQ;EACtB;EACD"}

package/dist/server/app-middleware.d.ts

@@ -13,9 +13,22 @@ type ApplyAppMiddlewareOptions = {
   cleanPathname: string;
   context: AppMiddlewareContext;
   i18nConfig?: NextI18nConfig | null;
+  /**
+   * Whether the inbound request was a `_next/data` fetch. Captured from the
+   * raw incoming headers by the caller, because `x-nextjs-data` is in
+   * INTERNAL_HEADERS and is stripped before this function runs.
+   */
+  isDataRequest?: boolean;
   isProxy: boolean;
   module: MiddlewareModule;
   request: Request;
+  /**
+   * Forwarded to `executeMiddleware` so the NextRequest exposes a NextURL with
+   * the configured trailingSlash policy. This is what makes
+   * `NextResponse.redirect(request.nextUrl)` emit a Location that honours
+   * `trailingSlash`.
+   */
+  trailingSlash?: boolean;
 };
 type ApplyAppMiddlewareResult = {
   kind: "continue";

package/dist/server/app-middleware.js

@@ -116,10 +116,12 @@ async function applyAppMiddleware(options) {
 		const result = await executeMiddleware({
 			basePath: options.basePath,
 			i18nConfig: options.i18nConfig,
+			isDataRequest: options.isDataRequest,
 			isProxy: options.isProxy,
 			module: options.module,
 			normalizedPathname: cleanPathname,
-			request: middlewareRequest
+			request: middlewareRequest,
+			trailingSlash: options.trailingSlash
 		});
 		if (!result.continue) {
 			if (result.redirectUrl) return {

package/dist/server/app-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-middleware.js","names":[],"sources":["../../src/server/app-middleware.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport { isExternalUrl, proxyExternalRequest } from \"../config/config-matchers.js\";\nimport { applyMiddlewareRequestHeaders, setHeadersContext } from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { FLIGHT_HEADERS, VINEXT_MW_CTX_HEADER } from \"./headers.js\";\nimport { buildRequestHeadersFromMiddlewareResponse } from \"./middleware-request-headers.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { executeMiddleware, type MiddlewareModule } from \"./middleware-runtime.js\";\nimport { cloneRequestWithHeaders, processMiddlewareHeaders } from \"./request-pipeline.js\";\nimport { internalServerErrorResponse } from \"./http-error-responses.js\";\n\nexport type AppMiddlewareContext = {\n  headers: Headers | null;\n  requestHeaders: Headers | null;\n  status: number | null;\n};\n\nexport type ApplyAppMiddlewareOptions = {\n  basePath?: string;\n  cleanPathname: string;\n  context: AppMiddlewareContext;\n  i18nConfig?: NextI18nConfig | null;\n  isProxy: boolean;\n  module: MiddlewareModule;\n  request: Request;\n};\n\nexport type ApplyAppMiddlewareResult =\n  | {\n      kind: \"continue\";\n      cleanPathname: string;\n      search: string | null;\n    }\n  | {\n      kind: \"response\";\n      response: Response;\n    };\n\ntype ForwardedMiddlewareContext = {\n  h?: unknown;\n  r?: unknown;\n  s?: unknown;\n};\n\n// Re-exported from headers.ts for backward compatibility.\nexport { FLIGHT_HEADERS } from \"./headers.js\";\n\nconst FLIGHT_HEADER_SET = new Set(FLIGHT_HEADERS);\n\nfunction isForwardedMiddlewareContext(value: unknown): value is ForwardedMiddlewareContext {\n  return !!value && typeof value === \"object\";\n}\n\nfunction requestWithoutFlightHeaders(request: Request): Request {\n  let hasFlightHeader = false;\n  const headers = new Headers();\n\n  for (const [key, value] of request.headers) {\n    if (FLIGHT_HEADER_SET.has(key.toLowerCase())) {\n      hasFlightHeader = true;\n    } else {\n      headers.append(key, value);\n    }\n  }\n\n  if (!hasFlightHeader) return request;\n  const source = request.body ? request.clone() : request;\n  return cloneRequestWithHeaders(source, headers);\n}\n\nfunction appendForwardedHeader(headers: Headers, value: unknown): void {\n  if (!Array.isArray(value) || value.length < 2) return;\n  const key = value[0];\n  const headerValue = value[1];\n  if (typeof key === \"string\" && typeof headerValue === \"string\") {\n    headers.append(key, headerValue);\n  }\n}\n\nfunction responseFromMiddlewareRedirect(result: {\n  redirectStatus?: number;\n  redirectUrl?: string;\n  response?: Response;\n  responseHeaders?: Headers;\n}): Response {\n  if (result.response) return result.response;\n\n  const headers = new Headers(result.responseHeaders);\n  if (result.redirectUrl) {\n    headers.set(\"Location\", result.redirectUrl);\n  }\n  return new Response(null, {\n    status: result.redirectStatus ?? 307,\n    headers,\n  });\n}\n\nexport function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean {\n  const rewriteParsed = new URL(rewriteUrl, request.url);\n  return rewriteParsed.origin !== new URL(request.url).origin;\n}\n\nfunction requestWithMiddlewareRequestHeaders(\n  request: Request,\n  middlewareHeaders: Headers | null,\n): Request {\n  const nextHeaders = middlewareHeaders\n    ? buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders, {\n        preserveCredentialHeaders: true,\n      })\n    : null;\n  if (!nextHeaders) return request;\n\n  const init: RequestInit = {\n    method: request.method,\n    headers: nextHeaders,\n    body: request.body,\n  };\n  if (request.body) {\n    Object.defineProperty(init, \"duplex\", { value: \"half\", enumerable: true });\n  }\n\n  return new Request(request.url, init);\n}\n\nexport async function proxyExternalMiddlewareRewrite(\n  request: Request,\n  rewriteUrl: string,\n  context: AppMiddlewareContext,\n): Promise<Response> {\n  const proxyRequest = requestWithMiddlewareRequestHeaders(\n    request,\n    context.requestHeaders ?? context.headers,\n  );\n  setHeadersContext(null);\n  setNavigationContext(null);\n\n  const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);\n  const headers = new Headers(proxyResponse.headers);\n  processMiddlewareHeaders(headers);\n\n  if (!context.headers) {\n    return new Response(proxyResponse.body, {\n      status: proxyResponse.status,\n      statusText: proxyResponse.statusText,\n      headers,\n    });\n  }\n\n  const middlewareHeaders = new Headers(context.headers);\n  processMiddlewareHeaders(middlewareHeaders);\n  mergeMiddlewareResponseHeaders(headers, middlewareHeaders);\n  return new Response(proxyResponse.body, {\n    status: proxyResponse.status,\n    statusText: proxyResponse.statusText,\n    headers,\n  });\n}\n\nfunction applyForwardedMiddlewareContext(\n  request: Request,\n  context: AppMiddlewareContext,\n): { applied: boolean; rewriteUrl?: string } {\n  if (process.env.NODE_ENV === \"production\") {\n    return { applied: false };\n  }\n\n  const header = request.headers.get(VINEXT_MW_CTX_HEADER);\n  if (!header) return { applied: false };\n\n  try {\n    const data = JSON.parse(header);\n    if (!isForwardedMiddlewareContext(data)) return { applied: false };\n\n    if (Array.isArray(data.h) && data.h.length > 0) {\n      context.headers = new Headers();\n      for (const entry of data.h) {\n        appendForwardedHeader(context.headers, entry);\n      }\n    }\n    if (typeof data.s === \"number\") {\n      context.status = data.s;\n    }\n    if (typeof data.r === \"string\" && data.r.length > 0) {\n      return { applied: true, rewriteUrl: data.r };\n    }\n    return { applied: true };\n  } catch (e) {\n    console.error(\"[vinext] Failed to parse forwarded middleware context:\", e);\n    return { applied: false };\n  }\n}\n\nexport async function applyAppMiddleware(\n  options: ApplyAppMiddlewareOptions,\n): Promise<ApplyAppMiddlewareResult> {\n  const forwarded = applyForwardedMiddlewareContext(options.request, options.context);\n  const middlewareRequest = requestWithoutFlightHeaders(options.request);\n  let cleanPathname = options.cleanPathname;\n  let search: string | null = null;\n\n  if (forwarded.rewriteUrl) {\n    try {\n      if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, middlewareRequest)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            middlewareRequest,\n            forwarded.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(forwarded.rewriteUrl, middlewareRequest.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    } catch (e) {\n      console.error(\"[vinext] Failed to apply forwarded middleware rewrite:\", e);\n      forwarded.applied = false;\n    }\n  }\n\n  if (!forwarded.applied) {\n    const result = await executeMiddleware({\n      basePath: options.basePath,\n      i18nConfig: options.i18nConfig,\n      isProxy: options.isProxy,\n      module: options.module,\n      normalizedPathname: cleanPathname,\n      request: middlewareRequest,\n    });\n\n    if (!result.continue) {\n      if (result.redirectUrl) {\n        return { kind: \"response\", response: responseFromMiddlewareRedirect(result) };\n      }\n      if (result.response) {\n        return { kind: \"response\", response: result.response };\n      }\n      return { kind: \"response\", response: internalServerErrorResponse() };\n    }\n\n    if (result.responseHeaders) {\n      options.context.headers = new Headers(result.responseHeaders);\n    }\n\n    if (result.status !== undefined) {\n      options.context.status = result.status;\n    }\n\n    if (result.rewriteUrl) {\n      if (result.rewriteStatus !== undefined) {\n        options.context.status = result.rewriteStatus;\n      }\n      if (isExternalUrl(result.rewriteUrl)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            middlewareRequest,\n            result.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(result.rewriteUrl, middlewareRequest.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    }\n  }\n\n  if (options.context.headers) {\n    options.context.requestHeaders = new Headers(options.context.headers);\n    applyMiddlewareRequestHeaders(options.context.headers);\n    processMiddlewareHeaders(options.context.headers);\n  }\n\n  return { kind: \"continue\", cleanPathname, search };\n}\n"],"mappings":";;;;;;;;;;AA+CA,MAAM,oBAAoB,IAAI,IAAI,eAAe;AAEjD,SAAS,6BAA6B,OAAqD;CACzF,OAAO,CAAC,CAAC,SAAS,OAAO,UAAU;;AAGrC,SAAS,4BAA4B,SAA2B;CAC9D,IAAI,kBAAkB;CACtB,MAAM,UAAU,IAAI,SAAS;CAE7B,KAAK,MAAM,CAAC,KAAK,UAAU,QAAQ,SACjC,IAAI,kBAAkB,IAAI,IAAI,aAAa,CAAC,EAC1C,kBAAkB;MAElB,QAAQ,OAAO,KAAK,MAAM;CAI9B,IAAI,CAAC,iBAAiB,OAAO;CAE7B,OAAO,wBADQ,QAAQ,OAAO,QAAQ,OAAO,GAAG,SACT,QAAQ;;AAGjD,SAAS,sBAAsB,SAAkB,OAAsB;CACrE,IAAI,CAAC,MAAM,QAAQ,MAAM,IAAI,MAAM,SAAS,GAAG;CAC/C,MAAM,MAAM,MAAM;CAClB,MAAM,cAAc,MAAM;CAC1B,IAAI,OAAO,QAAQ,YAAY,OAAO,gBAAgB,UACpD,QAAQ,OAAO,KAAK,YAAY;;AAIpC,SAAS,+BAA+B,QAK3B;CACX,IAAI,OAAO,UAAU,OAAO,OAAO;CAEnC,MAAM,UAAU,IAAI,QAAQ,OAAO,gBAAgB;CACnD,IAAI,OAAO,aACT,QAAQ,IAAI,YAAY,OAAO,YAAY;CAE7C,OAAO,IAAI,SAAS,MAAM;EACxB,QAAQ,OAAO,kBAAkB;EACjC;EACD,CAAC;;AAGJ,SAAgB,4BAA4B,YAAoB,SAA2B;CAEzF,OAAO,IADmB,IAAI,YAAY,QAAQ,IAC9B,CAAC,WAAW,IAAI,IAAI,QAAQ,IAAI,CAAC;;AAGvD,SAAS,oCACP,SACA,mBACS;CACT,MAAM,cAAc,oBAChB,0CAA0C,QAAQ,SAAS,mBAAmB,EAC5E,2BAA2B,MAC5B,CAAC,GACF;CACJ,IAAI,CAAC,aAAa,OAAO;CAEzB,MAAM,OAAoB;EACxB,QAAQ,QAAQ;EAChB,SAAS;EACT,MAAM,QAAQ;EACf;CACD,IAAI,QAAQ,MACV,OAAO,eAAe,MAAM,UAAU;EAAE,OAAO;EAAQ,YAAY;EAAM,CAAC;CAG5E,OAAO,IAAI,QAAQ,QAAQ,KAAK,KAAK;;AAGvC,eAAsB,+BACpB,SACA,YACA,SACmB;CACnB,MAAM,eAAe,oCACnB,SACA,QAAQ,kBAAkB,QAAQ,QACnC;CACD,kBAAkB,KAAK;CACvB,qBAAqB,KAAK;CAE1B,MAAM,gBAAgB,MAAM,qBAAqB,cAAc,WAAW;CAC1E,MAAM,UAAU,IAAI,QAAQ,cAAc,QAAQ;CAClD,yBAAyB,QAAQ;CAEjC,IAAI,CAAC,QAAQ,SACX,OAAO,IAAI,SAAS,cAAc,MAAM;EACtC,QAAQ,cAAc;EACtB,YAAY,cAAc;EAC1B;EACD,CAAC;CAGJ,MAAM,oBAAoB,IAAI,QAAQ,QAAQ,QAAQ;CACtD,yBAAyB,kBAAkB;CAC3C,+BAA+B,SAAS,kBAAkB;CAC1D,OAAO,IAAI,SAAS,cAAc,MAAM;EACtC,QAAQ,cAAc;EACtB,YAAY,cAAc;EAC1B;EACD,CAAC;;AAGJ,SAAS,gCACP,SACA,SAC2C;CAC3C,IAAI,QAAQ,IAAI,aAAa,cAC3B,OAAO,EAAE,SAAS,OAAO;CAG3B,MAAM,SAAS,QAAQ,QAAQ,IAAI,qBAAqB;CACxD,IAAI,CAAC,QAAQ,OAAO,EAAE,SAAS,OAAO;CAEtC,IAAI;EACF,MAAM,OAAO,KAAK,MAAM,OAAO;EAC/B,IAAI,CAAC,6BAA6B,KAAK,EAAE,OAAO,EAAE,SAAS,OAAO;EAElE,IAAI,MAAM,QAAQ,KAAK,EAAE,IAAI,KAAK,EAAE,SAAS,GAAG;GAC9C,QAAQ,UAAU,IAAI,SAAS;GAC/B,KAAK,MAAM,SAAS,KAAK,GACvB,sBAAsB,QAAQ,SAAS,MAAM;;EAGjD,IAAI,OAAO,KAAK,MAAM,UACpB,QAAQ,SAAS,KAAK;EAExB,IAAI,OAAO,KAAK,MAAM,YAAY,KAAK,EAAE,SAAS,GAChD,OAAO;GAAE,SAAS;GAAM,YAAY,KAAK;GAAG;EAE9C,OAAO,EAAE,SAAS,MAAM;UACjB,GAAG;EACV,QAAQ,MAAM,0DAA0D,EAAE;EAC1E,OAAO,EAAE,SAAS,OAAO;;;AAI7B,eAAsB,mBACpB,SACmC;CACnC,MAAM,YAAY,gCAAgC,QAAQ,SAAS,QAAQ,QAAQ;CACnF,MAAM,oBAAoB,4BAA4B,QAAQ,QAAQ;CACtE,IAAI,gBAAgB,QAAQ;CAC5B,IAAI,SAAwB;CAE5B,IAAI,UAAU,YACZ,IAAI;EACF,IAAI,4BAA4B,UAAU,YAAY,kBAAkB,EACtE,OAAO;GACL,MAAM;GACN,UAAU,MAAM,+BACd,mBACA,UAAU,YACV,QAAQ,QACT;GACF;EAEH,MAAM,gBAAgB,IAAI,IAAI,UAAU,YAAY,kBAAkB,IAAI;EAC1E,gBAAgB,cAAc;EAC9B,SAAS,cAAc;UAChB,GAAG;EACV,QAAQ,MAAM,0DAA0D,EAAE;EAC1E,UAAU,UAAU;;CAIxB,IAAI,CAAC,UAAU,SAAS;EACtB,MAAM,SAAS,MAAM,kBAAkB;GACrC,UAAU,QAAQ;GAClB,YAAY,QAAQ;GACpB,SAAS,QAAQ;GACjB,QAAQ,QAAQ;GAChB,oBAAoB;GACpB,SAAS;GACV,CAAC;EAEF,IAAI,CAAC,OAAO,UAAU;GACpB,IAAI,OAAO,aACT,OAAO;IAAE,MAAM;IAAY,UAAU,+BAA+B,OAAO;IAAE;GAE/E,IAAI,OAAO,UACT,OAAO;IAAE,MAAM;IAAY,UAAU,OAAO;IAAU;GAExD,OAAO;IAAE,MAAM;IAAY,UAAU,6BAA6B;IAAE;;EAGtE,IAAI,OAAO,iBACT,QAAQ,QAAQ,UAAU,IAAI,QAAQ,OAAO,gBAAgB;EAG/D,IAAI,OAAO,WAAW,KAAA,GACpB,QAAQ,QAAQ,SAAS,OAAO;EAGlC,IAAI,OAAO,YAAY;GACrB,IAAI,OAAO,kBAAkB,KAAA,GAC3B,QAAQ,QAAQ,SAAS,OAAO;GAElC,IAAI,cAAc,OAAO,WAAW,EAClC,OAAO;IACL,MAAM;IACN,UAAU,MAAM,+BACd,mBACA,OAAO,YACP,QAAQ,QACT;IACF;GAEH,MAAM,gBAAgB,IAAI,IAAI,OAAO,YAAY,kBAAkB,IAAI;GACvE,gBAAgB,cAAc;GAC9B,SAAS,cAAc;;;CAI3B,IAAI,QAAQ,QAAQ,SAAS;EAC3B,QAAQ,QAAQ,iBAAiB,IAAI,QAAQ,QAAQ,QAAQ,QAAQ;EACrE,8BAA8B,QAAQ,QAAQ,QAAQ;EACtD,yBAAyB,QAAQ,QAAQ,QAAQ;;CAGnD,OAAO;EAAE,MAAM;EAAY;EAAe;EAAQ"}
+{"version":3,"file":"app-middleware.js","names":[],"sources":["../../src/server/app-middleware.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport { isExternalUrl, proxyExternalRequest } from \"../config/config-matchers.js\";\nimport { applyMiddlewareRequestHeaders, setHeadersContext } from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { FLIGHT_HEADERS, VINEXT_MW_CTX_HEADER } from \"./headers.js\";\nimport { buildRequestHeadersFromMiddlewareResponse } from \"./middleware-request-headers.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { executeMiddleware, type MiddlewareModule } from \"./middleware-runtime.js\";\nimport { cloneRequestWithHeaders, processMiddlewareHeaders } from \"./request-pipeline.js\";\nimport { internalServerErrorResponse } from \"./http-error-responses.js\";\n\nexport type AppMiddlewareContext = {\n  headers: Headers | null;\n  requestHeaders: Headers | null;\n  status: number | null;\n};\n\nexport type ApplyAppMiddlewareOptions = {\n  basePath?: string;\n  cleanPathname: string;\n  context: AppMiddlewareContext;\n  i18nConfig?: NextI18nConfig | null;\n  /**\n   * Whether the inbound request was a `_next/data` fetch. Captured from the\n   * raw incoming headers by the caller, because `x-nextjs-data` is in\n   * INTERNAL_HEADERS and is stripped before this function runs.\n   */\n  isDataRequest?: boolean;\n  isProxy: boolean;\n  module: MiddlewareModule;\n  request: Request;\n  /**\n   * Forwarded to `executeMiddleware` so the NextRequest exposes a NextURL with\n   * the configured trailingSlash policy. This is what makes\n   * `NextResponse.redirect(request.nextUrl)` emit a Location that honours\n   * `trailingSlash`.\n   */\n  trailingSlash?: boolean;\n};\n\nexport type ApplyAppMiddlewareResult =\n  | {\n      kind: \"continue\";\n      cleanPathname: string;\n      search: string | null;\n    }\n  | {\n      kind: \"response\";\n      response: Response;\n    };\n\ntype ForwardedMiddlewareContext = {\n  h?: unknown;\n  r?: unknown;\n  s?: unknown;\n};\n\n// Re-exported from headers.ts for backward compatibility.\nexport { FLIGHT_HEADERS } from \"./headers.js\";\n\nconst FLIGHT_HEADER_SET = new Set(FLIGHT_HEADERS);\n\nfunction isForwardedMiddlewareContext(value: unknown): value is ForwardedMiddlewareContext {\n  return !!value && typeof value === \"object\";\n}\n\nfunction requestWithoutFlightHeaders(request: Request): Request {\n  let hasFlightHeader = false;\n  const headers = new Headers();\n\n  for (const [key, value] of request.headers) {\n    if (FLIGHT_HEADER_SET.has(key.toLowerCase())) {\n      hasFlightHeader = true;\n    } else {\n      headers.append(key, value);\n    }\n  }\n\n  if (!hasFlightHeader) return request;\n  const source = request.body ? request.clone() : request;\n  return cloneRequestWithHeaders(source, headers);\n}\n\nfunction appendForwardedHeader(headers: Headers, value: unknown): void {\n  if (!Array.isArray(value) || value.length < 2) return;\n  const key = value[0];\n  const headerValue = value[1];\n  if (typeof key === \"string\" && typeof headerValue === \"string\") {\n    headers.append(key, headerValue);\n  }\n}\n\nfunction responseFromMiddlewareRedirect(result: {\n  redirectStatus?: number;\n  redirectUrl?: string;\n  response?: Response;\n  responseHeaders?: Headers;\n}): Response {\n  if (result.response) return result.response;\n\n  const headers = new Headers(result.responseHeaders);\n  if (result.redirectUrl) {\n    headers.set(\"Location\", result.redirectUrl);\n  }\n  return new Response(null, {\n    status: result.redirectStatus ?? 307,\n    headers,\n  });\n}\n\nexport function isExternalMiddlewareRewrite(rewriteUrl: string, request: Request): boolean {\n  const rewriteParsed = new URL(rewriteUrl, request.url);\n  return rewriteParsed.origin !== new URL(request.url).origin;\n}\n\nfunction requestWithMiddlewareRequestHeaders(\n  request: Request,\n  middlewareHeaders: Headers | null,\n): Request {\n  const nextHeaders = middlewareHeaders\n    ? buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders, {\n        preserveCredentialHeaders: true,\n      })\n    : null;\n  if (!nextHeaders) return request;\n\n  const init: RequestInit = {\n    method: request.method,\n    headers: nextHeaders,\n    body: request.body,\n  };\n  if (request.body) {\n    Object.defineProperty(init, \"duplex\", { value: \"half\", enumerable: true });\n  }\n\n  return new Request(request.url, init);\n}\n\nexport async function proxyExternalMiddlewareRewrite(\n  request: Request,\n  rewriteUrl: string,\n  context: AppMiddlewareContext,\n): Promise<Response> {\n  const proxyRequest = requestWithMiddlewareRequestHeaders(\n    request,\n    context.requestHeaders ?? context.headers,\n  );\n  setHeadersContext(null);\n  setNavigationContext(null);\n\n  const proxyResponse = await proxyExternalRequest(proxyRequest, rewriteUrl);\n  const headers = new Headers(proxyResponse.headers);\n  processMiddlewareHeaders(headers);\n\n  if (!context.headers) {\n    return new Response(proxyResponse.body, {\n      status: proxyResponse.status,\n      statusText: proxyResponse.statusText,\n      headers,\n    });\n  }\n\n  const middlewareHeaders = new Headers(context.headers);\n  processMiddlewareHeaders(middlewareHeaders);\n  mergeMiddlewareResponseHeaders(headers, middlewareHeaders);\n  return new Response(proxyResponse.body, {\n    status: proxyResponse.status,\n    statusText: proxyResponse.statusText,\n    headers,\n  });\n}\n\nfunction applyForwardedMiddlewareContext(\n  request: Request,\n  context: AppMiddlewareContext,\n): { applied: boolean; rewriteUrl?: string } {\n  if (process.env.NODE_ENV === \"production\") {\n    return { applied: false };\n  }\n\n  const header = request.headers.get(VINEXT_MW_CTX_HEADER);\n  if (!header) return { applied: false };\n\n  try {\n    const data = JSON.parse(header);\n    if (!isForwardedMiddlewareContext(data)) return { applied: false };\n\n    if (Array.isArray(data.h) && data.h.length > 0) {\n      context.headers = new Headers();\n      for (const entry of data.h) {\n        appendForwardedHeader(context.headers, entry);\n      }\n    }\n    if (typeof data.s === \"number\") {\n      context.status = data.s;\n    }\n    if (typeof data.r === \"string\" && data.r.length > 0) {\n      return { applied: true, rewriteUrl: data.r };\n    }\n    return { applied: true };\n  } catch (e) {\n    console.error(\"[vinext] Failed to parse forwarded middleware context:\", e);\n    return { applied: false };\n  }\n}\n\nexport async function applyAppMiddleware(\n  options: ApplyAppMiddlewareOptions,\n): Promise<ApplyAppMiddlewareResult> {\n  const forwarded = applyForwardedMiddlewareContext(options.request, options.context);\n  const middlewareRequest = requestWithoutFlightHeaders(options.request);\n  let cleanPathname = options.cleanPathname;\n  let search: string | null = null;\n\n  if (forwarded.rewriteUrl) {\n    try {\n      if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, middlewareRequest)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            middlewareRequest,\n            forwarded.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(forwarded.rewriteUrl, middlewareRequest.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    } catch (e) {\n      console.error(\"[vinext] Failed to apply forwarded middleware rewrite:\", e);\n      forwarded.applied = false;\n    }\n  }\n\n  if (!forwarded.applied) {\n    const result = await executeMiddleware({\n      basePath: options.basePath,\n      i18nConfig: options.i18nConfig,\n      isDataRequest: options.isDataRequest,\n      isProxy: options.isProxy,\n      module: options.module,\n      normalizedPathname: cleanPathname,\n      request: middlewareRequest,\n      trailingSlash: options.trailingSlash,\n    });\n\n    if (!result.continue) {\n      if (result.redirectUrl) {\n        return { kind: \"response\", response: responseFromMiddlewareRedirect(result) };\n      }\n      if (result.response) {\n        return { kind: \"response\", response: result.response };\n      }\n      return { kind: \"response\", response: internalServerErrorResponse() };\n    }\n\n    if (result.responseHeaders) {\n      options.context.headers = new Headers(result.responseHeaders);\n    }\n\n    if (result.status !== undefined) {\n      options.context.status = result.status;\n    }\n\n    if (result.rewriteUrl) {\n      if (result.rewriteStatus !== undefined) {\n        options.context.status = result.rewriteStatus;\n      }\n      if (isExternalUrl(result.rewriteUrl)) {\n        return {\n          kind: \"response\",\n          response: await proxyExternalMiddlewareRewrite(\n            middlewareRequest,\n            result.rewriteUrl,\n            options.context,\n          ),\n        };\n      }\n      const rewriteParsed = new URL(result.rewriteUrl, middlewareRequest.url);\n      cleanPathname = rewriteParsed.pathname;\n      search = rewriteParsed.search;\n    }\n  }\n\n  if (options.context.headers) {\n    options.context.requestHeaders = new Headers(options.context.headers);\n    applyMiddlewareRequestHeaders(options.context.headers);\n    processMiddlewareHeaders(options.context.headers);\n  }\n\n  return { kind: \"continue\", cleanPathname, search };\n}\n"],"mappings":"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"}

package/dist/server/app-optimistic-routing.d.ts

@@ -0,0 +1,54 @@
+import { RouteManifest, RouteManifestRoute } from "../routing/app-route-graph.js";
+import { AppElements } from "./app-elements-wire.js";
+//#region src/server/app-optimistic-routing.d.ts
+type OptimisticRouteMatch = {
+  params: Record<string, string | string[]>;
+  route: RouteManifestRoute;
+};
+type OptimisticRouteTemplate = {
+  elements: AppElements;
+  mountedSlotsHeader: string | null;
+  pageElementIds: readonly string[];
+  routeId: string;
+};
+type OptimisticNavigationPayload = {
+  elements: AppElements;
+  params: Record<string, string | string[]>;
+  template: OptimisticRouteTemplate;
+};
+declare function getOptimisticRouteTemplateKey(options: {
+  interceptionContext: string | null;
+  mountedSlotsHeader: string | null;
+  routeId: string;
+}): string;
+declare function getOptimisticPrefetchSourceKey(options: {
+  cacheKey: string;
+  interceptionContext: string | null;
+  mountedSlotsHeader: string | null;
+}): string;
+declare function matchOptimisticRouteManifestRoute(options: {
+  basePath: string;
+  href: string;
+  routeManifest: RouteManifest;
+}): OptimisticRouteMatch | null;
+declare function createOptimisticRouteTemplate(options: {
+  allowLoadingShell?: boolean;
+  basePath: string;
+  elements: AppElements;
+  href: string;
+  interceptionContext: string | null;
+  mountedSlotsHeader: string | null;
+  routeManifest: RouteManifest;
+}): OptimisticRouteTemplate | null;
+declare function createOptimisticRouteElements(template: OptimisticRouteTemplate): AppElements;
+declare function resolveOptimisticNavigationPayload(options: {
+  basePath: string;
+  href: string;
+  interceptionContext: string | null;
+  mountedSlotsHeader: string | null;
+  routeManifest: RouteManifest;
+  templates: ReadonlyMap<string, OptimisticRouteTemplate>;
+}): OptimisticNavigationPayload | null;
+//#endregion
+export { OptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationPayload };
+//# sourceMappingURL=app-optimistic-routing.d.ts.map