@vinext/cloudflare 1.0.0-beta.7 → 1.0.0-beta.8

package/dist/deploy-config.js

@@ -86,13 +86,18 @@ function viteConfigHasCacheAdapter(root) {
 		return true;
 	}
 	const block = extractCacheBlock(content);
-	if (!block) return false;
+	if (!block) {
+		const assigned = /\bcache\s*:\s*([^,}\n]+)/.exec(content)?.[1].trim();
+		return Boolean(assigned && assigned !== "undefined" && assigned !== "null");
+	}
 	return cacheFieldAssigned(block, "cdn") || cacheFieldAssigned(block, "data");
 }
 function isCloudflareCdnAdapterPath(adapter) {
 	const normalized = adapter.replace(/\\/g, "/");
-	const bundledRuntime = fileURLToPath(new URL("./cache/cdn-adapter.runtime.js", import.meta.url)).replace(/\\/g, "/");
-	return normalized === "@vinext/cloudflare/cache/cdn-adapter.runtime" || normalized === "@vinext/cloudflare/cache/cdn-adapter.runtime.js" || normalized === bundledRuntime;
+	return ["cdn-adapter.runtime", "response-store-cdn.runtime"].some((runtime) => {
+		const bundledRuntime = fileURLToPath(new URL(`./cache/${runtime}.js`, import.meta.url)).replace(/\\/g, "/");
+		return normalized === `@vinext/cloudflare/cache/${runtime}` || normalized === `@vinext/cloudflare/cache/${runtime}.js` || normalized === bundledRuntime;
+	});
 }
 function resolveCdnAdapterConfig(cache) {
 	const cdn = cache?.cdn;

package/dist/deploy-help.d.ts

@@ -1,5 +1,4 @@
 //#region src/deploy-help.d.ts
-declare function formatDeployHelp(): string;
-declare function printDeployHelp(): void;
-//#endregion
-export { formatDeployHelp, printDeployHelp };
+export declare function formatDeployHelp(): string;
+export declare function printDeployHelp(): void;
+//#endregion

package/dist/deploy.d.ts

@@ -6,8 +6,8 @@ import { spawn } from "node:child_process";
 import { VinextCacheConfig } from "vinext/internal/config/prerender";
 import { ProjectInfo } from "vinext/internal/utils/project";
 //#region src/deploy.d.ts
-declare const DEFAULT_CDN_WARM_PROMOTION_DELAY_MS = 15000;
-type DeployOptions = {
+export declare const DEFAULT_CDN_WARM_PROMOTION_DELAY_MS = 15000;
+export type DeployOptions = {
   /** Project root directory */
   root: string;
   /** Deploy to preview environment (default: production) */
@@ -73,7 +73,7 @@ type DeployOptions = {
   /** TPR: analytics lookback window in hours (default: 24) */
   tprWindow?: number;
 };
-declare function parseDeployArgs(args: string[]): {
+export declare function parseDeployArgs(args: string[]): {
   help: boolean;
   preview: boolean;
   env: string | undefined;
@@ -119,7 +119,7 @@ declare function parseDeployArgs(args: string[]): {
  *
  * Passing `undefined` is a no-op; the callback runs with `process.env` untouched.
  */
-declare function withCloudflareEnv<T>(env: string | undefined, fn: () => Promise<T>): Promise<T>;
+export declare function withCloudflareEnv<T>(env: string | undefined, fn: () => Promise<T>): Promise<T>;
 type WranglerDeployArgs = {
   args: string[];
   env: string | undefined;
@@ -128,9 +128,9 @@ type WranglerKVBulkPutArgs = {
   args: string[];
   env: string | undefined;
 };
-declare function validateWranglerEnvName(env: string): string;
-declare function buildWranglerDeployArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config">): WranglerDeployArgs;
-declare function buildWranglerKVBulkPutArgs(options: {
+export declare function validateWranglerEnvName(env: string): string;
+export declare function buildWranglerDeployArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config">): WranglerDeployArgs;
+export declare function buildWranglerKVBulkPutArgs(options: {
   binding: string;
   env?: string;
   filePath: string;
@@ -141,28 +141,28 @@ declare function buildWranglerKVBulkPutArgs(options: {
  * Invoking the JavaScript file through `process.execPath` avoids the `.cmd`
  * shim and command shell that package managers create on Windows.
  */
-declare function resolveWranglerBin(root: string, resolvePackageJson?: (root: string) => string | null): string;
-declare function buildNodeCliInvocation(scriptPath: string, args: string[], nodeExecutable?: string): {
+export declare function resolveWranglerBin(root: string, resolvePackageJson?: (root: string) => string | null): string;
+export declare function buildNodeCliInvocation(scriptPath: string, args: string[], nodeExecutable?: string): {
   file: string;
   args: string[];
 };
-declare function buildWranglerInvocation(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config">, nodeExecutable?: string): {
+export declare function buildWranglerInvocation(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config">, nodeExecutable?: string): {
   file: string;
   args: string[];
   env: string | undefined;
 };
-declare function runWranglerKVBulkPut(root: string, options: {
+export declare function runWranglerKVBulkPut(root: string, options: {
   binding: string;
   env?: string;
   pairs: KVBulkPair[];
   tempDir?: string;
 }, execute?: typeof spawn, nodeExecutable?: string): Promise<void>;
-declare function runWranglerDeploy(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config">, execute?: typeof spawn): Promise<string>;
-declare function hasCdnWarmRequests(plan: Omit<CdnWarmRequestPlan, "pagesDataPaths"> & {
+export declare function runWranglerDeploy(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config">, execute?: typeof spawn): Promise<string>;
+export declare function hasCdnWarmRequests(plan: Omit<CdnWarmRequestPlan, "pagesDataPaths"> & {
   pagesDataPaths?: readonly string[];
 }): boolean;
-declare function projectRequiresRouteCacheabilityProbeManifest(project: Pick<ProjectInfo, "isAppRouter" | "isPagesRouter">, cacheConfig: VinextCacheConfig | null): boolean;
-type CdnWarmDeployOptions = Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose" | "warmCdnTarget" | "warmCdnConcurrency" | "warmCdnTimeout" | "warmCdnRetries" | "warmCdnDiscoveryTimeout" | "warmCdnDiscoveryRetries" | "warmCdnProbeTimeout" | "warmCdnProbeRetries" | "warmCdnCertify" | "warmCdnReadinessTimeout" | "warmCdnReadinessRetries" | "warmCdnReadinessProbes" | "warmCdnReadinessProbeDelay" | "dangerouslyPromoteOnCdnWarmError" | "warmCdnPromote" | "warmCdnPromotionDelay"> & Pick<CdnWarmOptions, "deploymentId" | "expectedBuildId" | "expectedRscBuildId" | "loadingShellPaths" | "pagesDataPaths" | "routeHandlerPaths" | "routePatterns" | "rscPaths"> & {
+export declare function projectRequiresRouteCacheabilityProbeManifest(project: Pick<ProjectInfo, "isAppRouter" | "isPagesRouter">, cacheConfig: VinextCacheConfig | null): boolean;
+type CdnWarmDeployOptions = Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose" | "warmCdnTarget" | "warmCdnConcurrency" | "warmCdnTimeout" | "warmCdnRetries" | "warmCdnDiscoveryTimeout" | "warmCdnDiscoveryRetries" | "warmCdnProbeTimeout" | "warmCdnProbeRetries" | "warmCdnCertify" | "warmCdnReadinessTimeout" | "warmCdnReadinessRetries" | "warmCdnReadinessProbes" | "warmCdnReadinessProbeDelay" | "dangerouslyPromoteOnCdnWarmError" | "warmCdnPromote" | "warmCdnPromotionDelay"> & Pick<CdnWarmOptions, "deploymentId" | "expectedBuildId" | "expectedRscBuildId" | "loadingShellPaths" | "pagesDataPaths" | "routeHandlerPaths" | "routePatterns" | "rscPaths" | "statusSource"> & {
   /** Probe a staged Worker and upload the resulting manifest as a second version. */
   cacheabilityProbe?: boolean;
   discoverWarmPlan?: (target: {
@@ -170,13 +170,12 @@ type CdnWarmDeployOptions = Pick<DeployOptions, "preview" | "env" | "name" | "co
     targetUrl: string;
   }) => Promise<PrerenderWarmPlan>;
 };
-declare function deployWithCdnWarmup(root: string, paths: readonly string[], options: CdnWarmDeployOptions): Promise<string>;
-declare function resolveCdnWarmupTargetUrl(root: string, deployedUrl: string | null): string | null;
-declare function resolveCdnWarmupTargetUrl(root: string, deployedUrl: string | null, options: Pick<DeployOptions, "preview" | "env" | "config" | "warmCdnTarget">): string | null;
-declare function getZeroPercentStagingTraffic(deployment: WranglerDeploymentStatus | null, versionId: string): WranglerVersionTraffic[] | null;
+export declare function deployWithCdnWarmup(root: string, paths: readonly string[], options: CdnWarmDeployOptions): Promise<string>;
+export declare function resolveCdnWarmupTargetUrl(root: string, deployedUrl: string | null): string | null;
+export declare function resolveCdnWarmupTargetUrl(root: string, deployedUrl: string | null, options: Pick<DeployOptions, "preview" | "env" | "config" | "warmCdnTarget">): string | null;
+export declare function getZeroPercentStagingTraffic(deployment: WranglerDeploymentStatus | null, versionId: string): WranglerVersionTraffic[] | null;
 type ParsedWranglerConfig = NonNullable<ReturnType<typeof parseWranglerConfig>>;
-declare function resolveWorkerNameForVersionOverride(config: ParsedWranglerConfig | null, options: Pick<DeployOptions, "preview" | "env" | "name">): string | undefined;
-declare function buildVersionOverrideHeaders(workerName: string | undefined, versionId: string): HeadersInit | undefined;
-declare function deploy(options: DeployOptions): Promise<void>;
-//#endregion
-export { DEFAULT_CDN_WARM_PROMOTION_DELAY_MS, DeployOptions, buildNodeCliInvocation, buildVersionOverrideHeaders, buildWranglerDeployArgs, buildWranglerInvocation, buildWranglerKVBulkPutArgs, deploy, deployWithCdnWarmup, getZeroPercentStagingTraffic, hasCdnWarmRequests, parseDeployArgs, projectRequiresRouteCacheabilityProbeManifest, resolveCdnWarmupTargetUrl, resolveWorkerNameForVersionOverride, resolveWranglerBin, runWranglerDeploy, runWranglerKVBulkPut, validateWranglerEnvName, withCloudflareEnv };
+export declare function resolveWorkerNameForVersionOverride(config: ParsedWranglerConfig | null, options: Pick<DeployOptions, "preview" | "env" | "name">): string | undefined;
+export declare function buildVersionOverrideHeaders(workerName: string | undefined, versionId: string): HeadersInit | undefined;
+export declare function deploy(options: DeployOptions): Promise<void>;
+//#endregion

package/dist/deploy.js

@@ -1,6 +1,6 @@
 import { writeCacheabilityManifestArtifact } from "./cacheability-artifact.js";
 import { DEFAULT_CACHEABILITY_PROBE_RETRY_DELAY_MS, probeStagedWorkerCacheability, readPrerenderSecret } from "./cacheability-probe.js";
-import { CdnOperationProgress, createCdnWarmTargets, readPrerenderWarmPlan, waitForCdnWarmTargetReadiness, warmCdnCache } from "./cdn-warm.js";
+import { CdnOperationProgress, createCdnWarmTargets, createPrerenderWarmPlan, waitForCdnWarmTargetReadiness, warmCdnCache } from "./cdn-warm.js";
 import { parseWranglerConfig, runTPR } from "./tpr.js";
 import { VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "./version-headers.js";
 import { formatImageOptimizationHint, formatMissingCacheAdapterError, resolveCdnAdapterConfig, resolveKvDataAdapterConfig, viteConfigHasCacheAdapter, viteConfigHasCloudflarePlugin, viteConfigHasImageAdapter, workerEntryHasCacheHandler } from "./deploy-config.js";
@@ -13,7 +13,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { cacheabilityRoutePathname } from "vinext/internal/server/cacheability-manifest";
 import { setTimeout } from "node:timers/promises";
-import { DEFAULT_REMOTE_PATH_DISCOVERY_PHASE_TIMEOUT_MS, DEFAULT_REMOTE_PATH_DISCOVERY_RETRY_DELAY_MS, emitPrerenderPathManifest } from "vinext/internal/build/prerender-paths";
+import { DEFAULT_REMOTE_PATH_DISCOVERY_PHASE_TIMEOUT_MS, DEFAULT_REMOTE_PATH_DISCOVERY_RETRY_DELAY_MS, discoverPrerenderPathManifest, emitPrerenderPathManifest } from "vinext/internal/build/prerender-paths";
 import os from "node:os";
 import { spawn } from "node:child_process";
 import { parseArgs } from "node:util";
@@ -21,7 +21,7 @@ import { pathToFileURL } from "node:url";
 import { runPrerender } from "vinext/internal/build/run-prerender";
 import { loadDotenv } from "vinext/internal/config/dotenv";
 import { findVinextNextConfigInPlugins, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "vinext/internal/config/next-config";
-import { findVinextCacheConfigInPlugins, findVinextPrerenderConfigInPlugins, findVinextRouteRootConfigInPlugins, formatVinextPrerenderLabel, hasBuildIdentityResponseHeader, hasVerbatimResponseVary, requiresRouteCacheabilityProbeManifest, resolveVinextPrerenderDecision } from "vinext/internal/config/prerender";
+import { findVinextCacheConfigInPlugins, findVinextPrerenderConfigInPlugins, findVinextRouteRootConfigInPlugins, formatVinextPrerenderLabel, hasBuildIdentityResponseHeader, hasUncachedRequestRouting, hasVerbatimResponseVary, isConfiguredCdnResponsePolicyHeader, requiresRouteCacheabilityProbeManifest, resolveVinextPrerenderDecision, supportsCanonicalRscWarmup, usesVinextCacheWarmupStatus } from "vinext/internal/config/prerender";
 import { detectProject, findInNodeModules, formatMissingCloudflarePluginError, getMissingDeps } from "vinext/internal/utils/project";
 import { PHASE_PRODUCTION_BUILD } from "vinext/shims/constants";
 //#region src/deploy.ts
@@ -234,7 +234,8 @@ async function loadProjectWranglerApi(root) {
 	try {
 		wranglerPath = req.resolve("wrangler");
 	} catch {
-		wranglerPath = createRequire(req.resolve("@cloudflare/vite-plugin")).resolve("wrangler");
+		const cloudflarePluginPath = req.resolve("@cloudflare/vite-plugin");
+		wranglerPath = createRequire(cloudflarePluginPath).resolve("wrangler");
 	}
 	return await import(
 		/* @vite-ignore */
@@ -432,6 +433,17 @@ function projectRequiresRouteCacheabilityProbeManifest(project, cacheConfig) {
 function cdnWarmTargetKey(target) {
 	return `${target.kind}\0${target.sourcePathname}`;
 }
+function requiredCdnWarmTargetKeys(plan, optionalTargetKeys) {
+	const keys = /* @__PURE__ */ new Set([
+		...plan.paths.map((pathname) => `html\0${pathname}`),
+		...plan.pagesDataPaths.map((pathname) => `pages-data\0${pathname}`),
+		...(plan.routeHandlerPaths ?? []).map((pathname) => `app-route\0${pathname}`),
+		...plan.rscPaths.map((pathname) => `rsc-full\0${pathname}`),
+		...plan.loadingShellPaths.map((pathname) => `rsc-loading-shell\0${pathname}`)
+	]);
+	if (optionalTargetKeys) for (const key of optionalTargetKeys) keys.delete(key);
+	return keys;
+}
 async function deployWithCdnWarmup(root, paths, options) {
 	if (options.warmCdnTarget !== void 0) options = {
 		...options,
@@ -524,8 +536,10 @@ async function deployUploadedVersionWithCdnWarmup(root, paths, options) {
 		concurrency: options.warmCdnConcurrency,
 		timeoutMs: options.warmCdnTimeout,
 		retries: options.warmCdnRetries,
+		retrySkippedTargetKeys: propagatingTarget && hasPreparedWarmPlan ? requiredCdnWarmTargetKeys(plan, options.optionalWarmTargetKeys) : void 0,
 		requireCacheHit,
-		strict: requireCacheHit || !allowUnverifiedPromotion
+		strict: requireCacheHit || !allowUnverifiedPromotion,
+		statusSource: options.statusSource
 	});
 	const wranglerConfig = parseWranglerConfig(root, options.config);
 	const deploymentStatus = runWranglerDeploymentStatus(root, options);
@@ -577,6 +591,7 @@ async function deployUploadedVersionWithCdnWarmup(root, paths, options) {
 				pagesDataPaths: remainingWarmPlan.pagesDataPaths,
 				paths: remainingWarmPlan.paths,
 				routeHandlerPaths: remainingWarmPlan.routeHandlerPaths,
+				routePatterns: remainingWarmPlan.routePatterns,
 				rscPaths: remainingWarmPlan.rscPaths
 			};
 			const stagedWarmRequests = stagedWarmPlan.paths.length + stagedWarmPlan.pagesDataPaths.length + (stagedWarmPlan.routeHandlerPaths?.length ?? 0) + stagedWarmPlan.rscPaths.length + stagedWarmPlan.loadingShellPaths.length;
@@ -673,7 +688,7 @@ async function deployUploadedVersionWithCdnWarmup(root, paths, options) {
 	}];
 	let promotionAttempted = false;
 	try {
-		if (stagedCacheFilled) {
+		if (stagedCacheFilled && options.statusSource !== "vinext") {
 			const promotionDelay = options.warmCdnPromotionDelay ?? 15e3;
 			if (promotionDelay > 0) {
 				console.log(`  CDN warmup: waiting ${promotionDelay / 1e3} seconds for cache propagation before promotion...`);
@@ -871,8 +886,9 @@ async function deployWithCacheabilityProbe(root, options) {
 			rscPaths: probe.cacheableTargets.filter((target) => target.kind === "rsc-full").map((target) => target.sourcePathname)
 		};
 		assertDeploymentStateUnchanged(root, options, stagedProbeDeployment, "Two-stage CDN warming stopped because Worker deployment traffic or deployment identity changed while cacheability was being probed. No final version was promoted.");
+		const finalConfig = writeCacheabilityManifestArtifact(root, options.config, probe.manifest);
 		const finalUpload = runWranglerVersionUpload(root, {
-			config: writeCacheabilityManifestArtifact(root, options.config, probe.manifest),
+			config: finalConfig,
 			env: options.env,
 			name: options.name,
 			preview: options.preview,
@@ -994,7 +1010,8 @@ async function deploy(options) {
 	const cdnAdapterConfig = resolveCdnAdapterConfig(viteConfigMetadata.cacheConfig);
 	const nextConfig = await withCloudflareEnv(buildEnv, async () => {
 		const inlineNextConfig = viteConfigMetadata.nextConfig;
-		return resolveNextConfig(inlineNextConfig ? await resolveNextConfigInput(inlineNextConfig, PHASE_PRODUCTION_BUILD) : await loadNextConfig(info.root, PHASE_PRODUCTION_BUILD), info.root);
+		const rawNextConfig = inlineNextConfig ? await resolveNextConfigInput(inlineNextConfig, PHASE_PRODUCTION_BUILD) : await loadNextConfig(info.root, PHASE_PRODUCTION_BUILD);
+		return resolveNextConfig(rawNextConfig, info.root);
 	});
 	const vinextPrerenderConfig = !options.prerenderAll && nextConfig.output !== "export" ? viteConfigMetadata.prerenderConfig : null;
 	const prerenderDecision = resolveVinextPrerenderDecision({
@@ -1003,7 +1020,10 @@ async function deploy(options) {
 		nextOutput: nextConfig.output
 	});
 	const hasStrictResponseVary = hasVerbatimResponseVary(viteConfigMetadata.cacheConfig);
+	const hasStagedRequestRouting = hasUncachedRequestRouting(viteConfigMetadata.cacheConfig);
 	const hasBuildIdentityHeader = hasBuildIdentityResponseHeader(viteConfigMetadata.cacheConfig);
+	const hasCanonicalRscWarmup = supportsCanonicalRscWarmup(viteConfigMetadata.cacheConfig);
+	const hasVinextCacheWarmupStatus = usesVinextCacheWarmupStatus(viteConfigMetadata.cacheConfig);
 	const needsCacheabilityProbeManifest = projectRequiresRouteCacheabilityProbeManifest(info, viteConfigMetadata.cacheConfig);
 	const shouldEmitPrerenderPathManifest = !options.skipBuild && prerenderDecision;
 	if (!options.skipBuild) await runBuild(info, buildEnv);
@@ -1034,7 +1054,9 @@ async function deploy(options) {
 		root: info.root,
 		nextConfig,
 		buildIdentity: hasBuildIdentityHeader ? "response-header" : void 0,
+		requestRouting: hasStagedRequestRouting ? "uncached-stage" : void 0,
 		responseVary: hasStrictResponseVary ? "verbatim" : void 0,
+		isResponsePolicyHeader: (name) => isConfiguredCdnResponsePolicyHeader(viteConfigMetadata.cacheConfig, name),
 		routeRootConfig: viteConfigMetadata.routeRootConfig
 	});
 	let ranPrerender = false;
@@ -1047,7 +1069,8 @@ async function deploy(options) {
 		await runPrerender({
 			root: info.root,
 			concurrency: options.prerenderConcurrency,
-			nextConfig
+			nextConfig,
+			routeRootConfig: viteConfigMetadata.routeRootConfig
 		});
 		ranPrerender = true;
 	}
@@ -1078,11 +1101,14 @@ async function deploy(options) {
 		...wranglerOptions,
 		cacheabilityProbe: needsCacheabilityProbeManifest,
 		discoverWarmPlan: async ({ headers, targetUrl }) => {
-			await emitPrerenderPathManifest({
+			const discovery = await discoverPrerenderPathManifest({
 				root: info.root,
 				nextConfig,
 				buildIdentity: hasBuildIdentityHeader ? "response-header" : void 0,
+				includeCanonicalRsc: hasCanonicalRscWarmup,
+				requestRouting: hasStagedRequestRouting ? "uncached-stage" : void 0,
 				responseVary: hasStrictResponseVary ? "verbatim" : void 0,
+				isResponsePolicyHeader: (name) => isConfiguredCdnResponsePolicyHeader(viteConfigMetadata.cacheConfig, name),
 				routeRootConfig: viteConfigMetadata.routeRootConfig,
 				pathDiscoveryTarget: {
 					baseUrl: targetUrl,
@@ -1092,11 +1118,18 @@ async function deploy(options) {
 					retryDelayMs: DEFAULT_REMOTE_PATH_DISCOVERY_RETRY_DELAY_MS
 				}
 			});
-			return readPrerenderWarmPlan(root, {
+			if (!discovery) return {
+				loadingShellPaths: [],
+				paths: [],
+				rscPaths: []
+			};
+			return createPrerenderWarmPlan(root, discovery, {
+				includeCanonicalRsc: hasCanonicalRscWarmup,
 				includeFallbackShells: options.warmCdnIncludeFallbacks,
 				strict: options.warmCdnCertify === true || !options.dangerouslyPromoteOnCdnWarmError
 			});
 		},
+		statusSource: hasVinextCacheWarmupStatus ? "vinext" : "cloudflare",
 		warmCdnConcurrency: options.warmCdnConcurrency,
 		warmCdnTarget,
 		warmCdnTimeout: options.warmCdnTimeout,

package/dist/images/images-optimizer.d.ts

@@ -1,6 +1,6 @@
 //#region src/images/images-optimizer.d.ts
 /** Options accepted by {@link imagesOptimizer}, forwarded to the runtime factory. */
-type ImagesOptimizerOptions = {
+export type ImagesOptimizerOptions = {
   /** Cloudflare Images binding name on the Worker `env`. @default "IMAGES" */
   binding?: string;
 };
@@ -21,9 +21,8 @@ type ImagesOptimizerOptions = {
  *   plugins: [vinext({ images: { optimizer: imagesOptimizer() } })],
  * });
  */
-declare function imagesOptimizer(options?: ImagesOptimizerOptions): {
+export declare function imagesOptimizer(options?: ImagesOptimizerOptions): {
   adapter: string;
   options: ImagesOptimizerOptions | undefined;
 };
-//#endregion
-export { ImagesOptimizerOptions, imagesOptimizer };
+//#endregion

package/dist/prerender-kv-populate.d.ts

@@ -7,13 +7,13 @@
  * KVCacheEntry shape written by KVCacheHandler.set(), and returns Wrangler KV
  * bulk import records for deploy-time upload.
  */
-type KVBulkPair = {
+export type KVBulkPair = {
   key: string;
   value: string;
   expiration_ttl?: number;
   metadata?: Record<string, unknown>;
 };
-declare function buildPrerenderKVPairs(serverDir: string, options?: {
+export declare function buildPrerenderKVPairs(serverDir: string, options?: {
   appPrefix?: string;
   now?: number;
   ttlSeconds?: number;
@@ -21,5 +21,4 @@ declare function buildPrerenderKVPairs(serverDir: string, options?: {
   routeCount: number;
   pairs: KVBulkPair[];
 };
-//#endregion
-export { KVBulkPair, buildPrerenderKVPairs };
+//#endregion

package/dist/prerender-kv-populate.js

@@ -16,7 +16,7 @@ import { getAppRouteOutputPath, getOutputPath, getRscOutputPath } from "vinext/i
 * bulk import records for deploy-time upload.
 */
 /** Default KV expiration TTL used by KVCacheHandler for revalidating entries. */
-const DEFAULT_KV_TTL_SECONDS = 720 * 3600;
+const DEFAULT_KV_TTL_SECONDS = 2592e3;
 function resolveContainedFile(rootDir, relativePath) {
 	const resolvedRoot = path.resolve(rootDir);
 	const resolvedFile = path.resolve(resolvedRoot, relativePath);
@@ -48,7 +48,8 @@ function buildMetadata(tags) {
 	return JSON.stringify(metadata).length <= 1024 ? metadata : void 0;
 }
 function buildPrerenderKVPairs(serverDir, options) {
-	const manifest = readPrerenderManifest(path.join(serverDir, "vinext-prerender.json"));
+	const manifestPath = path.join(serverDir, "vinext-prerender.json");
+	const manifest = readPrerenderManifest(manifestPath);
 	if (!manifest?.buildId || !Array.isArray(manifest.routes)) return {
 		routeCount: 0,
 		pairs: []

package/dist/tpr.d.ts

@@ -20,7 +20,7 @@
  * gracefully skips when no custom domain, no API token, no traffic data,
  * or no KV namespace is configured.
  */
-type TPROptions = {
+export type TPROptions = {
   /** Project root directory. */
   root: string;
   /** Wrangler config path, relative to root unless absolute. */
@@ -32,7 +32,7 @@ type TPROptions = {
   /** Analytics lookback window in hours. Default: 24. */
   window: number;
 };
-type TPRResult = {
+export type TPRResult = {
   /** Total unique page paths found in analytics. */
   totalPaths: number;
   /** Number of pages successfully pre-rendered and uploaded. */
@@ -57,7 +57,7 @@ type WranglerConfig = {
   legacyEnv?: boolean;
   env?: Record<string, WranglerEnvironmentConfig>;
 };
-type WranglerEnvironmentConfig = {
+export type WranglerEnvironmentConfig = {
   customDomain?: string;
   name?: string;
 };
@@ -65,7 +65,7 @@ type WranglerEnvironmentConfig = {
  * Parse wrangler config (JSONC or TOML) to extract the fields TPR needs:
  * account_id, VINEXT_KV_CACHE KV namespace ID, and custom domain.
  */
-declare function parseWranglerConfig(root: string, configPath?: string): WranglerConfig | null;
+export declare function parseWranglerConfig(root: string, configPath?: string): WranglerConfig | null;
 /**
  * Generate zone lookup candidates from shortest (2-part) to longest.
  * Tries the most common case first (e.g., "example.com") and progressively
@@ -75,8 +75,8 @@ declare function parseWranglerConfig(root: string, configPath?: string): Wrangle
  * "shop.example.co.uk"  → ["co.uk", "example.co.uk", "shop.example.co.uk"]
  * "example.com"         → ["example.com"]
  */
-declare function domainCandidates(domain: string): string[];
-declare function resolveVinextProdServerPath(root: string): string;
+export declare function domainCandidates(domain: string): string[];
+export declare function resolveVinextProdServerPath(root: string): string;
 /**
  * Build KV bulk API pairs from pre-rendered entries.
  *
@@ -84,7 +84,7 @@ declare function resolveVinextProdServerPath(root: string): string;
  *   createKvKeySpace().entryKey(isrCacheKey("app", pathname, buildId) + ":html")
  *   → "cache:app:<buildId>:<pathname>:html"
  */
-declare function buildTprKVPairs(entries: Map<string, PrerenderResult>, buildId: string | undefined, defaultRevalidateSeconds: number): Array<{
+export declare function buildTprKVPairs(entries: Map<string, PrerenderResult>, buildId: string | undefined, defaultRevalidateSeconds: number): Array<{
   key: string;
   value: string;
   expiration_ttl: number;
@@ -96,6 +96,5 @@ declare function buildTprKVPairs(entries: Map<string, PrerenderResult>, buildId:
  * `vinext-cloudflare deploy` pipeline. Gracefully skips (never errors) when
  * the prerequisites aren't met.
  */
-declare function runTPR(options: TPROptions): Promise<TPRResult>;
-//#endregion
-export { TPROptions, TPRResult, WranglerEnvironmentConfig, buildTprKVPairs, domainCandidates, parseWranglerConfig, resolveVinextProdServerPath, runTPR };
+export declare function runTPR(options: TPROptions): Promise<TPRResult>;
+//#endregion

package/dist/tpr.js

@@ -573,7 +573,7 @@ async function waitForServer(port, timeoutMs) {
 /** KV bulk API accepts up to 10,000 pairs per request */
 const KV_BATCH_SIZE = 1e4;
 /** Maximum KV expiration TTL: 30 days */
-const MAX_KV_TTL_SECONDS = 720 * 3600;
+const MAX_KV_TTL_SECONDS = 2592e3;
 /**
 * Build KV bulk API pairs from pre-rendered entries.
 *

package/dist/utils/cache-control-metadata.d.ts

@@ -5,7 +5,6 @@
  * so the Cloudflare adapters stay self-contained (these mirror the equivalent
  * helpers in the vinext core).
  */
-declare function isUnknownRecord(value: unknown): value is Record<string, unknown>;
-declare function readCacheControlNumberField(ctx: Record<string, unknown> | undefined, field: string): number | undefined;
-//#endregion
-export { isUnknownRecord, readCacheControlNumberField };
+export declare function isUnknownRecord(value: unknown): value is Record<string, unknown>;
+export declare function readCacheControlNumberField(ctx: Record<string, unknown> | undefined, field: string): number | undefined;
+//#endregion

package/dist/version-deploy.d.ts

@@ -2,21 +2,21 @@ import { parseWorkersDevUrl } from "./workers-dev-url.js";
 import { DeployOptions } from "./deploy.js";
 import { execFileSync } from "node:child_process";
 //#region src/version-deploy.d.ts
-type WranglerVersionUploadResult = {
+export type WranglerVersionUploadResult = {
   versionId: string;
   previewUrl: string | null;
   workerName: string | null;
   output: string;
 };
-type WranglerVersionDeployResult = {
+export type WranglerVersionDeployResult = {
   deployedUrl: string | null;
   output: string;
 };
-type WranglerVersionTraffic = {
+export type WranglerVersionTraffic = {
   versionId: string;
   percentage: number;
 };
-type WranglerDeploymentStatus = {
+export type WranglerDeploymentStatus = {
   deploymentId: string | null;
   versions: WranglerVersionTraffic[];
   output: string;
@@ -25,21 +25,21 @@ type WranglerVersionArgs = {
   args: string[];
   env: string | undefined;
 };
-declare function parseVersionId(output: string): string | null;
-declare function parseUploadedWorkerName(output: string): string | null;
-declare function parseWranglerVersionUploadOutput(output: string): WranglerVersionUploadResult;
-declare function buildWranglerVersionUploadArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose"> & {
+export declare function parseVersionId(output: string): string | null;
+export declare function parseUploadedWorkerName(output: string): string | null;
+export declare function parseWranglerVersionUploadOutput(output: string): WranglerVersionUploadResult;
+export declare function buildWranglerVersionUploadArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose"> & {
   previewAlias?: string;
 }): WranglerVersionArgs;
-declare function buildWranglerVersionDeployArgs(versionTraffic: readonly WranglerVersionTraffic[], options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
-declare function buildWranglerDeploymentsStatusArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
-declare function buildWranglerTriggersDeployArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
-declare function parseWranglerDeploymentStatusOutput(output: string): WranglerDeploymentStatus;
-declare function runWranglerVersionUpload(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose"> & {
+export declare function buildWranglerVersionDeployArgs(versionTraffic: readonly WranglerVersionTraffic[], options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
+export declare function buildWranglerDeploymentsStatusArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
+export declare function buildWranglerTriggersDeployArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
+export declare function parseWranglerDeploymentStatusOutput(output: string): WranglerDeploymentStatus;
+export declare function runWranglerVersionUpload(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose"> & {
   previewAlias?: string;
 }, execute?: typeof execFileSync): WranglerVersionUploadResult;
-declare function runWranglerVersionDeploy(root: string, versionTraffic: readonly WranglerVersionTraffic[], options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, phase?: "stage" | "promote-warmed" | "promote-uploaded", execute?: typeof execFileSync): WranglerVersionDeployResult;
-declare function runWranglerDeploymentStatus(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, execute?: typeof execFileSync): WranglerDeploymentStatus;
-declare function runWranglerTriggersDeploy(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, execute?: typeof execFileSync): WranglerVersionDeployResult;
+export declare function runWranglerVersionDeploy(root: string, versionTraffic: readonly WranglerVersionTraffic[], options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, phase?: "stage" | "promote-warmed" | "promote-uploaded", execute?: typeof execFileSync): WranglerVersionDeployResult;
+export declare function runWranglerDeploymentStatus(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, execute?: typeof execFileSync): WranglerDeploymentStatus;
+export declare function runWranglerTriggersDeploy(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, execute?: typeof execFileSync): WranglerVersionDeployResult;
 //#endregion
-export { WranglerDeploymentStatus, WranglerVersionDeployResult, WranglerVersionTraffic, WranglerVersionUploadResult, buildWranglerDeploymentsStatusArgs, buildWranglerTriggersDeployArgs, buildWranglerVersionDeployArgs, buildWranglerVersionUploadArgs, parseUploadedWorkerName, parseVersionId, parseWorkersDevUrl, parseWranglerDeploymentStatusOutput, parseWranglerVersionUploadOutput, runWranglerDeploymentStatus, runWranglerTriggersDeploy, runWranglerVersionDeploy, runWranglerVersionUpload };
+export { parseWorkersDevUrl };

package/dist/version-deploy.js

@@ -133,7 +133,8 @@ function buildWranglerTriggersDeployArgs(options) {
 	};
 }
 function runWranglerCommand(root, args, execute = execFileSync, verbose = false) {
-	const invocation = buildNodeCliInvocation(resolveWranglerBin(root), args);
+	const wranglerBin = resolveWranglerBin(root);
+	const invocation = buildNodeCliInvocation(wranglerBin, args);
 	const execOpts = {
 		cwd: root,
 		stdio: "pipe",
@@ -219,8 +220,10 @@ function runWranglerVersionDeploy(root, versionTraffic, options, phase = "promot
 }
 function runWranglerDeploymentStatus(root, options, execute = execFileSync) {
 	const { args, env } = buildWranglerDeploymentsStatusArgs(options);
-	if (options.verbose) if (env) console.log(`\n  Reading current Worker deployment for env: ${env}...`);
-	else console.log("\n  Reading current Worker deployment...");
+	if (options.verbose) {
+		if (env) console.log(`\n  Reading current Worker deployment for env: ${env}...`);
+		else console.log("\n  Reading current Worker deployment...");
+	}
 	return parseWranglerDeploymentStatusOutput(runWranglerCommand(root, args, execute, options.verbose === true));
 }
 function runWranglerTriggersDeploy(root, options, execute = execFileSync) {

package/dist/worker-deployment-url.d.ts

@@ -1,10 +1,9 @@
 //#region src/worker-deployment-url.d.ts
-declare function parseWorkerDeploymentUrl(output: string): string | null;
+export declare function parseWorkerDeploymentUrl(output: string): string | null;
 /**
  * Parse the concrete hostname that Wrangler reports after applying Worker
  * triggers. Catch-all routes are valid warmup targets even though they are not
  * canonical deployment URLs for general CLI reporting.
  */
-declare function parseCdnWarmupDeploymentUrl(output: string): string | null;
-//#endregion
-export { parseCdnWarmupDeploymentUrl, parseWorkerDeploymentUrl };
+export declare function parseCdnWarmupDeploymentUrl(output: string): string | null;
+//#endregion

package/dist/workers-dev-url.d.ts

@@ -1,4 +1,3 @@
 //#region src/workers-dev-url.d.ts
-declare function parseWorkersDevUrl(output: string): string | null;
-//#endregion
-export { parseWorkersDevUrl };
+export declare function parseWorkersDevUrl(output: string): string | null;
+//#endregion

package/dist/wrangler-version-metadata.d.ts

@@ -1,8 +1,7 @@
 //#region src/wrangler-version-metadata.d.ts
-declare function assertCdnVersionMetadataConfig({ binding, configuredBinding, configPath }: {
+export declare function assertCdnVersionMetadataConfig({ binding, configuredBinding, configPath }: {
   binding: string;
   configuredBinding: string | undefined;
   configPath: string | undefined;
 }): void;
-//#endregion
-export { assertCdnVersionMetadataConfig };
+//#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "1.0.0-beta.7",
-  "description": "Cloudflare adapters for vinext (KV data cache and Images-backed image optimization).",
+  "version": "1.0.0-beta.8",
+  "description": "Cloudflare cache and image adapters for vinext.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",
   "repository": {
@@ -51,20 +51,26 @@
       "import": "./dist/images/*.js"
     }
   },
+  "dependencies": {
+    "@cloudflare/workers-response-store": "0.1.0-beta.0"
+  },
   "devDependencies": {
     "@types/node": "^25.9.2",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.2.6",
-    "vite-plus": "0.2.6",
-    "vinext": "1.0.0-beta.9"
+    "miniflare": "5.20260730.0-alpha",
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.3.2",
+    "vite-plus": "0.3.2",
+    "vitest": "4.1.11",
+    "vinext": "1.0.0-beta.10"
   },
   "peerDependencies": {
-    "vinext": "^1.0.0-beta.9"
+    "vinext": "^1.0.0-beta.10"
   },
   "engines": {
     "node": ">=22"
   },
   "scripts": {
     "build": "vp pack",
-    "dev": "vp pack --watch"
+    "dev": "vp pack --watch",
+    "test": "vp run vinext#build && vp run @cloudflare/workers-response-store#build && vp run @vinext/cloudflare#build && VINEXT_RESPONSE_STORE_MODE=self-contained pnpm --filter response-store-demo run build && pnpm --filter response-store-demo run build && vitest run"
   }
 }