vinext 0.2.1 → 1.0.0-beta.0

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

@@ -2,7 +2,7 @@ import { createRequestContext, runWithRequestContext } from "../shims/unified-re
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import "../utils/protocol-headers.js";
 import { AppElementsWire } from "./app-elements-wire.js";
-import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
+import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL } from "./app-rsc-render-mode.js";
 import "./app-elements.js";
 import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersContext, isDraftModeRequest, markDynamicUsage, peekDynamicUsage, peekRenderRequestApiUsage, setHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife, _peekRequestScopedCacheLife } from "../shims/cache-request-state.js";
@@ -167,7 +167,7 @@ async function dispatchAppPageInner(options) {
 	const hasRequestSearchParams = !shouldUseEmptySearchParams && hasSearchParams(options.searchParams);
 	const pageSearchParams = shouldUseEmptySearchParams ? new URLSearchParams() : options.searchParams;
 	const layoutParamAccess = createAppLayoutParamAccessTracker();
-	const hasActiveLoadingBoundary = shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation") ? false : Boolean(route.loading?.default);
+	const hasActiveLoadingBoundary = Boolean(route.loading?.default);
 	setCurrentFetchSoftTags(buildAppPageTags(options.cleanPathname, [], route.routeSegments));
 	setCurrentFetchCacheMode(options.fetchCache ?? null);
 	setCurrentForceDynamicFetchDefault(isForceDynamic);
@@ -401,7 +401,7 @@ async function dispatchAppPageInner(options) {
 			});
 		},
 		async probePageSpecialError() {
-			if (!shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation") && route.loading?.default) return null;
+			if (route.loading?.default) return null;
 			return resolveAppPageSpecialError(await probeAppPageThrownError({
 				probePage: () => options.probePage(pageSearchParams),
 				runWithSuppressedHookWarning(probe) {

package/dist/server/app-page-render.d.ts

@@ -1,4 +1,3 @@
-import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { ClientReuseManifestParseResult, ClientReuseManifestSkipDisposition } from "./client-reuse-manifest.js";
 import { AppOutgoingElements } from "./app-elements-wire.js";
 import { NavigationContext } from "../shims/navigation-context-state.js";
@@ -7,6 +6,7 @@ import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
+import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageRenderObservationState } from "./app-page-render-observation.js";
 import { ReactNode } from "react";

package/dist/server/app-page-route-wiring.js

@@ -1,6 +1,6 @@
 import { createAppRenderDependency, registerAppElementRenderDependencies, renderAfterAppDependencies, renderWithAppDependencyBarrier } from "./app-render-dependency.js";
 import { APP_STATIC_SIBLINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
-import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
+import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "./app-rsc-render-mode.js";
 import { APP_PREFETCH_LOADING_SHELL_MARKER_KEY } from "./app-elements.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { ErrorBoundary, ForbiddenBoundary, GlobalErrorBoundary, NotFoundBoundary, RedirectBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
@@ -353,7 +353,7 @@ function buildAppPageElements(options) {
 			children: slotElement
 		});
 		const slotLoadingComponent = getDefaultExport(slot.loading);
-		if (slotLoadingComponent && !shouldSuppressLoadingBoundaries(renderMode)) slotElement = /* @__PURE__ */ jsx(Suspense, {
+		if (slotLoadingComponent) slotElement = /* @__PURE__ */ jsx(Suspense, {
 			fallback: /* @__PURE__ */ jsx(slotLoadingComponent, {}),
 			children: slotElement
 		}, slotResetKey);
@@ -374,7 +374,7 @@ function buildAppPageElements(options) {
 	else routeChildren = /* @__PURE__ */ jsx(routeLoadingComponent, {});
 	else {
 		routeChildren = /* @__PURE__ */ jsx(RedirectBoundary, { children: routeChildren });
-		if (routeLoadingComponent && !shouldSuppressLoadingBoundaries(renderMode)) routeChildren = /* @__PURE__ */ jsx(Suspense, {
+		if (routeLoadingComponent) routeChildren = /* @__PURE__ */ jsx(Suspense, {
 			fallback: /* @__PURE__ */ jsx(routeLoadingComponent, {}),
 			children: routeChildren
 		}, routeResetKey);

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

@@ -1,7 +1,7 @@
 import { NextI18nConfig } from "../config/next-config.js";
-import { CachedRouteValue } from "../shims/cache-handler.js";
 import { ExecutionContextLike } from "../shims/request-context.js";
 import { NextRequest } from "../shims/server.js";
+import { CachedRouteValue } from "../shims/cache-handler.js";
 import { HeadersAccessPhase } from "../shims/headers.js";
 import { RouteHandlerMiddlewareContext } from "./app-route-handler-response.js";
 import { AppRouteHandlerModule } from "./app-route-handler-policy.js";

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

@@ -1,6 +1,6 @@
 import { isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
-import { runWithRootParamsUsage } from "../shims/root-params.js";
 import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
+import { runWithRootParamsUsage } from "../shims/root-params.js";
 import { applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss } from "./app-route-handler-response.js";
 import { createTrackedAppRouteRequest, markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
 import { createStaticGenerationHeadersContext, getAppRouteStaticGenerationErrorMessage } from "./app-static-generation.js";

package/dist/server/app-rsc-cache-busting.js

@@ -14,7 +14,6 @@ const VINEXT_RSC_COMPATIBILITY_ID_HEADER = "X-Vinext-RSC-Compatibility-Id";
 const VINEXT_RSC_CONTENT_TYPE = "text/x-component";
 const VINEXT_RSC_VARY_HEADER = [
 	"RSC",
-	"Accept",
 	NEXT_ROUTER_STATE_TREE_HEADER,
 	NEXT_ROUTER_PREFETCH_HEADER,
 	NEXT_ROUTER_SEGMENT_PREFETCH_HEADER,

package/dist/server/app-rsc-handler.js

@@ -19,10 +19,10 @@ import "./app-page-response.js";
 import { parseNextHttpErrorDigest } from "./next-error-digest.js";
 import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import { getRenderedConcreteUrlPathsForRoute } from "./pregenerated-concrete-paths.js";
-import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
+import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { createRouteTreePrefetchResponse, isRouteTreePrefetchRequest } from "./app-route-tree-prefetch.js";
 import { flattenErrorCauses } from "../utils/error-cause.js";
 import { finalizeAppRscResponse } from "./app-rsc-response-finalizer.js";

package/dist/server/app-rsc-render-mode.d.ts

@@ -1,12 +1,9 @@
 //#region src/server/app-rsc-render-mode.d.ts
-type AppRscRenderMode = "navigation" | "prefetch-dynamic-shell" | "prefetch-loading-shell" | "refresh-preserve-ui" | "action-rerender-preserve-ui";
+type AppRscRenderMode = "navigation" | "prefetch-dynamic-shell" | "prefetch-loading-shell";
 declare const APP_RSC_RENDER_MODE_NAVIGATION = "navigation";
 declare const APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL = "prefetch-dynamic-shell";
 declare const APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL = "prefetch-loading-shell";
-declare const APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI = "refresh-preserve-ui";
-declare const APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI = "action-rerender-preserve-ui";
-declare function shouldSuppressLoadingBoundaries(mode: AppRscRenderMode): boolean;
 declare function getRscRenderModeCacheVariant(mode: AppRscRenderMode): string | null;
 declare function parseAppRscRenderMode(value: string | null): AppRscRenderMode;
 //#endregion
-export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };
+export { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode };

package/dist/server/app-rsc-render-mode.js

@@ -2,27 +2,17 @@
 const APP_RSC_RENDER_MODE_NAVIGATION = "navigation";
 const APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL = "prefetch-dynamic-shell";
 const APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL = "prefetch-loading-shell";
-const APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI = "refresh-preserve-ui";
-const APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI = "action-rerender-preserve-ui";
-function shouldSuppressLoadingBoundaries(mode) {
-	return mode === "refresh-preserve-ui" || mode === "action-rerender-preserve-ui";
-}
-function shouldUsePreserveUiCacheVariant(mode) {
-	return shouldSuppressLoadingBoundaries(mode);
-}
 function getRscRenderModeCacheVariant(mode) {
 	if (mode === "prefetch-dynamic-shell") return "prefetch-dynamic-shell";
 	if (mode === "prefetch-loading-shell") return "prefetch-loading-shell";
-	return shouldUsePreserveUiCacheVariant(mode) ? "preserve-ui" : null;
+	return null;
 }
 function parseAppRscRenderMode(value) {
 	switch (value) {
 		case APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL: return APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL;
 		case APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL: return APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL;
-		case APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI: return APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI;
-		case APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI: return APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI;
 		default: return APP_RSC_RENDER_MODE_NAVIGATION;
 	}
 }
 //#endregion
-export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };
+export { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, getRscRenderModeCacheVariant, parseAppRscRenderMode };

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

@@ -4,7 +4,7 @@ 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 { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI } from "./app-rsc-render-mode.js";
+import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
 import { headersContextFromRequest, isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
 import { getAndClearActionRevalidationKind } from "../shims/cache-request-state.js";
 import { setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault } from "../shims/fetch-cache.js";
@@ -13,13 +13,13 @@ import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityI
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
-import { createRootParamsUsageController, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage } from "../shims/root-params.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.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";
+import { createRootParamsUsageController, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage } from "../shims/root-params.js";
 import { getSetCookieName } from "./cookie-utils.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 //#region src/server/app-server-action-execution.ts
@@ -684,7 +684,7 @@ async function handleServerActionRscRequest(options) {
 					request: redirectRenderRequest,
 					route: targetMatch.route,
 					searchParams: redirectSearchParams,
-					renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,
+					renderMode: APP_RSC_RENDER_MODE_NAVIGATION,
 					observeMetadataSearchParamsAccess: redirectDynamicConfig !== "force-static",
 					observePageSearchParamsAccess: redirectDynamicConfig !== "force-static"
 				});
@@ -778,7 +778,7 @@ async function handleServerActionRscRequest(options) {
 				request: options.request,
 				route: actionRerenderTarget.route,
 				searchParams: actionRerenderSearchParams,
-				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,
+				renderMode: APP_RSC_RENDER_MODE_NAVIGATION,
 				observeMetadataSearchParamsAccess: actionRerenderDynamicConfig !== "force-static",
 				observePageSearchParamsAccess: actionRerenderDynamicConfig !== "force-static"
 			});

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

@@ -17,12 +17,12 @@ import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
 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 { createInitialBfcacheMaps } 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 "./defer-until-stream-consumed.js";
+import { runWithRootParamsScope } from "../shims/root-params.js";
+import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { renderBeforeInteractiveInlineScripts } from "./before-interactive-head.js";
 import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js";
 import { ssrAppRouterInstance } from "./app-ssr-router-instance.js";

package/dist/server/dev-module-runner.js

@@ -8,7 +8,7 @@ import { ESModulesEvaluator, ModuleRunner, createNodeImportMeta } from "vite/mod
 *
 * ## Why this exists
 *
-* Vite 7's `server.ssrLoadModule()` and the lazy `RunnableDevEnvironment.runner`
+* Vite's `server.ssrLoadModule()` and the lazy `RunnableDevEnvironment.runner`
 * getter both use `SSRCompatModuleRunner`, which constructs a
 * `createServerModuleRunnerTransport` synchronously. That transport calls
 * `connect()` immediately, which reads `environment.hot.api.outsideEmitter` —

package/dist/server/dev-origin-check.d.ts

@@ -5,8 +5,8 @@
  * Prevents external websites from making cross-origin requests to the
  * local dev server and reading the responses (data exfiltration).
  *
- * Vite 7 provides built-in CORS and WebSocket origin protection, but
- * vinext overrides Vite's CORS config to allow OPTIONS passthrough.
+ * Vite provides built-in CORS and WebSocket origin protection, but vinext
+ * overrides Vite's CORS config to allow OPTIONS passthrough.
  * This module adds origin verification to vinext's own request handlers.
  */
 /**

package/dist/server/dev-origin-check.js

@@ -5,8 +5,8 @@
 * Prevents external websites from making cross-origin requests to the
 * local dev server and reading the responses (data exfiltration).
 *
-* Vite 7 provides built-in CORS and WebSocket origin protection, but
-* vinext overrides Vite's CORS config to allow OPTIONS passthrough.
+* Vite provides built-in CORS and WebSocket origin protection, but vinext
+* overrides Vite's CORS config to allow OPTIONS passthrough.
 * This module adds origin verification to vinext's own request handlers.
 */
 /**

package/dist/server/dev-server.js

@@ -180,7 +180,7 @@ async function streamPageToResponse(res, element, options) {
 	const suffix = transformedShell.slice(markerIdx + 25);
 	const bufferedBody = bufferBodyBeforeHeaders ? await new Response(bodyStream).text() : null;
 	const headers = {
-		"Content-Type": "text/html",
+		"Content-Type": "text/html; charset=utf-8",
 		"Transfer-Encoding": "chunked"
 	};
 	if (extraHeaders) for (const [key, val] of Object.entries(extraHeaders)) if (Array.isArray(val)) res.setHeader(key, val);
@@ -535,7 +535,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 							revalidateSeconds: getRevalidateDuration(cacheKey) ?? 60
 						});
 						const hitHeaders = {
-							"Content-Type": "text/html",
+							"Content-Type": "text/html; charset=utf-8",
 							...buildCacheStateHeaders("HIT"),
 							"Cache-Control": hitCacheControl
 						};
@@ -709,7 +709,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 							revalidateSeconds: getRevalidateDuration(cacheKey) ?? 60
 						});
 						const staleHeaders = {
-							"Content-Type": "text/html",
+							"Content-Type": "text/html; charset=utf-8",
 							...buildCacheStateHeaders("STALE"),
 							"Cache-Control": staleCacheControl
 						};
@@ -1148,7 +1148,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 </body>
 </html>`;
 			const transformedHtml = await server.transformIndexHtml(url, html);
-			res.writeHead(statusCode, { "Content-Type": "text/html" });
+			res.writeHead(statusCode, { "Content-Type": "text/html; charset=utf-8" });
 			res.end(transformedHtml);
 		}
 		return;

package/dist/server/image-optimization.d.ts

@@ -26,7 +26,18 @@ declare const IMAGE_OPTIMIZATION_PATH = "/_next/image";
  * for any newly generated URLs.
  */
 declare const VINEXT_IMAGE_OPTIMIZATION_PATH = "/_vinext/image";
-/** Returns true when `pathname` is either supported image optimization endpoint. */
+/**
+ * Returns true when `pathname` is either supported image optimization
+ * endpoint.
+ *
+ * A single trailing slash is accepted (`/_next/image/`): with
+ * `trailingSlash: true`, Next.js 308-redirects `/_next/image?url=...` to
+ * `/_next/image/?url=...` and then serves the slashed form — its route
+ * matching strips a trailing slash before matching internal paths (see
+ * getItem in packages/next/src/server/lib/router-utils/filesystem.ts).
+ * Rejecting the slashed form 404'd every dev-mode next/image request under
+ * `trailingSlash: true`.
+ */
 declare function isImageOptimizationPath(pathname: string): boolean;
 /**
  * Image security configuration from next.config.js `images` section.

package/dist/server/image-optimization.js

@@ -27,8 +27,20 @@ const IMAGE_OPTIMIZATION_PATH = "/_next/image";
 * for any newly generated URLs.
 */
 const VINEXT_IMAGE_OPTIMIZATION_PATH = "/_vinext/image";
-/** Returns true when `pathname` is either supported image optimization endpoint. */
+/**
+* Returns true when `pathname` is either supported image optimization
+* endpoint.
+*
+* A single trailing slash is accepted (`/_next/image/`): with
+* `trailingSlash: true`, Next.js 308-redirects `/_next/image?url=...` to
+* `/_next/image/?url=...` and then serves the slashed form — its route
+* matching strips a trailing slash before matching internal paths (see
+* getItem in packages/next/src/server/lib/router-utils/filesystem.ts).
+* Rejecting the slashed form 404'd every dev-mode next/image request under
+* `trailingSlash: true`.
+*/
 function isImageOptimizationPath(pathname) {
+	if (pathname.length > 1 && pathname.endsWith("/")) pathname = pathname.slice(0, -1);
 	return pathname === "/_next/image" || pathname === "/_vinext/image";
 }
 /**

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

@@ -1,7 +1,7 @@
-import { RenderObservation } from "./cache-proof.js";
-import { CacheHandlerValue, CachedAppPageValue, CachedPagesValue, IncrementalCacheValue } from "../shims/cache-handler.js";
 import { OnRequestErrorContext } from "./instrumentation.js";
+import { RenderObservation } from "./cache-proof.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
+import { CacheHandlerValue, CachedAppPageValue, CachedPagesValue, IncrementalCacheValue } from "../shims/cache-handler.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 
 //#region src/server/isr-cache.d.ts
@@ -102,13 +102,21 @@ declare function buildAppPageCacheValue(html: string, rscData?: ArrayBuffer, sta
  * Long pathnames are hashed to stay within KV key-length limits (512 bytes).
  */
 declare function isrCacheKey(router: string, pathname: string, buildId?: string): string;
+/**
+ * Compute an App Router ISR key for one cache artifact.
+ *
+ * App pages store HTML, RSC payloads, and route-handler responses separately.
+ * The suffix mirrors Next.js's separate on-disk app artifacts while keeping the
+ * Cloudflare KV key under its 512-byte limit for long pathnames.
+ */
+declare function appIsrCacheKey(pathname: string, suffix: string, buildId?: string | undefined): string;
 declare function appIsrHtmlKey(pathname: string): string;
 /**
  * Build the ISR cache key for an RSC payload.
  *
  * Variants are sequenced in order: `source:<hash>` (intercepted source context,
  * only when an interception context is present), `slots:<hash>` (mounted parallel
- * route slots), and optionally `<render-mode-variant>` (e.g. `preserve-ui` or
+ * route slots), and optionally `<render-mode-variant>` (for example,
  * `prefetch-loading-shell`). Existing cached entries under the old format will
  * become unreachable after deployment. This is acceptable because ISR entries
  * have TTLs and will be regenerated on the next request.
@@ -125,4 +133,4 @@ declare function setRevalidateDuration(key: string, seconds: number): void;
  */
 declare function getRevalidateDuration(key: string): number | undefined;
 //#endregion
-export { ISRCacheEntry, PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, appIsrHtmlKey, appIsrRouteKey, appIsrRscKey, buildAppPageCacheValue, buildPagesCacheValue, getRevalidateDuration, getRevalidateSecret, isOnDemandRevalidateRequest, isRevalidateSecret, isrCacheKey, isrGet, isrSet, isrSetPrerenderedAppPage, normalizeMountedSlotsHeader, setRevalidateDuration, triggerBackgroundRegeneration };
+export { ISRCacheEntry, PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, appIsrCacheKey, appIsrHtmlKey, appIsrRouteKey, appIsrRscKey, buildAppPageCacheValue, buildPagesCacheValue, getRevalidateDuration, getRevalidateSecret, isOnDemandRevalidateRequest, isRevalidateSecret, isrCacheKey, isrGet, isrSet, isrSetPrerenderedAppPage, normalizeMountedSlotsHeader, setRevalidateDuration, triggerBackgroundRegeneration };

package/dist/server/isr-cache.js

@@ -242,7 +242,7 @@ function normalizeInterceptionContextForCacheKey(interceptionContext) {
 *
 * Variants are sequenced in order: `source:<hash>` (intercepted source context,
 * only when an interception context is present), `slots:<hash>` (mounted parallel
-* route slots), and optionally `<render-mode-variant>` (e.g. `preserve-ui` or
+* route slots), and optionally `<render-mode-variant>` (for example,
 * `prefetch-loading-shell`). Existing cached entries under the old format will
 * become unreachable after deployment. This is acceptable because ISR entries
 * have TTLs and will be regenerated on the next request.
@@ -283,4 +283,4 @@ function getRevalidateDuration(key) {
 	return revalidateDurations.get(key);
 }
 //#endregion
-export { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, appIsrHtmlKey, appIsrRouteKey, appIsrRscKey, buildAppPageCacheValue, buildPagesCacheValue, getRevalidateDuration, getRevalidateSecret, isOnDemandRevalidateRequest, isRevalidateSecret, isrCacheKey, isrGet, isrSet, isrSetPrerenderedAppPage, normalizeMountedSlotsHeader, setRevalidateDuration, triggerBackgroundRegeneration };
+export { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, appIsrCacheKey, appIsrHtmlKey, appIsrRouteKey, appIsrRscKey, buildAppPageCacheValue, buildPagesCacheValue, getRevalidateDuration, getRevalidateSecret, isOnDemandRevalidateRequest, isRevalidateSecret, isrCacheKey, isrGet, isrSet, isrSetPrerenderedAppPage, normalizeMountedSlotsHeader, setRevalidateDuration, triggerBackgroundRegeneration };

package/dist/server/pages-page-data.js

@@ -179,7 +179,7 @@ function buildPagesCacheResponse(html, cacheState, fontLinkHeader, revalidateSec
 		cacheControlMeta: cacheControl
 	});
 	const headers = new Headers({
-		"Content-Type": "text/html",
+		"Content-Type": "text/html; charset=utf-8",
 		...buildCacheStateHeaders(cacheState)
 	});
 	applyCdnResponseHeaders(headers, { cacheControl: cacheControlHeader });

package/dist/server/pages-page-response.js

@@ -167,7 +167,7 @@ function applyGsspHeaders(headers, gsspRes, statusCode) {
 		}
 		if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") headers.set(key, String(value));
 	}
-	headers.set("Content-Type", "text/html");
+	headers.set("Content-Type", "text/html; charset=utf-8");
 	return statusCode ?? gsspRes.statusCode;
 }
 async function renderPagesPageResponse(options) {
@@ -232,7 +232,7 @@ async function renderPagesPageResponse(options) {
 	const markerIndex = shellHtml.indexOf(bodyMarker);
 	const shellPrefix = shellHtml.slice(0, markerIndex);
 	const shellSuffix = shellHtml.slice(markerIndex + 25);
-	const responseHeaders = new Headers({ "Content-Type": "text/html" });
+	const responseHeaders = new Headers({ "Content-Type": "text/html; charset=utf-8" });
 	const finalStatus = applyGsspHeaders(responseHeaders, options.gsspRes ?? options.documentReqRes?.res ?? null, options.statusCode);
 	let responseBodyStream = bodyStream;
 	if (!options.scriptNonce && options.isrRevalidateSeconds !== null && options.isrRevalidateSeconds > 0) {

package/dist/server/pages-request-pipeline.js

@@ -320,7 +320,7 @@ async function runPagesRequest(request, deps) {
 		return {
 			type: "response",
 			response: merged,
-			defaultContentType: "text/html"
+			defaultContentType: "text/html; charset=utf-8"
 		};
 	}
 	let devPageMatch = isOutsideBasePathUnclaimed() ? null : resolvedPathnameChanged ? deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null : pageMatch;

package/dist/server/prerender-manifest.d.ts

@@ -15,6 +15,10 @@ type PrerenderManifest = {
   routes?: PrerenderManifestRoute[];
   pregeneratedConcretePaths?: Array<[string, string[]]>;
 };
+type PrerenderedPathSelectionOptions = {
+  includeFallbackShells?: boolean;
+  includeErrorDocuments?: boolean;
+};
 declare function readPrerenderManifest(manifestPath: string): PrerenderManifest | null;
 declare function getRenderedAppRoutes(routes: PrerenderManifestRoute[]): PrerenderManifestRoute[];
 /**
@@ -31,5 +35,15 @@ declare function isFallbackShellArtifactPath(pathname: string, route?: Prerender
  * rendered App routes or all routes are fallback-shell artifacts.
  */
 declare function buildPregeneratedConcretePathTable(manifest: PrerenderManifest): Array<[string, string[]]>;
+/**
+ * Select concrete URL paths that were rendered by the prerender engine.
+ *
+ * This intentionally includes both App Router and Pages Router entries because
+ * deploy-time cache warmup should exercise the same URLs the prerender phase
+ * proved are statically renderable. PPR fallback-shell placeholder artifacts
+ * and known error documents are excluded by default so warmup does not request
+ * synthetic bracket paths or treat a healthy 404 response as a failed warmup.
+ */
+declare function getPrerenderedConcretePaths(manifest: PrerenderManifest, options?: PrerenderedPathSelectionOptions): string[];
 //#endregion
-export { PrerenderManifest, buildPregeneratedConcretePathTable, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };
+export { PrerenderManifest, PrerenderManifestRoute, PrerenderedPathSelectionOptions, buildPregeneratedConcretePathTable, getPrerenderedConcretePaths, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };

package/dist/server/prerender-manifest.js

@@ -22,6 +22,9 @@ function groupRoutesByPattern(routes) {
 	}
 	return byPattern;
 }
+function isErrorDocumentRoute(pathname, route) {
+	return pathname === "/404" || pathname === "/500" || pathname === "/_error" || route.route === "/404" || route.route === "/500" || route.route === "/_error";
+}
 /**
 * Returns true when `pathname` contains bracket-delimited route params,
 * indicating it is a fallback-shell placeholder (e.g. `/en/blog/[slug]`)
@@ -50,5 +53,30 @@ function buildPregeneratedConcretePathTable(manifest) {
 	});
 	return Array.from(groupRoutesByPattern(concreteRoutes).entries());
 }
+/**
+* Select concrete URL paths that were rendered by the prerender engine.
+*
+* This intentionally includes both App Router and Pages Router entries because
+* deploy-time cache warmup should exercise the same URLs the prerender phase
+* proved are statically renderable. PPR fallback-shell placeholder artifacts
+* and known error documents are excluded by default so warmup does not request
+* synthetic bracket paths or treat a healthy 404 response as a failed warmup.
+*/
+function getPrerenderedConcretePaths(manifest, options) {
+	const routes = manifest.routes;
+	if (!routes?.length) return [];
+	const paths = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const route of routes) {
+		if (route.status !== "rendered") continue;
+		const pathname = route.path ?? route.route;
+		if (!options?.includeFallbackShells && isFallbackShellArtifactPath(pathname, route)) continue;
+		if (!options?.includeErrorDocuments && isErrorDocumentRoute(pathname, route)) continue;
+		if (seen.has(pathname)) continue;
+		seen.add(pathname);
+		paths.push(pathname);
+	}
+	return paths;
+}
 //#endregion
-export { buildPregeneratedConcretePathTable, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };
+export { buildPregeneratedConcretePathTable, getPrerenderedConcretePaths, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };

package/dist/server/prod-server.d.ts

@@ -10,10 +10,9 @@ import { IncomingMessage, ServerResponse } from "node:http";
  *
  * The first import of a given path uses the plain file:// URL with NO query
  * string. This is load-bearing: code-split builds emit lazy chunks that
- * import the entry back by bare specifier (default Vite builds on both
- * supported majors — Rollup on Vite 7 and Rolldown on Vite 8 — hoist modules
- * shared between the entry's static graph and lazy route chunks into the
- * entry chunk, which the chunks then import as e.g. "../../index.js").
+ * import the entry back by bare specifier (default Vite/Rolldown builds hoist
+ * modules shared between the entry's static graph and lazy route chunks into
+ * the entry chunk, which the chunks then import as e.g. "../../index.js").
  * Node keys its ESM cache on the full URL including the query string, so if
  * the server imported the entry as `index.js?t=<mtime>`, a chunk's bare
  * back-import would evaluate the entire server bundle a second time and
@@ -48,7 +47,9 @@ declare function readNodeStream(req: IncomingMessage): ReadableStream<Uint8Array
 type ProdServerOptions = {
   /** Port to listen on */port?: number; /** Host to bind to */
   host?: string; /** Path to the build output directory */
-  outDir?: string; /** Disable compression (default: false) */
+  outDir?: string; /** Explicit App Router RSC entry path. Defaults to `<outDir>/server/index.js`. */
+  rscEntryPath?: string; /** Explicit Pages Router server entry path. Defaults to `<outDir>/server/entry.js`. */
+  serverEntryPath?: string; /** Disable compression (default: false) */
   noCompression?: boolean;
   /**
    * Narrow startup context for callers that need a more precise log line.

package/dist/server/prod-server.js

@@ -74,10 +74,9 @@ function resolveCanonicalServerEntry(entryPath) {
 *
 * The first import of a given path uses the plain file:// URL with NO query
 * string. This is load-bearing: code-split builds emit lazy chunks that
-* import the entry back by bare specifier (default Vite builds on both
-* supported majors — Rollup on Vite 7 and Rolldown on Vite 8 — hoist modules
-* shared between the entry's static graph and lazy route chunks into the
-* entry chunk, which the chunks then import as e.g. "../../index.js").
+* import the entry back by bare specifier (default Vite/Rolldown builds hoist
+* modules shared between the entry's static graph and lazy route chunks into
+* the entry chunk, which the chunks then import as e.g. "../../index.js").
 * Node keys its ESM cache on the full URL including the query string, so if
 * the server imported the entry as `index.js?t=<mtime>`, a chunk's bare
 * back-import would evaluate the entire server bundle a second time and
@@ -633,12 +632,12 @@ async function sendWebResponse(webResponse, req, res, compress) {
 */
 async function startProdServer(options = {}) {
 	installSocketErrorBackstop();
-	const { port = process.env.PORT ? parseInt(process.env.PORT) : 3e3, host = "0.0.0.0", outDir = path.resolve("dist"), noCompression = false, purpose, silent = false } = options;
+	const { port = process.env.PORT ? parseInt(process.env.PORT) : 3e3, host = "0.0.0.0", outDir = path.resolve("dist"), rscEntryPath: explicitRscEntryPath, serverEntryPath: explicitServerEntryPath, noCompression = false, purpose, silent = false } = options;
 	const compress = !noCompression;
 	const resolvedOutDir = path.resolve(outDir);
 	const clientDir = path.join(resolvedOutDir, "client");
-	const rscEntryPath = path.join(resolvedOutDir, "server", "index.js");
-	const serverEntryPath = path.join(resolvedOutDir, "server", "entry.js");
+	const rscEntryPath = explicitRscEntryPath ? path.resolve(explicitRscEntryPath) : path.join(resolvedOutDir, "server", "index.js");
+	const serverEntryPath = explicitServerEntryPath ? path.resolve(explicitServerEntryPath) : path.join(resolvedOutDir, "server", "entry.js");
 	const isAppRouter = fs.existsSync(rscEntryPath);
 	if (!isAppRouter && !fs.existsSync(serverEntryPath)) {
 		console.error(`[vinext] No build output found in ${outDir}`);

package/dist/server/static-file-cache.js

@@ -21,7 +21,7 @@ const CONTENT_TYPES = {
 	".js": "application/javascript",
 	".mjs": "application/javascript",
 	".css": "text/css",
-	".html": "text/html",
+	".html": "text/html; charset=utf-8",
 	".json": "application/json",
 	".txt": "text/plain; charset=utf-8",
 	".png": "image/png",

package/dist/shims/cache.d.ts

@@ -1,6 +1,6 @@
 import { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, ActionRevalidationKind, CacheLifeConfig, CacheState, UnstableCacheObservation, UnstableCacheRevalidationMode, _consumeRequestScopedCacheLife, _initRequestScopedCacheState, _peekRequestScopedCacheLife, _peekUnstableCacheObservations, _registerCacheContextAccessor, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, getAndClearActionRevalidationKind, getRegisteredCacheContext, markActionRevalidation, recordUnstableCacheObservation, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
-import { CacheControlMetadata, CacheHandler, CacheHandlerContext, CacheHandlerValue, CachedAppPageValue, CachedFetchValue, CachedImageValue, CachedPagesValue, CachedRedirectValue, CachedRouteValue, IncrementalCacheValue, MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getCacheHandler, getDataCacheHandler, setCacheHandler, setDataCacheHandler } from "./cache-handler.js";
 import { ExecutionContextLike, getRequestExecutionContext, runWithExecutionContext } from "./request-context.js";
+import { CacheControlMetadata, CacheHandler, CacheHandlerContext, CacheHandlerValue, CachedAppPageValue, CachedFetchValue, CachedImageValue, CachedPagesValue, CachedRedirectValue, CachedRouteValue, IncrementalCacheValue, MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getCacheHandler, getDataCacheHandler, setCacheHandler, setDataCacheHandler } from "./cache-handler.js";
 
 //#region src/shims/cache.d.ts
 /**

package/dist/shims/cdn-cache.d.ts

@@ -112,13 +112,8 @@ declare class DefaultCdnCacheAdapter implements CdnCacheAdapter {
  */
 declare function setCdnCacheAdapter(adapter: CdnCacheAdapter): void;
 /**
- * Get the active CDN cache adapter. See the precedence note above:
- * explicit (or an already-resolved auto-detected edge adapter) → origin-managed
- * {@link DefaultCdnCacheAdapter}.
- *
- * Auto-detection of the Cloudflare Workers Cache (`ctx.cache`) only runs when
- * `VINEXT_CDN_CACHE_AUTO_DETECT === "1"`; otherwise the default adapter is used
- * unless an adapter was set explicitly.
+ * Get the active CDN cache adapter. An explicitly configured adapter wins;
+ * otherwise the origin-managed {@link DefaultCdnCacheAdapter} is used.
  */
 declare function getCdnCacheAdapter(): CdnCacheAdapter;
 //#endregion