vinext 1.0.0 → 1.0.1

package/dist/plugins/typeof-window.js

@@ -1,13 +1,15 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { booleanLiteralValue, collectBindingNames, forEachAstChild, isIdentifierNamed, stringLiteralValue } from "./ast-utils.js";
+import { DYNAMIC_IMPORT_PRESCAN, booleanLiteralValue, collectBindingNames, forEachAstChild, isIdentifierNamed, stringLiteralValue } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { stripViteModuleQuery } from "../utils/path.js";
 import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, hasAstBinding, isFunctionNode } from "./ast-scope.js";
-import { parseAst } from "vite";
+import { parseSync } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/typeof-window.ts
 const sourceEscapePattern = /\\(?:\r\n|[\n\r\u2028\u2029]|[^\n\r\u2028\u2029])/;
 const consumerEnvironmentConditionFilter = new RegExp(String.raw`\btypeof\s+window\b|${/\\(?:u(?:[\da-fA-F]{4}|\{[\da-fA-F]+\})|x[\da-fA-F]{2})/.source}|\bprocess\b[\s)]*(?:(?:\?\.|\.)\s*(?:browser\b|\/[/*])|(?:\?\.\s*)?\[[\s(]*(?:["']browser["']|["'][^"'\\\n\r]*\\|\/[/*])|\/[/*])`);
+const SCANNED_IMPORT_FOLD_PRESCAN = new RegExp(String.raw`${DYNAMIC_IMPORT_PRESCAN.source}|\bimport\s*\.`);
+const NON_IMPORTING_IMPORT_META_RE = /\s*\.\s*(?:url|env)\b/y;
 function createChildScope(node, parent) {
 	if (node.type !== "Program" && node.type !== "BlockStatement" && node.type !== "StaticBlock" && node.type !== "TSModuleBlock" && node.type !== "CatchClause" && node.type !== "ForStatement" && node.type !== "ForInStatement" && node.type !== "ForOfStatement" && node.type !== "ClassDeclaration" && node.type !== "ClassExpression") return null;
 	const scope = createAstScope(parent);
@@ -110,6 +112,27 @@ function evaluateConsumerCondition(node, replacements, scope) {
 		effects: []
 	};
 }
+/**
+* Cheap pre-parse gate for import-scan builds. Over-inclusive by design; the
+* parser's module record in {@link moduleRecordHasScannedFoldTargets} is exact.
+*/
+function mayFoldChangeScannedImports(code) {
+	return SCANNED_IMPORT_FOLD_PRESCAN.test(code);
+}
+/**
+* Whether folding may change a scanned import: any dynamic or phase import, or
+* an `import.meta` expression other than a `.url`/`.env` read. Reads the parser's native module record, so no
+* ESTree is materialized.
+*/
+function moduleRecordHasScannedFoldTargets(code, module, lang) {
+	if ((lang === "ts" || lang === "tsx") && DYNAMIC_IMPORT_PRESCAN.test(code)) return true;
+	if (module.dynamicImports.length > 0) return true;
+	for (const importMeta of module.importMetas) {
+		NON_IMPORTING_IMPORT_META_RE.lastIndex = importMeta.end;
+		if (!NON_IMPORTING_IMPORT_META_RE.test(code)) return true;
+	}
+	return false;
+}
 function replaceTypeofWindow(code, replacement, id = "file.js") {
 	return replaceConsumerEnvironmentConditions(code, { typeofWindow: replacement }, id);
 }
@@ -119,12 +142,13 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 	if (!mayContainTypeofWindow && !mayContainProcessBrowser) return null;
 	const extension = path.extname(stripViteModuleQuery(id));
 	const lang = extension === ".ts" || extension === ".mts" || extension === ".cts" ? "ts" : extension === ".tsx" ? "tsx" : extension === ".jsx" ? "jsx" : "js";
-	let ast;
-	try {
-		ast = parseAst(code, { lang });
-	} catch {
-		return null;
-	}
+	const parsed = parseSync(id, code, {
+		lang,
+		preserveParens: false
+	});
+	if (parsed.errors.length > 0) return null;
+	if (replacements.onlyIfScannedImportsChange && !moduleRecordHasScannedFoldTargets(code, parsed.module, lang)) return null;
+	const ast = parsed.program;
 	const output = new MagicString(code);
 	let changed = false;
 	function overwriteGap(start, end, content) {
@@ -236,4 +260,4 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 	return magicStringTransformResult(output);
 }
 //#endregion
-export { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, replaceConsumerEnvironmentConditions, replaceTypeofWindow };
+export { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions, replaceTypeofWindow };

package/dist/routing/app-route-graph.d.ts

@@ -364,7 +364,6 @@ export type RouteManifest = {
   graphVersion: GraphVersion;
   segmentGraph: StaticSegmentGraph;
 };
-export declare function createAppRouteGraphInterceptionId(slotId: string, sourcePattern: string, targetPattern: string): string;
 /**
  * Build the App Router route graph by scanning `appDir`.
  */

package/dist/routing/app-route-graph.js

@@ -3,6 +3,7 @@ import { findFileWithExts, scanWithExtensions } from "./file-matcher.js";
 import { decodeRouteSegment, isInvisibleSegment, sortRoutes } from "./utils.js";
 import { validateRoutePatterns } from "./route-validation.js";
 import { compareStrings } from "../utils/compare.js";
+import { createAppRouteGraphInterceptionId } from "./app-route-ids.js";
 import fs from "node:fs";
 import { createHash } from "node:crypto";
 //#region src/routing/app-route-graph.ts
@@ -37,9 +38,6 @@ const SIBLING_INTERCEPT_SLOT_NAME = "__vinext_sibling_intercept";
 function createAppRouteGraphSiblingInterceptSlotId(sourcePattern) {
 	return createAppRouteGraphSlotId(SIBLING_INTERCEPT_SLOT_NAME, sourcePattern);
 }
-function createAppRouteGraphInterceptionId(slotId, sourcePattern, targetPattern) {
-	return `interception:${slotId}:${sourcePattern}->${targetPattern}`;
-}
 function createAppRouteGraphRootBoundaryId(treePath) {
 	return `root-boundary:${treePath}`;
 }
@@ -1753,4 +1751,4 @@ function computeAppRouteStaticSiblings(allRoutes, matchedRoute) {
 	return Array.from(siblings);
 }
 //#endregion
-export { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, createAppRouteGraphInterceptionId, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };
+export { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };

package/dist/routing/app-route-ids.d.ts

@@ -0,0 +1,3 @@
+//#region src/routing/app-route-ids.d.ts
+export declare function createAppRouteGraphInterceptionId(slotId: string, sourcePattern: string, targetPattern: string): string;
+//#endregion

package/dist/routing/app-route-ids.js

@@ -0,0 +1,6 @@
+//#region src/routing/app-route-ids.ts
+function createAppRouteGraphInterceptionId(slotId, sourcePattern, targetPattern) {
+	return `interception:${slotId}:${sourcePattern}->${targetPattern}`;
+}
+//#endregion
+export { createAppRouteGraphInterceptionId };

package/dist/server/app-bfcache-id.d.ts

@@ -1,4 +1,5 @@
 //#region src/server/app-bfcache-id.d.ts
 export declare const INITIAL_BFCACHE_ID = "0";
 export declare const PUBLIC_INITIAL_BFCACHE_ID = "_b_0_";
+export declare function isBfcacheSegmentId(id: string): boolean;
 //#endregion

package/dist/server/app-bfcache-id.js

@@ -1,5 +1,11 @@
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
 //#region src/server/app-bfcache-id.ts
 const INITIAL_BFCACHE_ID = "0";
 const PUBLIC_INITIAL_BFCACHE_ID = "_b_0_";
+function isBfcacheSegmentId(id) {
+	const parsed = AppElementsWire.parseElementKey(id);
+	return parsed?.kind === "layout" || parsed?.kind === "page" || parsed?.kind === "slot" || parsed?.kind === "template";
+}
 //#endregion
-export { INITIAL_BFCACHE_ID, PUBLIC_INITIAL_BFCACHE_ID };
+export { INITIAL_BFCACHE_ID, PUBLIC_INITIAL_BFCACHE_ID, isBfcacheSegmentId };

package/dist/server/app-bfcache-identity.js

@@ -1,8 +1,7 @@
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { isNestedBfcacheSlotSegmentIdFor } from "./bfcache-identity.js";
-import "./app-bfcache-id.js";
-import { isBfcacheSegmentId } from "./app-history-state.js";
+import { isBfcacheSegmentId } from "./app-bfcache-id.js";
 //#region src/server/app-bfcache-identity.ts
 let nextBfcacheId = 0;
 function rememberBfcacheId(value) {

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

@@ -16,14 +16,14 @@ import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shi
 import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { BfcacheIdentityMapContext, ElementsContext, Slot, bindAppElementsRenderedSearch, setAppElementsRenderedSearch } from "../shims/slot.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, getVinextRscCompatibilityId } from "./app-rsc-cache-busting.js";
-import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
-import { isExternalHistoryState, readHistoryStateActiveRoutePaths, readHistoryStatePreviousNextUrl, resolveActiveRoutePaths } from "./app-history-state.js";
+import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
 import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
 import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
 import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
+import { isExternalHistoryState, readHistoryStateActiveRoutePaths, readHistoryStatePreviousNextUrl, resolveActiveRoutePaths } from "./app-history-state.js";
 import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
 import { stripRscCompletionMetadataResponse } from "./rsc-completion-metadata.js";
 import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
@@ -1407,6 +1407,8 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 							primary: Promise.resolve(rscPayload),
 							signal: navigationAbortHandle.signal,
 							supplemental
+						}).finally(() => {
+							navigationAbortHandle.release();
 						}).then(requireCompleteSupplementalRefresh);
 					}
 					if (IS_STATIC_EXPORT) {

package/dist/server/app-browser-hydration.d.ts

@@ -1,3 +1,4 @@
+import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 import { ReactFormState, hydrateRoot } from "react-dom/client";
 //#region src/server/app-browser-hydration.d.ts
 type HydrateRootOptions = NonNullable<Parameters<typeof hydrateRoot>[2]>;
@@ -9,7 +10,6 @@ type HydrateRootCaughtErrorHandler = NonNullable<HydrateRootOptions["onCaughtErr
 type HydrateRootUncaughtErrorHandler = NonNullable<HydrateRootOptions["onUncaughtError"]>;
 type HydrateRootRecoverableErrorHandler = NonNullable<HydrateRootOptions["onRecoverableError"]>;
 type StartTransition = (action: () => void) => void;
-export declare const RSC_FORM_STATE_GLOBAL = "__VINEXT_RSC_FORM_STATE__";
 type FormStateGlobal = {
   [RSC_FORM_STATE_GLOBAL]?: ReactFormState;
 };

package/dist/server/app-browser-hydration.js

@@ -1,5 +1,5 @@
+import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 //#region src/server/app-browser-hydration.ts
-const RSC_FORM_STATE_GLOBAL = "__VINEXT_RSC_FORM_STATE__";
 function consumeInitialFormState(global) {
 	const formState = global["__VINEXT_RSC_FORM_STATE__"] ?? null;
 	delete global[RSC_FORM_STATE_GLOBAL];
@@ -39,4 +39,4 @@ function resolveFetchedHydrationLocation(renderedPathAndSearch, location) {
 	};
 }
 //#endregion
-export { RSC_FORM_STATE_GLOBAL, consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition, resolveFetchedHydrationLocation };
+export { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition, resolveFetchedHydrationLocation };

package/dist/server/app-browser-navigation-controller.js

@@ -1,8 +1,8 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { claimAppRouterScrollIntentForCommit, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { resolveActiveRoutePaths } from "./app-history-state.js";
 import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
+import { resolveActiveRoutePaths } from "./app-history-state.js";
 import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit, createPendingNavigationCommitFromElements } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";

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

@@ -8,8 +8,8 @@ import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
 import { bindAppElementsRenderedSearch } from "../shims/slot.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { createCacheEntryReuseProof } from "./cache-proof.js";
-import { createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
+import { createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
 import { verifyOperationTokenForCommit } from "./operation-token.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";

package/dist/server/app-browser-stream.d.ts

@@ -1,4 +1,4 @@
-import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
+import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 import { RscEmbeddedChunk } from "./app-rsc-embedded-chunks.js";
 import { ReactFormState } from "react-dom/client";
 //#region src/server/app-browser-stream.d.ts

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

@@ -83,7 +83,6 @@ export declare function resolveActiveRoutePaths(slotBindings: readonly {
   state: string;
 }[]): string[];
 export declare function readHistoryStatePreviousNextUrl(state: unknown): string | null;
-export declare function isBfcacheSegmentId(id: string): boolean;
 export declare function readHistoryStateBfcacheIds(state: unknown): BfcacheIdMap | null;
 export declare function readHistoryStateBfcacheVersion(state: unknown): number | null;
 /**

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

@@ -1,5 +1,6 @@
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { isBfcacheSegmentId } from "./app-bfcache-id.js";
 import { isNonNegativeSafeInteger } from "../utils/number.js";
 //#region src/server/app-history-state.ts
 const VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY = "__vinext_previousNextUrl";
@@ -250,10 +251,6 @@ function readHistoryStatePreviousNextUrl(state) {
 	const value = readHistoryStateRecord(state)?.[VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY];
 	return typeof value === "string" ? value : null;
 }
-function isBfcacheSegmentId(id) {
-	const parsed = AppElementsWire.parseElementKey(id);
-	return parsed?.kind === "layout" || parsed?.kind === "page" || parsed?.kind === "slot" || parsed?.kind === "template";
-}
 function readHistoryStateBfcacheIds(state) {
 	const value = readHistoryStateRecord(state)?.[VINEXT_BFCACHE_IDS_HISTORY_STATE_KEY];
 	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
@@ -312,4 +309,4 @@ function resolveHistoryTraversalIntent(options) {
 	};
 }
 //#endregion
-export { HistoryStateSnapshotCache, RestorableClientStateController, clearHistoryStateTreeSnapshotId, createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotClaim, createHistoryStateWithTreeSnapshotId, isAppOwnedHistoryState, isBfcacheSegmentId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, isHistoryStateTreeSnapshotClaimed, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, readHistoryStateTreeSnapshotId, resolveActiveRoutePaths, resolveHistoryTraversalIntent };
+export { HistoryStateSnapshotCache, RestorableClientStateController, clearHistoryStateTreeSnapshotId, createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotClaim, createHistoryStateWithTreeSnapshotId, isAppOwnedHistoryState, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, isHistoryStateTreeSnapshotClaimed, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, readHistoryStateTreeSnapshotId, resolveActiveRoutePaths, resolveHistoryTraversalIntent };

package/dist/server/app-page-cache-render.js

@@ -1,4 +1,5 @@
-import { consumeDynamicUsage, consumeInvalidDynamicUsageError, isRenderDynamicLatched } from "../shims/headers.js";
+import { isRenderDynamicLatched } from "../shims/internal/headers-state.js";
+import { consumeDynamicUsage, consumeInvalidDynamicUsageError } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife } from "../shims/cache-request-state.js";
 import { getCollectedFetchTags } from "../shims/fetch-cache.js";
 import { readStreamAsText } from "../utils/text-stream.js";

package/dist/server/app-page-render.js

@@ -8,7 +8,8 @@ import { createArtifactCompatibilityEnvelope, createArtifactCompatibilityGraphVe
 import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
-import { isRenderDynamicLatched, peekDynamicUsage } from "../shims/headers.js";
+import { isRenderDynamicLatched } from "../shims/internal/headers-state.js";
+import { peekDynamicUsage } from "../shims/headers.js";
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { isBailoutToCSRError } from "../shims/navigation-errors.js";

package/dist/server/app-page-search-params-observation.js

@@ -1,4 +1,4 @@
-import { markDynamicUsage, markRenderRequestApiUsage, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "../shims/headers.js";
+import { markDynamicUsage, markRenderRequestApiUsage, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "../shims/internal/headers-state.js";
 import { searchParamsToRecord } from "../utils/query.js";
 import { makeThenableParams } from "../shims/thenable-params.js";
 //#region src/server/app-page-search-params-observation.ts

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

@@ -6,7 +6,7 @@ import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js
 import { markFrameworkLinkHeaders } from "./app-response-header-provenance.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest } from "./next-error-digest.js";
-import { isAppRenderAbortError } from "./app-rsc-errors.js";
+import { isAppRenderAbortError } from "./app-render-abort-error.js";
 //#region src/server/app-page-stream.ts
 function isAppSsrRenderResult(value) {
 	return typeof value === "object" && value !== null && "htmlStream" in value && "metadataReady" in value;

package/dist/server/app-page-tracing.js

@@ -1,7 +1,8 @@
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { recordFrameworkSpanError } from "./framework-tracer.js";
 import { frameworkTracer } from "./tracer.js";
-import { getDigestForWellKnownError, isAppRenderAbortError } from "./app-rsc-errors.js";
+import { isAppRenderAbortError } from "./app-render-abort-error.js";
+import { getDigestForWellKnownError } from "./app-rsc-errors.js";
 //#region src/server/app-page-tracing.ts
 function traceAppPageRender(routePattern, operation, callback) {
 	return frameworkTracer.trace(createAppPageRenderSpanDescriptor(routePattern, operation), callback);

package/dist/server/app-pages-bridge.js

@@ -39,11 +39,12 @@ async function renderPagesFallback(options, dependencies) {
 		if (appRouteMatch !== null) {
 			if (apiMatch === null || !pagesRouteHasPriorityOverAppRoute(apiMatch.route, appRouteMatch.route)) return null;
 		}
+		if (apiMatch !== null) beginRouteCacheability("pages-api", apiMatch.route.pattern);
 		const executionContext = getRequestExecutionContext();
 		const apiArgs = [
 			pagesRequest,
 			pagesUrl,
-			void 0,
+			executionContext ?? void 0,
 			executionContext?.trustedRevalidateOrigin ?? new URL(pagesRequest.url).origin,
 			executionContext?.hostRuntime ?? "node"
 		];
@@ -63,7 +64,7 @@ async function renderPagesFallback(options, dependencies) {
 		pagesDataRequest ? cloneRequestWithUrl(pagesRequest, pagesDataRequest.url) : pagesRequest,
 		pagesUrl,
 		{},
-		void 0,
+		getRequestExecutionContext() ?? void 0,
 		middlewareContext.requestHeaders
 	];
 	const pagesRes = isDataRequest ? await (initialResponseHeaders ? pagesEntry.renderPage(...renderArgs, { isDataReq: true }, initialResponseHeaders) : pagesEntry.renderPage(...renderArgs, { isDataReq: true })) : await (initialResponseHeaders ? pagesEntry.renderPage(...renderArgs, void 0, initialResponseHeaders) : pagesEntry.renderPage(...renderArgs));

package/dist/server/app-render-abort-error.d.ts

@@ -0,0 +1,3 @@
+//#region src/server/app-render-abort-error.d.ts
+export declare function isAppRenderAbortError(error: unknown): boolean;
+//#endregion

package/dist/server/app-render-abort-error.js

@@ -0,0 +1,8 @@
+//#region src/server/app-render-abort-error.ts
+function isAppRenderAbortError(error) {
+	if (!error || typeof error !== "object") return false;
+	const name = Reflect.get(error, "name");
+	return name === "AbortError" || name === "ResponseAborted";
+}
+//#endregion
+export { isAppRenderAbortError };

package/dist/server/app-request-stage-independent-entry.js

@@ -1,5 +1,4 @@
 import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
 import "./server-globals.js";
 import "./app-rsc-vary.js";
@@ -7,20 +6,19 @@ import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_EXPECTED_WORKER_VERSION_H
 import { badRequestResponse, notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { cloneRequestWithHeaders, filterInternalHeaders } from "./request-pipeline.js";
+import { getExplicitCdnCacheAdapter } from "../shims/cdn-cache-state.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
 import { registerLazyDataCacheHandler } from "../shims/cache-handler.js";
 import { getImageOptimizer, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { consumeFrameworkRequestRoute, traceFrameworkRequest } from "./request-tracing.js";
-import { createStaticAssetRequest, finalizeMissingStaticAssetResponse, resolveStaticAssetSignal } from "./worker-utils.js";
+import { createStaticAssetRequest, resolveStaticAssetSignal } from "./worker-utils.js";
 import { readTrustedPrerenderStateFromHeaders } from "./prerender-route-params.js";
 import { createWorkerRevalidationContext } from "./worker-revalidation-context.js";
 import { createWorkerPrerenderDiscoveryContext, createWorkerPrerenderReadinessResponse } from "./worker-prerender-discovery.js";
-import requestRscHandler, { __assetPrefix, __basePath, __ensureHybridPagesApplication, __ensureInstrumentation, __imageAllowedWidths, __imageConfig, __prerenderSecret } from "virtual:vinext-app-request-entry";
+import requestRscHandler, { __ensureHybridPagesApplication, __ensureInstrumentation, __imageAllowedWidths, __imageConfig, __prerenderSecret } from "virtual:vinext-app-request-entry";
 import * as configuredCdnCacheAdapters from "virtual:vinext-cdn-cache-adapter";
 import { registerConfiguredImageOptimizer } from "virtual:vinext-image-adapters";
 //#region src/server/app-request-stage-independent-entry.ts
-const workerBasePath = typeof __basePath === "string" ? __basePath : "";
-const workerAssetPathPrefix = assetPrefixPathname(typeof __assetPrefix === "string" ? __assetPrefix : "");
 function handleRequestStage(request, env, ctx, dispatchResponseStage) {
 	const originalRequest = request;
 	const handleStage = async () => {
@@ -40,6 +38,7 @@ function handleRequestStage(request, env, ctx, dispatchResponseStage) {
 async function handleRequest(request, env, platformCtx, dispatchResponseStage, assets) {
 	let ctx = platformCtx?.trustedRevalidateOrigin ? platformCtx : createWorkerRevalidationContext(platformCtx, (internalRequest, internalCtx) => handleRequest(internalRequest, env, internalCtx, dispatchResponseStage, assets), "node");
 	configuredCdnCacheAdapters.registerConfiguredCacheAdapters(env);
+	assets ??= getExplicitCdnCacheAdapter()?.assets;
 	if (configuredCdnCacheAdapters.hasConfiguredDataCache) registerLazyDataCacheHandler(async () => {
 		(await import("virtual:vinext-cache-adapters")).registerConfiguredCacheAdapters(env);
 	});
@@ -78,7 +77,6 @@ async function handleRequest(request, env, platformCtx, dispatchResponseStage, a
 	} catch {
 		return badRequestResponse();
 	}
-	const missingBuildAsset = isNextStaticPath(url.pathname, workerBasePath, workerAssetPathPrefix);
 	const trustedPrerenderState = readTrustedPrerenderStateFromHeaders(request.headers, __prerenderSecret);
 	const filteredHeaders = ctx.isInternalPagesRevalidation ? new Headers(request.headers) : filterInternalHeaders(request.headers);
 	filteredHeaders.delete(VINEXT_PRERENDER_SECRET_HEADER);
@@ -100,7 +98,6 @@ async function handleRequest(request, env, platformCtx, dispatchResponseStage, a
 		const assetResponse = await resolveStaticAssetSignal(response, { fetchAsset: (path) => Promise.resolve(assets.fetch(createStaticAssetRequest(path, request))) });
 		if (assetResponse) response = assetResponse;
 	}
-	response = finalizeMissingStaticAssetResponse(response, missingBuildAsset);
 	if (probeMode && probeRoute && !responseStageDispatched) {
 		const { finalizeRequestStageCacheabilityProbe } = await import("./cacheability-request.js");
 		response = finalizeRequestStageCacheabilityProbe(response, {

package/dist/server/app-route-handler-cache.d.ts

@@ -1,6 +1,7 @@
 import { NextI18nConfig } from "../config/next-config.js";
 import { ISRCacheEntry } from "./isr-cache.js";
-import { HeadersAccessPhase } from "../shims/headers.js";
+import { HeadersAccessPhase } from "../shims/internal/headers-state.js";
+import "../shims/headers.js";
 import { RouteHandlerMiddlewareContext } from "./app-route-handler-response.js";
 import { AppRouteDebugLogger, AppRouteDynamicUsageFn, AppRouteHandlerFunction, AppRouteParams, MarkAppRouteDynamicUsageFn, RouteHandlerCacheSetter } from "./app-route-handler-execution.js";
 //#region src/server/app-route-handler-cache.d.ts

package/dist/server/app-route-handler-cache.js

@@ -1,9 +1,9 @@
-import { isrCacheControl } from "./isr-cache.js";
+import { isrCacheControl, resolveRouteExpireSeconds } from "./isr-cache.js";
 import { makeThenableParams } from "../shims/thenable-params.js";
 import { applyRouteHandlerMiddlewareContext, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, buildRouteHandlerCachedResponse } from "./app-route-handler-response.js";
 import { markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
 import { resolveAppRouteHandlerSpecialError } from "./app-route-handler-policy.js";
-import { runAppRouteHandler, traceAppRouteHandlerExecution } from "./app-route-handler-execution.js";
+import { completeAppRouteHandlerResponse, runAppRouteHandler, traceAppRouteHandlerExecution } from "./app-route-handler-execution.js";
 //#region src/server/app-route-handler-cache.ts
 const EMPTY_PARAMS = Object.freeze({});
 function getCachedAppRouteValue(entry) {
@@ -64,17 +64,21 @@ async function readAppRouteHandlerCacheResponse(options) {
 					options.setNavigationContext(null);
 				}
 				if ("specialError" in tracedResult) return;
-				const { dynamicUsedInHandler, response } = tracedResult.handlerResult;
+				const { dynamicUsedInHandler, response, didAccessDynamicRequest } = tracedResult.handlerResult;
 				assertSupportedAppRouteHandlerResponse(response);
-				if (dynamicUsedInHandler) {
-					markKnownDynamicAppRoute(options.routePattern);
+				const completed = await completeAppRouteHandlerResponse(response);
+				const lateDynamicUsage = options.consumeDynamicUsage();
+				const becameDynamic = dynamicUsedInHandler || lateDynamicUsage || didAccessDynamicRequest();
+				if (!completed.completed || becameDynamic || response.headers.has("set-cookie")) {
+					completed.response.body?.cancel().catch(() => {});
+					if (becameDynamic) markKnownDynamicAppRoute(options.routePattern);
 					options.isrDebug?.("route regen skipped (dynamic usage)", options.cleanPathname);
 					return;
 				}
 				const routeTags = options.buildPageCacheTags(options.cleanPathname, options.getCollectedFetchTags());
-				const routeCacheValue = await buildAppRouteCacheValue(response);
+				const routeCacheValue = await buildAppRouteCacheValue(completed.response, response.headers.get("Cache-Control") ?? void 0);
 				await options.isrSet(routeKey, routeCacheValue, {
-					cacheControl: isrCacheControl(options.revalidateSeconds, { expireSeconds: options.expireSeconds }),
+					cacheControl: isrCacheControl(options.revalidateSeconds === Infinity ? false : options.revalidateSeconds, { expireSeconds: resolveRouteExpireSeconds(options.revalidateSeconds, options.expireSeconds) }),
 					tags: routeTags
 				});
 				options.isrDebug?.("route regen complete", routeKey);

package/dist/server/app-route-handler-dispatch.js

@@ -5,7 +5,8 @@ import { reportRequestError } from "./instrumentation.js";
 import { beginRouteCacheability, getRouteCacheabilityDynamicReason } from "../shims/cacheability-classification.js";
 import { applyCdnResponseBuildIdentityHeaders } from "./cache-control.js";
 import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
-import { consumeDynamicUsage, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, isDraftModeRequest, markDynamicUsage, setHeadersAccessPhase } from "../shims/headers.js";
+import { markDynamicUsage } from "../shims/internal/headers-state.js";
+import { consumeDynamicUsage, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, isDraftModeRequest, setHeadersAccessPhase } from "../shims/headers.js";
 import { _drainPendingRevalidations } from "../shims/cache-request-state.js";
 import { ensureFetchPatch, getCollectedFetchTags, setCurrentFetchCacheMode, setCurrentFetchRevalidate, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault } from "../shims/fetch-cache.js";
 import { setNavigationContext } from "../shims/navigation-context-state.js";
@@ -101,11 +102,12 @@ async function dispatchAppRouteHandlerImpl(options) {
 		method,
 		revalidateSeconds
 	});
-	const revalidateReason = isOnDemandRevalidateRequest(options.request.headers.get("x-prerender-revalidate")) ? "on-demand" : shouldReadRouteCache ? "stale" : void 0;
+	const revalidateReason = isOnDemandRevalidateRequest(options.request.headers.get("x-prerender-revalidate")) ? "on-demand" : shouldReadRouteCache && revalidateSeconds !== Infinity ? "stale" : void 0;
 	const fetchCacheMode = resolveAppRouteHandlerFetchCacheMode(handler);
 	setCurrentFetchCacheMode(fetchCacheMode);
 	setCurrentFetchRevalidate(configuredRevalidateSeconds);
 	setCurrentForceDynamicFetchDefault(handler.dynamic === "force-dynamic");
+	let isRevalidation = false;
 	if (shouldReadRouteCache && resolvedHandlerFn) {
 		const cachedRouteResponse = await readAppRouteHandlerCacheResponse({
 			basePath: options.basePath,
@@ -123,7 +125,11 @@ async function dispatchAppRouteHandlerImpl(options) {
 			isAutoHead,
 			appendResponseLink,
 			isrDebug: options.isrDebug,
-			isrGet: options.isrGet,
+			async isrGet(key) {
+				const entry = await options.isrGet(key);
+				isRevalidation = entry?.value.value?.kind === "APP_ROUTE";
+				return entry;
+			},
 			isrRouteKey: options.isrRouteKey,
 			isrSet: options.isrSet,
 			markDynamicUsage,
@@ -159,6 +165,7 @@ async function dispatchAppRouteHandlerImpl(options) {
 	}
 	if (resolvedHandlerFn) {
 		const response = await executeAppRouteHandler({
+			isRevalidation,
 			basePath: options.basePath,
 			bypassSharedCache: options.bypassSharedCache,
 			buildPageCacheTags(pathname, extraTags) {

package/dist/server/app-route-handler-execution.d.ts

@@ -4,7 +4,8 @@ import { NextRequest } from "../shims/server.js";
 import { FrameworkSpan } from "./framework-tracer.js";
 import { CachedRouteValue } from "../shims/cache-handler.js";
 import { IsrWritePolicy } from "./isr-cache.js";
-import { HeadersAccessPhase } from "../shims/headers.js";
+import { HeadersAccessPhase } from "../shims/internal/headers-state.js";
+import "../shims/headers.js";
 import { RouteHandlerMiddlewareContext } from "./app-route-handler-response.js";
 import { AppRouteHandlerModule } from "./app-route-handler-policy.js";
 //#region src/server/app-route-handler-execution.d.ts
@@ -62,6 +63,11 @@ type RunAppRouteHandlerResult = {
   dynamicUsedInHandler: boolean;
   response: Response;
 };
+type CompletedAppRouteHandlerResponse = {
+  completed: boolean;
+  response: Response;
+};
+export declare function completeAppRouteHandlerResponse(response: Response): Promise<CompletedAppRouteHandlerResponse>;
 export declare function applyDraftModeCachePolicy(response: Response, isDraftMode: boolean): Response;
 type ExecuteAppRouteHandlerOptions = {
   buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];
@@ -78,6 +84,8 @@ type ExecuteAppRouteHandlerOptions = {
   initialDraftModeCookie?: string | null;
   isDraftMode?: boolean;
   isProduction: boolean;
+  /** An existing entry may require foreground regeneration after hard expiry. */
+  isRevalidation?: boolean;
   isrDebug?: AppRouteDebugLogger;
   isrRouteKey: (pathname: string) => string;
   isrSet: RouteHandlerCacheSetter;