vinext 0.1.4 → 0.1.6

package/dist/server/app-rsc-route-matching.d.ts

@@ -31,6 +31,7 @@ type AppRscInterceptForMatching = {
   sourceMatchPattern?: string;
   sourcePageSegments?: readonly string[];
   interceptLayouts: readonly unknown[];
+  __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
   params: readonly string[];
@@ -45,6 +46,7 @@ type AppRscSiblingInterceptForMatching = {
   sourcePageSegments?: readonly string[];
   slotId: string | null;
   interceptLayouts: readonly unknown[];
+  __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
   params: readonly string[];
@@ -58,6 +60,11 @@ type AppRscRouteForMatching = {
 type AppRscInterceptMatch = AppRscInterceptLookupEntry & {
   matchedParams: AppRscRouteParams;
 };
+type AppRscInterceptLoadState = {
+  page: unknown;
+  pageLoading: Promise<unknown> | null;
+  interceptLayoutsLoading: Promise<readonly unknown[]> | null;
+};
 type AppRscInterceptLookupEntry = {
   sourceRouteIndex: number;
   slotKey: string;
@@ -67,8 +74,10 @@ type AppRscInterceptLookupEntry = {
   sourceMatchPatternParts: string[] | null;
   sourcePageSegments: readonly string[] | null;
   interceptLayouts: readonly unknown[];
+  __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
+  __loadState: AppRscInterceptLoadState;
   params: readonly string[];
   slotId: string | null;
 };

package/dist/server/app-rsc-route-matching.js

@@ -39,6 +39,7 @@ function createAppRscRouteMatcher(routes) {
 				const sourceParams = matchedSourceParams ?? createRouteParams();
 				return {
 					...entry,
+					page: entry.__loadState.page,
 					sourceRouteIndex: concreteSourceRouteIndex,
 					matchedParams: mergeMatchedParams(sourceParams, params)
 				};
@@ -84,8 +85,14 @@ function createInterceptLookup(routes) {
 					sourceMatchPatternParts,
 					sourcePageSegments: intercept.sourcePageSegments ?? null,
 					interceptLayouts: intercept.interceptLayouts,
+					__loadInterceptLayouts: intercept.__loadInterceptLayouts,
 					page: intercept.page,
 					__pageLoader: intercept.__pageLoader,
+					__loadState: {
+						page: intercept.page,
+						pageLoading: null,
+						interceptLayoutsLoading: null
+					},
 					params: intercept.params
 				});
 			}
@@ -103,8 +110,14 @@ function createInterceptLookup(routes) {
 				sourceMatchPatternParts,
 				sourcePageSegments: intercept.sourcePageSegments ?? null,
 				interceptLayouts: intercept.interceptLayouts,
+				__loadInterceptLayouts: intercept.__loadInterceptLayouts,
 				page: intercept.page,
 				__pageLoader: intercept.__pageLoader,
+				__loadState: {
+					page: intercept.page,
+					pageLoading: null,
+					interceptLayoutsLoading: null
+				},
 				params: intercept.params
 			});
 		}

package/dist/server/app-server-action-execution.d.ts

@@ -1,4 +1,4 @@
-import { ActionRevalidationKind } from "../shims/cache.js";
+import { ActionRevalidationKind } from "../shims/cache-request-state.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { FetchCacheMode } from "../shims/fetch-cache.js";
 import { HeadersAccessPhase } from "../shims/headers.js";

package/dist/server/app-server-action-execution.js

@@ -4,17 +4,18 @@ import { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS
 import { isExternalUrl } from "../config/config-matchers.js";
 import { internalServerErrorResponse, payloadTooLargeResponse } from "./http-error-responses.js";
 import { validateCsrfOrigin, validateServerActionPayload } from "./request-pipeline.js";
-import { headersContextFromRequest, setHeadersContext } from "../shims/headers.js";
-import { getAndClearActionRevalidationKind } from "../shims/cache.js";
 import { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI } from "./app-rsc-render-mode.js";
+import { headersContextFromRequest, setHeadersContext } from "../shims/headers.js";
+import { getAndClearActionRevalidationKind } from "../shims/cache-request-state.js";
 import { setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault } from "../shims/fetch-cache.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
-import { deferUntilStreamConsumed } from "./app-page-stream.js";
+import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
+import "./app-page-stream.js";
 import { buildAppPageTags } from "./implicit-tags.js";
 import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";

package/dist/server/app-ssr-entry.d.ts

@@ -1,4 +1,4 @@
-import { NavigationContext } from "../shims/navigation.js";
+import { NavigationContext } from "../shims/navigation-context-state.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppSsrRenderResult } from "./app-page-stream.js";
 import { ReactFormState } from "react-dom/client";

package/dist/server/app-ssr-entry.js

@@ -1,12 +1,13 @@
 import "./server-globals.js";
 import { notFoundResponse } from "./http-error-responses.js";
-import { isOpenRedirectShaped } from "./request-pipeline.js";
-import { isPprFallbackShellAbortError } from "../shims/ppr-fallback-shell.js";
+import { isOpenRedirectShaped } from "./open-redirect.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { isPprFallbackShellAbortError } from "../shims/ppr-fallback-shell.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
-import { ServerInsertedHTMLContext, appRouterInstance, clearServerInsertedHTML, getBfcacheIdMapContext, renderServerInsertedHTML, setNavigationContext, useServerInsertedHTML } from "../shims/navigation.js";
+import { ServerInsertedHTMLContext, clearServerInsertedHTML, getBfcacheIdMapContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "../shims/navigation-context-state.js";
+import "../shims/navigation-server.js";
 import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonStringify } from "./html.js";
@@ -17,12 +18,13 @@ import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
 import { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform } from "./app-ssr-stream.js";
 import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { runWithRootParamsScope } from "../shims/root-params.js";
-import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-browser-state.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
 import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
-import { deferUntilStreamConsumed } from "./app-page-stream.js";
+import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { renderBeforeInteractiveInlineScripts } from "./before-interactive-head.js";
 import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js";
+import { ssrAppRouterInstance } from "./app-ssr-router-instance.js";
 import { Fragment, createElement, use } from "react";
 import { renderToReadableStream, renderToStaticMarkup } from "react-dom/server.edge";
 import { createFromReadableStream } from "@vitejs/plugin-rsc/ssr";
@@ -192,8 +194,8 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					return BfcacheIdMapContext ? createElement(BfcacheIdMapContext.Provider, { value: createInitialBfcacheIdMap(elements) }, stateKeyTree) : stateKeyTree;
 				}
 				const flightRootElement = createElement(VinextFlightRoot);
-				const root = AppRouterContext ? createElement(AppRouterContext.Provider, { value: appRouterInstance }, flightRootElement) : flightRootElement;
-				const ssrTree = ServerInsertedHTMLContext ? createElement(ServerInsertedHTMLContext.Provider, { value: useServerInsertedHTML }, root) : root;
+				const root = AppRouterContext ? createElement(AppRouterContext.Provider, { value: ssrAppRouterInstance }, flightRootElement) : flightRootElement;
+				const ssrTree = ServerInsertedHTMLContext ? createElement(ServerInsertedHTMLContext.Provider, { value: registerServerInsertedHTMLCallback }, root) : root;
 				const beforeInteractiveInlineScripts = [];
 				const registerBeforeInteractiveInlineScript = (script) => {
 					beforeInteractiveInlineScripts.push(script);

package/dist/server/app-ssr-router-instance.d.ts

@@ -0,0 +1,6 @@
+import { AppRouterInstance } from "../shims/internal/app-router-context.js";
+
+//#region src/server/app-ssr-router-instance.d.ts
+declare const ssrAppRouterInstance: AppRouterInstance;
+//#endregion
+export { ssrAppRouterInstance };

package/dist/server/app-ssr-router-instance.js

@@ -0,0 +1,24 @@
+import { assertSafeNavigationUrl } from "../shims/url-safety.js";
+import "./app-bfcache-id.js";
+//#region src/server/app-ssr-router-instance.ts
+function validateNavigationHref(href) {
+	assertSafeNavigationUrl(href);
+}
+const ssrAppRouterInstance = {
+	bfcacheId: "0",
+	back() {},
+	forward() {},
+	refresh() {},
+	push(href, _options) {
+		validateNavigationHref(href);
+	},
+	replace(href, _options) {
+		validateNavigationHref(href);
+	},
+	prefetch(href) {
+		validateNavigationHref(href);
+	}
+};
+if (process.env.__NEXT_GESTURE_TRANSITION) ssrAppRouterInstance.experimental_gesturePush = validateNavigationHref;
+//#endregion
+export { ssrAppRouterInstance };

package/dist/server/app-ssr-stream.js

@@ -1,6 +1,6 @@
-import { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION } from "../client/navigation-runtime.js";
 import { createInlineScriptTag, escapeHtmlAttr, htmlTokenListContains, safeJsonStringify } from "./html.js";
 import { bytesToBase64, concatUint8Arrays } from "./app-rsc-embedded-chunks.js";
+import { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION } from "../client/navigation-runtime.js";
 //#region src/server/app-ssr-stream.ts
 const NAVIGATION_RUNTIME_REFERENCE = `self[Symbol.for(${safeJsonStringify(NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION)})]`;
 function navigationRuntimeRscBootstrapExpression() {

package/dist/server/artifact-compatibility.js

@@ -1,5 +1,5 @@
-import { fnv1a64 } from "../utils/hash.js";
 import { isUnknownRecord } from "../utils/record.js";
+import { fnv1a64 } from "../utils/hash.js";
 //#region src/server/artifact-compatibility.ts
 const ARTIFACT_COMPATIBILITY_SCHEMA_VERSION = 1;
 const APP_ELEMENTS_SCHEMA_VERSION = 1;

package/dist/server/client-reuse-manifest.js

@@ -1,5 +1,5 @@
-import { fnv1a64 } from "../utils/hash.js";
 import { isUnknownRecord } from "../utils/record.js";
+import { fnv1a64 } from "../utils/hash.js";
 import { parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { isNonNegativeSafeInteger } from "../utils/number.js";

package/dist/server/defer-until-stream-consumed.d.ts

@@ -0,0 +1,7 @@
+//#region src/server/defer-until-stream-consumed.d.ts
+/**
+ * Defers cleanup until the downstream consumer drains or cancels the stream.
+ */
+declare function deferUntilStreamConsumed(stream: ReadableStream<Uint8Array>, onFlush: () => void): ReadableStream<Uint8Array>;
+//#endregion
+export { deferUntilStreamConsumed };

package/dist/server/defer-until-stream-consumed.js

@@ -0,0 +1,34 @@
+//#region src/server/defer-until-stream-consumed.ts
+/**
+* Defers cleanup until the downstream consumer drains or cancels the stream.
+*/
+function deferUntilStreamConsumed(stream, onFlush) {
+	let called = false;
+	const once = () => {
+		if (!called) {
+			called = true;
+			onFlush();
+		}
+	};
+	const cleanup = new TransformStream({ flush() {
+		once();
+	} });
+	const reader = stream.pipeThrough(cleanup).getReader();
+	return new ReadableStream({
+		pull(controller) {
+			return reader.read().then(({ done, value }) => {
+				if (done) controller.close();
+				else controller.enqueue(value);
+			}, (error) => {
+				once();
+				controller.error(error);
+			});
+		},
+		cancel(reason) {
+			once();
+			return reader.cancel(reason);
+		}
+	});
+}
+//#endregion
+export { deferUntilStreamConsumed };

package/dist/server/dev-server.js

@@ -7,10 +7,10 @@ import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
 import { isUnknownRecord } from "../utils/record.js";
-import { _runWithCacheState } from "../shims/cache.js";
 import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL } from "./cache-control.js";
 import { buildMissIsrCacheControl, decideIsr } from "./isr-decision.js";
 import { PRERENDER_REVALIDATE_HEADER, buildPagesCacheValue, getRevalidateDuration, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, setRevalidateDuration, triggerBackgroundRegeneration } from "./isr-cache.js";
+import { _runWithCacheState } from "../shims/cache-request-state.js";
 import { ensureFetchPatch, runWithFetchCache } from "../shims/fetch-cache.js";
 import { runWithPrivateCache } from "../shims/cache-runtime.js";
 import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";

package/dist/server/headers.d.ts

@@ -23,6 +23,10 @@ declare const VINEXT_TIMING_HEADER = "x-vinext-timing";
 declare const VINEXT_PRERENDER_SECRET_HEADER = "x-vinext-prerender-secret";
 /** URL-encoded JSON route params for build-time prerender renders. */
 declare const VINEXT_PRERENDER_ROUTE_PARAMS_HEADER = "x-vinext-prerender-route-params";
+/** Internal endpoint used to evaluate App Router generateStaticParams exports. */
+declare const VINEXT_PRERENDER_STATIC_PARAMS_PATH = "/__vinext/prerender/static-params";
+/** Internal endpoint used to evaluate Pages Router getStaticPaths exports. */
+declare const VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH = "/__vinext/prerender/pages-static-paths";
 /** TPR (Tailored Per-Request) revalidation interval in seconds. */
 declare const VINEXT_REVALIDATE_HEADER = "x-vinext-revalidate";
 /** Marker on cached ISR entries indicating RSC payload (value "1"). */
@@ -107,4 +111,4 @@ declare const INTERNAL_HEADERS: string[];
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 declare const VINEXT_INTERNAL_HEADERS: string[];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };

package/dist/server/headers.js

@@ -23,6 +23,10 @@ const VINEXT_TIMING_HEADER = "x-vinext-timing";
 const VINEXT_PRERENDER_SECRET_HEADER = "x-vinext-prerender-secret";
 /** URL-encoded JSON route params for build-time prerender renders. */
 const VINEXT_PRERENDER_ROUTE_PARAMS_HEADER = "x-vinext-prerender-route-params";
+/** Internal endpoint used to evaluate App Router generateStaticParams exports. */
+const VINEXT_PRERENDER_STATIC_PARAMS_PATH = "/__vinext/prerender/static-params";
+/** Internal endpoint used to evaluate Pages Router getStaticPaths exports. */
+const VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH = "/__vinext/prerender/pages-static-paths";
 /** TPR (Tailored Per-Request) revalidation interval in seconds. */
 const VINEXT_REVALIDATE_HEADER = "x-vinext-revalidate";
 /** Marker on cached ISR entries indicating RSC payload (value "1"). */
@@ -129,4 +133,4 @@ const INTERNAL_HEADERS = [
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 const VINEXT_INTERNAL_HEADERS = [VINEXT_PRERENDER_ROUTE_PARAMS_HEADER];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };

package/dist/server/instrumentation.js

@@ -51,7 +51,7 @@ async function importModule(runner, id) {
 const INSTRUMENTATION_LOCATIONS = ["", "src/"];
 function findInstrumentationHookFile(root, basename, fileMatcher) {
 	for (const dir of INSTRUMENTATION_LOCATIONS) for (const ext of fileMatcher.dottedExtensions) {
-		const fullPath = path.join(root, dir, `${basename}${ext}`);
+		const fullPath = path.posix.join(root, dir, `${basename}${ext}`);
 		if (fs.existsSync(fullPath)) return fullPath;
 	}
 	return null;

package/dist/server/isr-cache.d.ts

@@ -1,5 +1,5 @@
 import { RenderObservation } from "./cache-proof.js";
-import { CacheHandlerValue, CachedAppPageValue, CachedPagesValue, IncrementalCacheValue } from "../shims/cache.js";
+import { CacheHandlerValue, CachedAppPageValue, CachedPagesValue, IncrementalCacheValue } from "../shims/cache-handler.js";
 import { OnRequestErrorContext } from "./instrumentation.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";

package/dist/server/isr-cache.js

@@ -1,7 +1,7 @@
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
-import { fnv1a64 } from "../utils/hash.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
+import { fnv1a64 } from "../utils/hash.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION, getRscRenderModeCacheVariant } from "./app-rsc-render-mode.js";
 import { normalizeAppPageInterceptionProofPathname } from "./app-page-render-identity.js";

package/dist/server/isr-decision.d.ts

@@ -1,4 +1,4 @@
-import { CacheControlMetadata } from "../shims/cache.js";
+import { CacheControlMetadata } from "../shims/cache-handler.js";
 import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL } from "./cache-control.js";
 
 //#region src/server/isr-decision.d.ts

package/dist/server/metadata-route-response.d.ts

@@ -2,15 +2,15 @@ import { MetadataFileRoute } from "./metadata-routes.js";
 
 //#region src/server/metadata-route-response.d.ts
 type AppPageParams = Record<string, string | string[]>;
-type MakeThenableParams = (params: AppPageParams) => unknown;
+type MetadataRouteMakeThenableParams = (params: AppPageParams) => unknown;
 type MetadataRuntimeRoute = MetadataFileRoute & {
   fileDataBase64?: string;
 };
 type MetadataRouteRequestOptions = {
   metadataRoutes: readonly MetadataRuntimeRoute[];
   cleanPathname: string;
-  makeThenableParams: MakeThenableParams;
+  makeThenableParams: MetadataRouteMakeThenableParams;
 };
 declare function handleMetadataRouteRequest(options: MetadataRouteRequestOptions): Promise<Response | null>;
 //#endregion
-export { handleMetadataRouteRequest };
+export { MetadataRouteMakeThenableParams, MetadataRuntimeRoute, handleMetadataRouteRequest };

package/dist/server/middleware-matcher.js

@@ -48,17 +48,19 @@ function stripLocalePrefix(pathname, i18nConfig) {
 	const segments = pathname.split("/");
 	const firstSegment = segments[1];
 	if (!firstSegment || !i18nConfig.locales.includes(firstSegment)) return null;
-	return removeTrailingSlash("/" + segments.slice(2).join("/"));
+	return "/" + segments.slice(2).join("/");
 }
 function matchPattern(pathname, pattern) {
-	let cached = _mwPatternCache.get(pattern);
+	const normalizedPattern = /[\\():*+?]/.test(pattern) ? pattern : removeTrailingSlash(pattern);
+	let cached = _mwPatternCache.get(normalizedPattern);
 	if (cached === void 0) {
-		cached = compileMatcherPattern(pattern);
-		_mwPatternCache.set(pattern, cached);
+		cached = compileMatcherPattern(normalizedPattern);
+		_mwPatternCache.set(normalizedPattern, cached);
 	}
 	if (cached === UNSAFE_MATCHER_PATTERN) return true;
-	if (cached === null) return pathname === pattern;
-	return cached.test(pathname);
+	if (cached === null) return removeTrailingSlash(pathname) === normalizedPattern;
+	if (cached.test(pathname)) return true;
+	return pathname.endsWith("/") && cached.test(removeTrailingSlash(pathname));
 }
 function extractConstraint(str, re) {
 	if (str[re.lastIndex] !== "(") return null;

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

@@ -56,6 +56,7 @@ type ExecuteMiddlewareOptions = {
 type RunGeneratedMiddlewareOptions = ExecuteMiddlewareOptions & {
   ctx?: ExecutionContextLike;
 };
+declare function createMiddlewareMissingExportError(filePath: string | undefined, isProxy: boolean): Error;
 declare function resolveMiddlewareModuleHandler(mod: MiddlewareModule, options: {
   filePath?: string;
   isProxy: boolean;
@@ -63,4 +64,4 @@ declare function resolveMiddlewareModuleHandler(mod: MiddlewareModule, options:
 declare function executeMiddleware(options: ExecuteMiddlewareOptions): Promise<MiddlewareResult>;
 declare function runGeneratedMiddleware(options: RunGeneratedMiddlewareOptions): Promise<MiddlewareResult>;
 //#endregion
-export { MiddlewareModule, MiddlewareResult, executeMiddleware, resolveMiddlewareModuleHandler, runGeneratedMiddleware };
+export { MiddlewareModule, MiddlewareResult, createMiddlewareMissingExportError, executeMiddleware, resolveMiddlewareModuleHandler, runGeneratedMiddleware };

package/dist/server/middleware-runtime.js

@@ -1,5 +1,5 @@
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
-import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
+import { addBasePathToPathname, hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import "./server-globals.js";
 import { getRequestExecutionContext, runWithExecutionContext } from "../shims/request-context.js";
 import { MIDDLEWARE_REWRITE_HEADER } from "./headers.js";
@@ -9,6 +9,7 @@ import { normalizePath } from "./normalize-path.js";
 import { matchesMiddleware } from "./middleware-matcher.js";
 import { badRequestResponse, internalServerErrorResponse } from "./http-error-responses.js";
 import { processMiddlewareHeaders } from "./request-pipeline.js";
+import path from "node:path";
 //#region src/server/middleware-runtime.ts
 function isMiddlewareHandler(value) {
 	return typeof value === "function";
@@ -16,19 +17,29 @@ function isMiddlewareHandler(value) {
 function isMiddlewareConfigExport(value) {
 	return !!value && typeof value === "object";
 }
-function middlewareFileLabel(isProxy) {
-	return isProxy ? "Proxy" : "Middleware";
-}
 function middlewareExpectedExport(isProxy) {
 	return isProxy ? "proxy" : "middleware";
 }
+function middlewareDisplayPath(filePath) {
+	const fileName = path.basename(filePath);
+	return path.basename(path.dirname(filePath)) === "src" ? `./src/${fileName}` : `./${fileName}`;
+}
+function createMiddlewareMissingExportError(filePath, isProxy) {
+	const expectedExport = middlewareExpectedExport(isProxy);
+	const displayPath = filePath ? middlewareDisplayPath(filePath) : void 0;
+	const resolvedPath = displayPath ? ` "${displayPath}"` : "";
+	const migrationReason = isProxy ? "- You are migrating from `middleware` to `proxy`, but haven't updated the exported function.\n" : "";
+	return /* @__PURE__ */ new Error(`The file${resolvedPath} must export a function, either as a default export or as a named "${expectedExport}" export.\nThis function is what Next.js runs for every request handled by this ${isProxy ? "proxy (previously called middleware)" : "middleware"}.\n\nWhy this happens:\n` + migrationReason + `- The file exists but doesn't export a function.
+- The export is not a function (e.g., an object or constant).
+- There's a syntax error preventing the export from being recognized.
+
+To fix it:
+- Ensure this file has either a default or "${expectedExport}" function export.\n\nLearn more: https://nextjs.org/docs/messages/middleware-to-proxy`);
+}
 function resolveMiddlewareModuleHandler(mod, options) {
 	const handler = options.isProxy ? mod.proxy ?? mod.default : mod.middleware ?? mod.default;
 	if (isMiddlewareHandler(handler)) return handler;
-	const fileLabel = middlewareFileLabel(options.isProxy);
-	const expectedExport = middlewareExpectedExport(options.isProxy);
-	const fileSuffix = options.filePath ? ` "${options.filePath}"` : "";
-	throw new Error(`The ${fileLabel} file${fileSuffix} must export a function named \`${expectedExport}\` or a \`default\` function.`);
+	throw createMiddlewareMissingExportError(options.filePath, options.isProxy);
 }
 function middlewareMatcher(mod) {
 	const config = mod.config;
@@ -130,7 +141,7 @@ async function executeMiddleware(options) {
 	const matchPathname = options.basePath ? stripBasePath(normalizedPathname, options.basePath) : normalizedPathname;
 	if (!matchesMiddleware(matchPathname, middlewareMatcher(options.module), options.request, options.i18nConfig)) return { continue: true };
 	const nextRequest = createNextRequest(options.request, normalizedPathname, options.i18nConfig, options.basePath, options.trailingSlash, hadBasePath);
-	const fetchEvent = new NextFetchEvent({ page: matchPathname });
+	const fetchEvent = new NextFetchEvent({ page: removeTrailingSlash(matchPathname) });
 	let response;
 	try {
 		response = await middlewareFn(nextRequest, fetchEvent);
@@ -226,4 +237,4 @@ async function runGeneratedMiddleware(options) {
 	return options.ctx ? runWithExecutionContext(options.ctx, run) : run();
 }
 //#endregion
-export { executeMiddleware, resolveMiddlewareModuleHandler, runGeneratedMiddleware };
+export { createMiddlewareMissingExportError, executeMiddleware, resolveMiddlewareModuleHandler, runGeneratedMiddleware };

package/dist/server/middleware.d.ts

@@ -28,7 +28,7 @@ declare function isProxyFile(filePath: string): boolean;
  */
 declare function resolveMiddlewareHandler(mod: MiddlewareModule, filePath: string): (request: NextRequest, event: NextFetchEvent) => Response | undefined | void | Promise<Response | undefined | void>;
 /**
- * Find the proxy or middleware file in the project root.
+ * Find the proxy or middleware file at the selected app/pages convention level.
  * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.
  * If middleware.ts is found, logs a deprecation warning.
  *
@@ -44,7 +44,7 @@ declare function resolveMiddlewareHandler(mod: MiddlewareModule, filePath: strin
  * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/index.ts
  *   (search for "MIDDLEWARE_FILENAME" + "file convention is deprecated")
  */
-declare function findMiddlewareFile(root: string, fileMatcher: ValidFileMatcher): string | null;
+declare function findMiddlewareFile(root: string, fileMatcher: ValidFileMatcher, conventionDir?: string): string | null;
 /**
  * Load and execute middleware for a given request.
  *

package/dist/server/middleware.js

@@ -13,7 +13,8 @@ import path from "node:path";
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts
 */
 function isProxyFile(filePath) {
-	return path.basename(filePath).replace(/\.\w+$/, "") === "proxy";
+	const base = path.basename(filePath);
+	return base === "proxy" || base.startsWith("proxy.");
 }
 /**
 * Resolve the middleware/proxy handler function from a module's exports.
@@ -32,9 +33,8 @@ function resolveMiddlewareHandler(mod, filePath) {
 		isProxy: isProxyFile(filePath)
 	});
 }
-const MIDDLEWARE_LOCATIONS = ["", "src/"];
 /**
-* Find the proxy or middleware file in the project root.
+* Find the proxy or middleware file at the selected app/pages convention level.
 * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.
 * If middleware.ts is found, logs a deprecation warning.
 *
@@ -50,18 +50,33 @@ const MIDDLEWARE_LOCATIONS = ["", "src/"];
 * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/index.ts
 *   (search for "MIDDLEWARE_FILENAME" + "file convention is deprecated")
 */
-function findMiddlewareFile(root, fileMatcher) {
-	for (const dir of MIDDLEWARE_LOCATIONS) for (const ext of fileMatcher.dottedExtensions) {
-		const fullPath = path.join(root, dir, `proxy${ext}`);
-		if (fs.existsSync(fullPath)) return fullPath;
+function findMiddlewareFile(root, fileMatcher, conventionDir = root) {
+	let proxyPath = null;
+	for (const ext of fileMatcher.dottedExtensions) {
+		const fullPath = path.join(conventionDir, `proxy${ext}`);
+		if (fs.existsSync(fullPath)) {
+			proxyPath = fullPath;
+			break;
+		}
 	}
-	for (const dir of MIDDLEWARE_LOCATIONS) for (const ext of fileMatcher.dottedExtensions) {
-		const fullPath = path.join(root, dir, `middleware${ext}`);
+	let middlewarePath = null;
+	for (const ext of fileMatcher.dottedExtensions) {
+		const fullPath = path.join(conventionDir, `middleware${ext}`);
 		if (fs.existsSync(fullPath)) {
-			console.warn("The \"middleware\" file convention is deprecated. Please use \"proxy\" instead.\n\n  To migrate automatically, run:\n  npx @next/codemod@canary middleware-to-proxy .\n\n  Learn more: https://nextjs.org/docs/messages/middleware-to-proxy");
-			return fullPath;
+			middlewarePath = fullPath;
+			break;
 		}
 	}
+	if (proxyPath && middlewarePath) {
+		const relativeProxyPath = `./${path.relative(root, proxyPath)}`;
+		const relativeMiddlewarePath = `./${path.relative(root, middlewarePath)}`;
+		throw new Error(`Both middleware file "${relativeMiddlewarePath}" and proxy file "${relativeProxyPath}" are detected. Please use "${relativeProxyPath}" only. Learn more: https://nextjs.org/docs/messages/middleware-to-proxy`);
+	}
+	if (proxyPath) return proxyPath;
+	if (middlewarePath) {
+		console.warn("The \"middleware\" file convention is deprecated. Please use \"proxy\" instead.\n\n  To migrate automatically, run:\n  npx @next/codemod@canary middleware-to-proxy .\n\n  Learn more: https://nextjs.org/docs/messages/middleware-to-proxy");
+		return middlewarePath;
+	}
 	return null;
 }
 function isMiddlewareModule(value) {

package/dist/server/open-redirect.d.ts

@@ -0,0 +1,12 @@
+//#region src/server/open-redirect.d.ts
+/**
+ * Returns true if a request pathname looks like a protocol-relative open
+ * redirect, in either literal or percent-encoded form.
+ *
+ * A pathname is considered "open redirect shaped" when its first segment,
+ * after decoding backslashes and encoded delimiters, would cause a browser
+ * to resolve a `Location` containing the pathname as protocol-relative.
+ */
+declare function isOpenRedirectShaped(rawPathname: string): boolean;
+//#endregion
+export { isOpenRedirectShaped };

package/dist/server/open-redirect.js

@@ -0,0 +1,21 @@
+//#region src/server/open-redirect.ts
+/**
+* Returns true if a request pathname looks like a protocol-relative open
+* redirect, in either literal or percent-encoded form.
+*
+* A pathname is considered "open redirect shaped" when its first segment,
+* after decoding backslashes and encoded delimiters, would cause a browser
+* to resolve a `Location` containing the pathname as protocol-relative.
+*/
+function isOpenRedirectShaped(rawPathname) {
+	if (!rawPathname.startsWith("/")) return false;
+	const afterSlash = rawPathname.slice(1);
+	if (afterSlash.startsWith("/") || afterSlash.startsWith("\\")) return true;
+	if (afterSlash.length >= 3 && afterSlash[0] === "%") {
+		const encoded = afterSlash.slice(0, 3).toLowerCase();
+		if (encoded === "%5c" || encoded === "%2f") return true;
+	}
+	return false;
+}
+//#endregion
+export { isOpenRedirectShaped };

package/dist/server/pages-page-data.d.ts

@@ -1,6 +1,6 @@
 import { Route } from "../routing/pages-router.js";
 import { VinextNextData } from "../client/vinext-next-data.js";
-import { CachedPagesValue } from "../shims/cache.js";
+import { CachedPagesValue } from "../shims/cache-handler.js";
 import { ISRCacheEntry } from "./isr-cache.js";
 import { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras } from "./pages-page-response.js";
 import { ReactNode } from "react";

package/dist/server/pages-page-response.d.ts

@@ -1,5 +1,5 @@
 import { VinextNextData } from "../client/vinext-next-data.js";
-import { CachedPagesValue } from "../shims/cache.js";
+import { CachedPagesValue } from "../shims/cache-handler.js";
 import { RenderPageEnhancers } from "./pages-document-initial-props.js";
 import { ComponentType, ReactNode } from "react";