vinext 0.1.8 → 0.2.0

package/dist/server/prod-server.js

@@ -1,22 +1,24 @@
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
-import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_STATIC_FILE_HEADER } from "./headers.js";
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
+import { VINEXT_STATIC_FILE_HEADER } from "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { filterInternalHeaders } from "./request-pipeline.js";
 import { isUnknownRecord } from "../utils/record.js";
+import { buildNextDataNotFoundResponse, isNextDataPathname, parseNextDataPathname } from "./pages-data-route.js";
 import { resolveRequestHost, resolveRequestProtocol, trustProxy, trustedHosts } from "./proxy-trust.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, isSafeImageContentType, parseImageParams } from "./image-optimization.js";
 import { installSocketErrorBackstop } from "./socket-error-backstop.js";
 import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
 import { CONTENT_TYPES, StaticFileCache, etagFromFilenameHash } from "./static-file-cache.js";
-import { buildNextDataNotFoundResponse, isNextDataPathname, parseNextDataPathname } from "./pages-data-route.js";
 import { collectInlineCssManifest } from "../build/inline-css.js";
 import { mergeHeaders } from "./worker-utils.js";
 import { runPagesRequest, wrapMiddlewareWithBasePath } from "./pages-request-pipeline.js";
-import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import { computeClientRuntimeMetadata } from "../utils/client-runtime-metadata.js";
+import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { setPagesClientAssets } from "./pages-client-assets.js";
 import { readPrerenderSecret } from "../build/server-manifest.js";
 import { seedMemoryCacheFromPrerender } from "./seed-cache.js";
 import { negotiateEncoding, parseAcceptedEncodings, selectContentEncoding } from "./accept-encoding.js";
@@ -24,9 +26,9 @@ import fs from "node:fs";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
 import { pathToFileURL } from "node:url";
+import { Readable, pipeline } from "node:stream";
 import zlib from "node:zlib";
 import { createServer } from "node:http";
-import { Readable, pipeline } from "node:stream";
 //#region src/server/prod-server.ts
 /**
 * Production server for vinext.
@@ -275,8 +277,11 @@ function installClientBuildManifestGlobals(clientDir, assetBase, assetPrefix) {
 		assetBase,
 		assetPrefix
 	});
-	globalThis.__VINEXT_LAZY_CHUNKS__ = metadata.lazyChunks;
-	globalThis.__VINEXT_DYNAMIC_PRELOADS__ = metadata.dynamicPreloads;
+	setPagesClientAssets({
+		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
+		lazyChunks: metadata.lazyChunks,
+		dynamicPreloads: metadata.dynamicPreloads
+	});
 }
 function isNoBodyResponseStatus(status) {
 	return NO_BODY_RESPONSE_STATUSES.has(status);
@@ -305,7 +310,7 @@ function logProdServerStarted(host, port, purpose) {
 * arguments in (headers, response) order. The request path now calls
 * `runPagesRequest`, which uses `mergeHeaders` directly; this wrapper is retained
 * only for its existing tests and any external callers, so there is a single
-* implementation to keep in sync. (deploy.ts still emits its own generated copy.)
+* implementation to keep in sync. The init-owned Cloudflare Worker template delegates here.
 */
 function mergeWebResponse(middlewareHeaders, response, statusOverride) {
 	return mergeHeaders(response, middlewareHeaders, statusOverride);
@@ -736,18 +741,21 @@ function readSsrManifest(clientDir) {
 	}
 	return parsed;
 }
-function installPagesClientAssetGlobals(options) {
+function installPagesClientAssets(options) {
 	const ssrManifest = readSsrManifest(options.clientDir);
-	globalThis.__VINEXT_SSR_MANIFEST__ = Object.keys(ssrManifest).length > 0 ? ssrManifest : void 0;
 	const metadata = computeClientRuntimeMetadata({
 		clientDir: options.clientDir,
 		assetBase: options.assetBase,
 		assetPrefix: options.assetPrefix,
 		includeClientEntry: options.clientEntryLookup === "pages-client-entry" ? "pages-client-entry" : true
 	});
-	globalThis.__VINEXT_CLIENT_ENTRY__ = metadata.clientEntryFile;
-	globalThis.__VINEXT_LAZY_CHUNKS__ = metadata.lazyChunks;
-	globalThis.__VINEXT_DYNAMIC_PRELOADS__ = metadata.dynamicPreloads;
+	setPagesClientAssets({
+		clientEntry: metadata.clientEntryFile,
+		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
+		ssrManifest: Object.keys(ssrManifest).length > 0 ? ssrManifest : void 0,
+		lazyChunks: metadata.lazyChunks,
+		dynamicPreloads: metadata.dynamicPreloads
+	});
 	return ssrManifest;
 }
 /**
@@ -769,11 +777,6 @@ function installPagesClientAssetGlobals(options) {
 */
 async function startAppRouterServer(options) {
 	const { port, host, clientDir, rscEntryPath, compress, purpose } = options;
-	let imageConfig;
-	const imageConfigPath = path.join(path.dirname(rscEntryPath), "image-config.json");
-	if (fs.existsSync(imageConfigPath)) try {
-		imageConfig = JSON.parse(fs.readFileSync(imageConfigPath, "utf-8"));
-	} catch {}
 	const prerenderSecret = readPrerenderSecret(path.dirname(rscEntryPath));
 	const rscModule = await importServerEntryModule(rscEntryPath);
 	const rscHandler = resolveAppRouterHandler(rscModule.default);
@@ -781,10 +784,18 @@ async function startAppRouterServer(options) {
 	const appRouterBasePath = typeof rscModule.__basePath === "string" ? rscModule.__basePath : "";
 	const appRouterInlineCss = rscModule.__inlineCss === true;
 	const appRouterHasPagesDir = rscModule.__hasPagesDir === true;
+	const appImageAllowedWidths = Array.isArray(rscModule.__imageAllowedWidths) ? rscModule.__imageAllowedWidths : [...DEFAULT_DEVICE_SIZES, ...DEFAULT_IMAGE_SIZES];
+	let imageConfig = typeof rscModule.__imageConfig === "object" && rscModule.__imageConfig !== null ? rscModule.__imageConfig : void 0;
+	if (imageConfig === void 0) {
+		const imageConfigPath = path.join(path.dirname(rscEntryPath), "image-config.json");
+		if (fs.existsSync(imageConfigPath)) try {
+			imageConfig = JSON.parse(fs.readFileSync(imageConfigPath, "utf-8"));
+		} catch {}
+	}
 	globalThis.__VINEXT_INLINE_CSS__ = appRouterInlineCss ? collectInlineCssManifest(clientDir, appRouterAssetPrefix) : void 0;
 	const appAssetPathPrefix = assetPrefixPathname(appRouterAssetPrefix);
 	const appAssetBase = appRouterBasePath ? `${appRouterBasePath}/` : "/";
-	if (appRouterHasPagesDir) installPagesClientAssetGlobals({
+	if (appRouterHasPagesDir) installPagesClientAssets({
 		clientDir,
 		assetPrefix: appRouterAssetPrefix,
 		assetBase: appAssetBase,
@@ -828,7 +839,7 @@ async function startAppRouterServer(options) {
 			}
 		}
 		if (isImageOptimizationPath(pathname)) {
-			const params = parseImageParams(new URL(rawUrl, "http://localhost"), [...imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES], imageConfig?.qualities);
+			const params = parseImageParams(new URL(rawUrl, "http://localhost"), appImageAllowedWidths, imageConfig?.qualities);
 			if (!params) {
 				res.writeHead(400);
 				res.end("Bad Request");
@@ -923,6 +934,7 @@ async function startPagesRouterServer(options) {
 	const serverEntry = await importServerEntryModule(serverEntryPath);
 	const { renderPage, handleApiRoute: handleApi, runMiddleware, vinextConfig, buildId: pagesBuildId } = serverEntry;
 	const matchPageRoute = typeof serverEntry.matchPageRoute === "function" ? serverEntry.matchPageRoute : void 0;
+	const hasMiddleware = serverEntry.hasMiddleware === true;
 	const pageRoutes = readPagesServerEntryPageRoutes(serverEntry.pageRoutes);
 	const prerenderSecret = readPrerenderSecret(path.dirname(serverEntryPath));
 	const basePath = vinextConfig?.basePath ?? "";
@@ -946,7 +958,7 @@ async function startPagesRouterServer(options) {
 		contentDispositionType: vinextConfig.images.contentDispositionType,
 		contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy
 	} : void 0;
-	const ssrManifest = installPagesClientAssetGlobals({
+	const ssrManifest = installPagesClientAssets({
 		clientDir,
 		assetPrefix,
 		assetBase,
@@ -1075,6 +1087,7 @@ async function startPagesRouterServer(options) {
 				hadBasePath,
 				isDataReq,
 				isDataRequest,
+				hasMiddleware,
 				ctx: void 0,
 				rawSearch: rawQs,
 				matchPageRoute: matchPageRoute ?? null,

package/dist/server/request-pipeline.js

@@ -1,4 +1,5 @@
 import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
+import "../utils/protocol-headers.js";
 import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, VINEXT_STATIC_FILE_HEADER } from "./headers.js";
 import { matchHeaders } from "../config/config-matchers.js";
 import { forbiddenResponse, notFoundResponse } from "./http-error-responses.js";

package/dist/server/seed-cache.js

@@ -1,8 +1,8 @@
 import { isrCacheKey, isrSetPrerenderedAppPage } from "./isr-cache.js";
+import { getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest } from "./prerender-manifest.js";
 import { buildAppPageCacheTags } from "./app-page-cache.js";
 import { getOutputPath, getRscOutputPath } from "../utils/prerender-output-paths.js";
 import { addPregeneratedConcretePath, clearPregeneratedConcretePaths, normalizePregeneratedPathname } from "./pregenerated-concrete-paths.js";
-import { getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest } from "./prerender-manifest.js";
 import fs from "node:fs";
 import path from "node:path";
 //#region src/server/seed-cache.ts
@@ -67,7 +67,7 @@ async function seedMemoryCacheFromPrerender(serverDir, options) {
 		const revalidateSeconds = typeof route.revalidate === "number" ? route.revalidate : void 0;
 		const expireSeconds = typeof route.expire === "number" ? route.expire : void 0;
 		const tags = buildAppPageCacheTags(cachePathname, []);
-		if (await seedHtml(writeAppPageEntry, prerenderDir, htmlKey, artifactPathname, trailingSlash, revalidateSeconds, expireSeconds, tags)) {
+		if (await seedHtml(writeAppPageEntry, prerenderDir, htmlKey, artifactPathname, trailingSlash, route.headers, revalidateSeconds, expireSeconds, tags)) {
 			await seedRsc(writeAppPageEntry, prerenderDir, rscKey, artifactPathname, revalidateSeconds, expireSeconds, tags);
 			seeded++;
 		}
@@ -81,7 +81,7 @@ function createDefaultAppPageEntryWriter() {
 * Seed the HTML cache entry for a single route.
 * Returns true if the file existed and was seeded.
 */
-async function seedHtml(writeAppPageEntry, prerenderDir, key, pathname, trailingSlash, revalidateSeconds, expireSeconds, tags) {
+async function seedHtml(writeAppPageEntry, prerenderDir, key, pathname, trailingSlash, headers, revalidateSeconds, expireSeconds, tags) {
 	const relPath = getOutputPath(pathname, trailingSlash);
 	const fullPath = path.join(prerenderDir, relPath);
 	if (!fs.existsSync(fullPath)) return false;
@@ -89,7 +89,7 @@ async function seedHtml(writeAppPageEntry, prerenderDir, key, pathname, trailing
 		kind: "APP_PAGE",
 		html: fs.readFileSync(fullPath, "utf-8"),
 		rscData: void 0,
-		headers: void 0,
+		headers,
 		postponed: void 0,
 		status: void 0
 	}, {

package/dist/shims/app-router-scroll-state.d.ts

@@ -2,6 +2,7 @@
 type AppRouterScrollIntent = Readonly<{
   commitId: number | null;
   hash: string | null;
+  headElements: ReadonlySet<Element> | null;
   id: number;
   targetHoistedInHead: boolean;
 }>;

package/dist/shims/app-router-scroll-state.js

@@ -14,6 +14,7 @@ function beginAppRouterScrollIntent(hash) {
 	const intent = {
 		commitId: null,
 		hash,
+		headElements: typeof document === "undefined" ? null : new Set(document.head?.children ?? []),
 		id: store.nextId,
 		targetHoistedInHead: false
 	};

package/dist/shims/app-router-scroll.js

@@ -99,7 +99,8 @@ var AppRouterScrollTargetInner = class extends React$1.Component {
 		else node = null;
 		if (node === null) {
 			node = findDOMNode(this);
-			if (node !== null && isInDocumentHead(node)) {
+			const headElement = node instanceof Element ? node : node?.parentElement;
+			if (node !== null && headElement != null && isInDocumentHead(node) && !intent.headElements?.has(headElement)) {
 				markAppRouterScrollIntentHeadHoisted(intent, this.props.commitId);
 				return;
 			}

package/dist/shims/cache.js

@@ -5,7 +5,7 @@ import { MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getC
 import { getCdnCacheAdapter } from "./cdn-cache.js";
 import { fnv1a64 } from "../utils/hash.js";
 import { makeHangingPromise } from "./internal/make-hanging-promise.js";
-import { getHeadersAccessPhase, markDynamicUsage } from "./headers.js";
+import { getHeadersAccessPhase, isDraftModeEnabled, markDynamicUsage } from "./headers.js";
 import { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, _consumeRequestScopedCacheLife, _initRequestScopedCacheState, _peekRequestScopedCacheLife, _peekUnstableCacheObservations, _registerCacheContextAccessor, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, getAndClearActionRevalidationKind, getRegisteredCacheContext, markActionRevalidation, recordUnstableCacheObservation, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
 import { encodeCacheTag, encodeCacheTags } from "../utils/encode-cache-tag.js";
 import { workUnitAsyncStorage } from "./internal/work-unit-async-storage.js";
@@ -110,10 +110,10 @@ function refresh() {
 *
 * @see https://nextjs.org/docs/app/api-reference/functions/updateTag
 */
-async function updateTag(tag) {
+function updateTag(tag) {
 	if (getHeadersAccessPhase() !== "action") throw new Error("updateTag can only be called from within a Server Action. To invalidate cache tags in Route Handlers or other contexts, use revalidateTag instead. See more info here: https://nextjs.org/docs/app/api-reference/functions/updateTag");
 	markActionRevalidation(1);
-	await _invalidateEncodedTag(encodeCacheTag(tag));
+	return _invalidateEncodedTag(encodeCacheTag(tag));
 }
 /**
 * Opt out of static rendering and indicate a particular component should not be cached.
@@ -380,19 +380,23 @@ function unstable_cache(fn, keyParts, options) {
 			tagCount: tags.length,
 			tagHash: tags.length > 0 ? fnv1a64(JSON.stringify(tags)) : null
 		});
-		const existing = await getDataCacheHandler().get(cacheKey, {
-			kind: "FETCH",
-			tags
-		});
-		if (existing?.value && existing.value.kind === "FETCH") {
-			const cached = tryDeserializeUnstableCacheResult(existing.value.data.body);
-			if (cached.ok) if (existing.cacheState === "stale") {
-				if (shouldServeStaleUnstableCacheEntry()) {
-					scheduleUnstableCacheBackgroundRevalidation(cacheKey, () => refreshUnstableCacheResult(fn, args, cacheKey, tags, revalidateSeconds));
-					return cached.value;
-				}
-			} else return cached.value;
+		const isDraftMode = isDraftModeEnabled();
+		if (!isDraftMode) {
+			const existing = await getDataCacheHandler().get(cacheKey, {
+				kind: "FETCH",
+				tags
+			});
+			if (existing?.value && existing.value.kind === "FETCH") {
+				const cached = tryDeserializeUnstableCacheResult(existing.value.data.body);
+				if (cached.ok) if (existing.cacheState === "stale") {
+					if (shouldServeStaleUnstableCacheEntry()) {
+						scheduleUnstableCacheBackgroundRevalidation(cacheKey, () => refreshUnstableCacheResult(fn, args, cacheKey, tags, revalidateSeconds));
+						return cached.value;
+					}
+				} else return cached.value;
+			}
 		}
+		if (isDraftMode) return await _unstableCacheAls.run(true, () => fn(...args));
 		return await refreshUnstableCacheResult(fn, args, cacheKey, tags, revalidateSeconds);
 	};
 	return cachedFn;

package/dist/shims/cdn-cache.js

@@ -1,6 +1,6 @@
 import { getRequestExecutionContext } from "./request-context.js";
 import { getDataCacheHandler } from "./cache-handler.js";
-import { CloudflareCdnCacheAdapter } from "../cloudflare/src/cache/cdn-adapter.runtime.js";
+import { CloudflareCdnCacheAdapter } from "../packages/cloudflare/src/cache/cdn-adapter.runtime.js";
 //#region src/shims/cdn-cache.ts
 /**
 * CDN cache adapter — owns the *page-level ISR serving strategy*.

package/dist/shims/dynamic-preload-chunks.js

@@ -3,6 +3,7 @@ import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { useScriptNonce } from "./script-nonce-context.js";
 import React from "react";
 import * as ReactDOM from "react-dom";
+import { getPagesClientAssets } from "vinext/server/pages-client-assets";
 //#region src/shims/dynamic-preload-chunks.tsx
 /**
 * Preload links for rendered next/dynamic() boundaries.
@@ -34,7 +35,7 @@ function dynamicPreloadHref(file) {
 }
 function resolveDynamicPreloadFiles(moduleIds) {
 	if (!moduleIds || moduleIds.length === 0) return [];
-	const preloadMap = globalThis.__VINEXT_DYNAMIC_PRELOADS__;
+	const preloadMap = getPagesClientAssets().dynamicPreloads;
 	if (!preloadMap) return [];
 	const files = [];
 	const seen = /* @__PURE__ */ new Set();

package/dist/shims/form.d.ts

@@ -1,6 +1,8 @@
 import { FormHTMLAttributes, useActionState } from "react";
 
 //#region src/shims/form.d.ts
+type FormSubmitter = HTMLButtonElement | HTMLInputElement;
+declare function createFormSubmitDestinationUrl(action: string, form: HTMLFormElement, submitter: FormSubmitter | null): string;
 declare const Form: import("react").ForwardRefExoticComponent<{
   /** Target URL for GET forms, or server action for POST forms */action: string | ((formData: FormData) => void | Promise<void>); /** Replace instead of push in history (default: false) */
   replace?: boolean; /** Scroll to top after navigation (default: true) */
@@ -16,4 +18,4 @@ declare const Form: import("react").ForwardRefExoticComponent<{
   prefetch?: false | null;
 } & Omit<FormHTMLAttributes<HTMLFormElement>, "method" | "encType" | "target"> & import("react").RefAttributes<HTMLFormElement>>;
 //#endregion
-export { Form as default, useActionState };
+export { createFormSubmitDestinationUrl, Form as default, useActionState };

package/dist/shims/form.js

@@ -1,9 +1,11 @@
 "use client";
 import { VINEXT_MOUNTED_SLOTS_HEADER } from "../server/headers.js";
-import { isDangerousScheme } from "./url-safety.js";
+import { assertSafeNavigationUrl } from "./url-safety.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
+import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "../server/app-rsc-render-mode.js";
 import "../server/app-elements.js";
-import { toSameOriginPath, withBasePath } from "./url-utils.js";
+import { withBasePath } from "./url-utils.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { createRscRequestHeaders, createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
 import { hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { getMountedSlotsHeader, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./navigation.js";
@@ -37,18 +39,13 @@ const DISALLOWED_FORM_PROPS = [
 const SUPPORTED_FORM_ENCTYPE = "application/x-www-form-urlencoded";
 const SUPPORTED_FORM_METHOD = "GET";
 const SUPPORTED_FORM_TARGET = "_self";
-function isSafeAction(action) {
-	if (isDangerousScheme(action)) return false;
-	if (action.startsWith("//")) return false;
-	if (/^https?:\/\//i.test(action)) {
-		if (typeof window !== "undefined") try {
-			return new URL(action).origin === window.location.origin;
-		} catch {
-			return false;
-		}
+function isPrefetchableAction(action) {
+	try {
+		const actionUrl = new URL(action, window.location.href);
+		return (actionUrl.protocol === "http:" || actionUrl.protocol === "https:") && actionUrl.origin === window.location.origin;
+	} catch {
 		return false;
 	}
-	return true;
 }
 function getSubmitter(nativeEvent) {
 	const submitter = nativeEvent && typeof nativeEvent === "object" && "submitter" in nativeEvent && nativeEvent.submitter instanceof Element ? nativeEvent.submitter : null;
@@ -103,7 +100,7 @@ function createFormSubmitDestinationUrl(action, form, submitter) {
 		if (process.env.NODE_ENV !== "production") console.warn("<Form> only supports file inputs if `action` is a function. File inputs cannot be used if `action` is a string, because files cannot be encoded as search params.");
 		targetUrl.searchParams.append(name, value.name);
 	} else targetUrl.searchParams.append(name, value);
-	return toSameOriginPath(targetUrl.href) ?? targetUrl.href;
+	return targetUrl.href;
 }
 function buildFormData(form, submitter) {
 	if (!submitter) return new FormData(form);
@@ -137,7 +134,7 @@ const Form = forwardRef(function Form(props, ref) {
 	useEffect(() => {
 		if (typeof action !== "string") return;
 		if (prefetch === false || process.env.NODE_ENV !== "production") return;
-		if (!isSafeAction(action)) return;
+		if (!isPrefetchableAction(actionHref)) return;
 		if (!hasAppNavigationRuntime()) return;
 		const node = formRef.current;
 		if (!node) return;
@@ -145,9 +142,13 @@ const Form = forwardRef(function Form(props, ref) {
 		const observer = new IntersectionObserver((entries) => {
 			for (const entry of entries) if (entry.isIntersecting || entry.intersectionRatio > 0) {
 				(async () => {
+					if (isBotUserAgent(window.navigator?.userAgent ?? "")) return;
 					const interceptionContext = getPrefetchInterceptionContext(actionHref);
 					const mountedSlotsHeader = getMountedSlotsHeader();
-					const headers = createRscRequestHeaders({ interceptionContext });
+					const headers = createRscRequestHeaders({
+						interceptionContext,
+						renderMode: APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL
+					});
 					if (mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
 					const rscUrl = await createRscRequestUrl(actionHref, headers);
 					const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
@@ -161,8 +162,8 @@ const Form = forwardRef(function Form(props, ref) {
 						priority: "low",
 						purpose: "prefetch"
 					}), interceptionContext, mountedSlotsHeader, void 0, {
-						cacheForNavigation: true,
-						optimisticRouteShell: false
+						cacheForNavigation: false,
+						optimisticRouteShell: true
 					});
 				})();
 				observer.unobserve(node);
@@ -183,15 +184,7 @@ const Form = forwardRef(function Form(props, ref) {
 		onSubmit,
 		...cleanRest
 	});
-	if (!isSafeAction(action)) {
-		if (process.env.NODE_ENV !== "production") console.warn(`<Form> blocked unsafe action: ${action}`);
-		return /* @__PURE__ */ jsx("form", {
-			ref: setRefs,
-			onSubmit,
-			...cleanRest
-		});
-	}
-	async function handleSubmit(e) {
+	function handleSubmit(e) {
 		if (onSubmit) {
 			onSubmit(e);
 			if (e.defaultPrevented) return;
@@ -204,23 +197,24 @@ const Form = forwardRef(function Form(props, ref) {
 		}
 		const effectiveAction = getEffectiveAction(submitter, actionHref);
 		if (process.env.NODE_ENV !== "production" && submitter?.getAttribute("formaction") !== null) checkFormActionUrl(effectiveAction, "formAction");
-		if (!isSafeAction(effectiveAction)) {
-			if (process.env.NODE_ENV !== "production") console.warn(`<Form> blocked unsafe action: ${effectiveAction}`);
-			e.preventDefault();
-			return;
-		}
-		e.preventDefault();
 		const url = createFormSubmitDestinationUrl(effectiveAction, e.currentTarget, submitter);
-		if (hasAppNavigationRuntime()) await navigateClientSide(url, replace ? "replace" : "push", scroll);
-		else try {
-			const Router = (await import("./router.js")).default;
-			if (replace) await Router.replace(url, void 0, { scroll });
-			else await Router.push(url, void 0, { scroll });
-		} catch {
-			if (replace) window.history.replaceState({}, "", url);
-			else window.history.pushState({}, "", url);
-			window.dispatchEvent(new PopStateEvent("popstate"));
-			if (scroll) window.scrollTo(0, 0);
+		e.preventDefault();
+		if (hasAppNavigationRuntime()) {
+			assertSafeNavigationUrl(url);
+			navigateClientSide(url, replace ? "replace" : "push", scroll);
+		} else {
+			assertSafeNavigationUrl(url);
+			(async () => {
+				let Router;
+				try {
+					Router = (await import("./router.js")).default;
+					if (replace) await Router.replace(url, void 0, { scroll });
+					else await Router.push(url, void 0, { scroll });
+				} catch {
+					if (replace) window.location.replace(url);
+					else window.location.assign(url);
+				}
+			})();
 		}
 	}
 	return /* @__PURE__ */ jsx("form", {
@@ -233,4 +227,4 @@ const Form = forwardRef(function Form(props, ref) {
 	});
 });
 //#endregion
-export { Form as default, useActionState };
+export { createFormSubmitDestinationUrl, Form as default, useActionState };

package/dist/shims/headers.d.ts

@@ -179,6 +179,12 @@ declare function getAndClearPendingCookies(): string[];
  */
 declare function getDraftModeCookieHeader(): string | null;
 declare function isDraftModeRequest(request: Request, draftModeSecret: string): boolean;
+/**
+ * Read the active request's draft-mode state without recording request API usage.
+ * Internal cache implementations use this to bypass persistent reads and writes,
+ * matching Next.js's request-level `workStore.isDraftMode` guard.
+ */
+declare function isDraftModeEnabled(): boolean;
 type DraftModeResult = {
   readonly isEnabled: boolean;
   enable(): void;
@@ -252,4 +258,4 @@ declare class RequestCookies {
   toString(): string;
 }
 //#endregion
-export { HeadersAccessPhase, HeadersContext, type RequestCookies, VinextHeadersShimState, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };
+export { HeadersAccessPhase, HeadersContext, type RequestCookies, VinextHeadersShimState, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/headers.js

@@ -1,7 +1,8 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { FLIGHT_HEADERS, MIDDLEWARE_SET_COOKIE_HEADER, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "../server/middleware-request-headers.js";
+import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
+import { FLIGHT_HEADERS, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
+import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { serializeSetCookie, validateCookieAttributeValue, validateCookieName } from "./internal/cookie-serialize.js";
 import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
@@ -609,6 +610,19 @@ function isDraftModeRequest(request, draftModeSecret) {
 	if (!cookieHeader) return false;
 	return parseEdgeRequestCookieHeader(cookieHeader).get(DRAFT_MODE_COOKIE) === validateDraftModeSecret(draftModeSecret);
 }
+/**
+* Read the active request's draft-mode state without recording request API usage.
+* Internal cache implementations use this to bypass persistent reads and writes,
+* matching Next.js's request-level `workStore.isDraftMode` guard.
+*/
+function isDraftModeEnabled() {
+	const context = _getState().headersContext;
+	if (!context) return false;
+	if (context.draftModeEnabled !== void 0) return context.draftModeEnabled;
+	const secret = context.draftModeSecret;
+	if (secret === void 0) return false;
+	return context.cookies.get(DRAFT_MODE_COOKIE) === validateDraftModeSecret(secret);
+}
 function draftModeCookieAttributes() {
 	if (typeof process !== "undefined" && process.env?.NODE_ENV === "development") return "Path=/; HttpOnly; SameSite=Lax";
 	return "Path=/; HttpOnly; SameSite=None; Secure";
@@ -762,4 +776,4 @@ var RequestCookies = class {
 	}
 };
 //#endregion
-export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };
+export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };