@vinext/cloudflare 1.0.0-beta.5 → 1.0.0-beta.6

package/README.md

@@ -7,7 +7,10 @@ This package provides Cloudflare-specific cache and image backends for vinext:
 
 - **`kvDataAdapter()`** (`@vinext/cloudflare/cache/kv-data-adapter`) — backs the
   data cache (`fetch`, `"use cache"`, `unstable_cache`) with a Workers KV
-  namespace. Also used for ISR in the absence of a CDN adapter.
+  namespace.
+- **`cdnAdapter()`** (`@vinext/cloudflare/cache/cdn-adapter`) — delegates
+  page-level ISR serving and revalidation to Cloudflare Workers Cache. This is
+  opt-in and requires Workers Cache to be enabled in Wrangler config.
 - **`imagesOptimizer()`** (`@vinext/cloudflare/images/images-optimizer`) — backs
   `next/image` transformations with a Cloudflare Images binding.
 
@@ -32,6 +35,25 @@ export default defineConfig({
 });
 ```
 
+### Workers Cache
+
+`cdnAdapter()` is optional. Only configure it when Workers Cache is enabled in
+`wrangler.jsonc`:
+
+```jsonc
+{
+  "cache": {
+    "enabled": true,
+  },
+}
+```
+
+```ts
+import { cdnAdapter } from "@vinext/cloudflare/cache/cdn-adapter";
+
+vinext({ cache: { cdn: cdnAdapter() } });
+```
+
 ## Deploy
 
 Deploy Cloudflare Workers projects with the package CLI:

package/dist/cache/cdn-adapter.runtime.d.ts

@@ -11,6 +11,7 @@ declare class CloudflareCdnCacheAdapter implements CdnCacheAdapter {
   /** No-op: the platform caches the response via its headers, not an origin store. */
   set(_key: string, _data: IncrementalCacheValue | null, _ctx?: Record<string, unknown>): Promise<void>;
   buildResponseHeaders(input: CdnCacheableHeaderInput): CdnResponseHeaders;
+  hasExplicitNonCacheableResponsePolicy(headers: Headers): boolean;
   /** Purge edge-cached responses by tag via the request context's `cache.purge`. */
   revalidateTag(tags: string | string[], _durations?: {
     expire?: number;

package/dist/cache/cdn-adapter.runtime.js

@@ -1,5 +1,25 @@
 import { getRequestExecutionContext } from "vinext/shims/request-context";
 //#region src/cache/cdn-adapter.runtime.ts
+const NON_CACHEABLE_DIRECTIVE_RE = /\b(?:private|no-store|no-cache)\b/i;
+const CACHEABLE_EDGE_DIRECTIVE_RE = /(?:^|,)\s*(?:s-maxage|max-age)\s*=/i;
+const EDGE_POLICY_HEADERS = ["CDN-Cache-Control", "Cloudflare-CDN-Cache-Control"];
+/** Remove every response header whose cache semantics are owned by Cloudflare. */
+function clearCloudflareCdnResponseHeaders(cacheControl) {
+	return {
+		"Cache-Control": cacheControl,
+		"CDN-Cache-Control": null,
+		"Cloudflare-CDN-Cache-Control": null,
+		"Cache-Tag": null
+	};
+}
+/** Interpret Cloudflare's edge policy before core applies a replacement policy. */
+function hasExplicitCloudflareNonCacheableResponsePolicy(headers) {
+	const edgePolicies = EDGE_POLICY_HEADERS.map((name) => headers.get(name));
+	if (edgePolicies.some((value) => value && NON_CACHEABLE_DIRECTIVE_RE.test(value))) return true;
+	const hasCacheableEdgePolicy = edgePolicies.some((value) => value && CACHEABLE_EDGE_DIRECTIVE_RE.test(value));
+	const browserPolicy = headers.get("Cache-Control");
+	return Boolean(!hasCacheableEdgePolicy && browserPolicy && NON_CACHEABLE_DIRECTIVE_RE.test(browserPolicy));
+}
 function getWorkersCache() {
 	const cache = getRequestExecutionContext()?.cache;
 	if (cache && typeof cache.purge === "function") return cache;
@@ -72,22 +92,17 @@ var CloudflareCdnCacheAdapter = class {
 	/** No-op: the platform caches the response via its headers, not an origin store. */
 	async set(_key, _data, _ctx) {}
 	buildResponseHeaders(input) {
-		if (!input.cacheControl) return { "Cache-Control": NO_STORE };
-		if (/\b(?:no-store|no-cache|private)\b/.test(input.cacheControl)) return {
-			"Cache-Control": input.cacheControl,
-			"CDN-Cache-Control": null,
-			"Cloudflare-CDN-Cache-Control": null,
-			"Cache-Tag": null
-		};
-		const headers = {
+		if (!input.cacheControl) return clearCloudflareCdnResponseHeaders(NO_STORE);
+		if (/\b(?:no-store|no-cache|private)\b/.test(input.cacheControl)) return clearCloudflareCdnResponseHeaders(input.cacheControl);
+		return {
 			"Cache-Control": BROWSER_REVALIDATE,
-			"CDN-Cache-Control": toEdgeCacheControl(input.cacheControl)
+			"CDN-Cache-Control": toEdgeCacheControl(input.cacheControl),
+			"Cloudflare-CDN-Cache-Control": null,
+			"Cache-Tag": input.tags ? formatCacheTag(input.tags) : null
 		};
-		if (input.tags && input.tags.length > 0) {
-			const cacheTag = formatCacheTag(input.tags);
-			if (cacheTag) headers["Cache-Tag"] = cacheTag;
-		}
-		return headers;
+	}
+	hasExplicitNonCacheableResponsePolicy(headers) {
+		return hasExplicitCloudflareNonCacheableResponsePolicy(headers);
 	}
 	/** Purge edge-cached responses by tag via the request context's `cache.purge`. */
 	async revalidateTag(tags, _durations) {

package/dist/prerender-kv-populate.js

@@ -1,11 +1,11 @@
 import { createKvKeySpace } from "./cache/kv-key.js";
 import path from "node:path";
 import fs from "node:fs";
-import { getRenderedAppRoutes, readPrerenderManifest } from "vinext/internal/server/prerender-manifest";
+import { getRenderedAppRoutes, getRenderedMetadataRoutes, readPrerenderManifest } from "vinext/internal/server/prerender-manifest";
 import { appIsrCacheKey } from "vinext/internal/server/isr-cache";
-import { buildAppPageCacheTags } from "vinext/internal/server/app-page-cache";
+import { buildAppPageCacheTags, buildAppRouteCacheTags } from "vinext/internal/server/app-page-cache";
 import { normalizePregeneratedPathname } from "vinext/internal/server/pregenerated-concrete-paths";
-import { getOutputPath, getRscOutputPath } from "vinext/internal/utils/prerender-output-paths";
+import { getAppRouteOutputPath, getOutputPath, getRscOutputPath } from "vinext/internal/utils/prerender-output-paths";
 //#region src/prerender-kv-populate.ts
 /**
 * Deploy-time KV population for App Router prerendered artifacts.
@@ -111,6 +111,38 @@ function buildPrerenderKVPairs(serverDir, options) {
 		}
 		routeCount++;
 	}
+	for (const route of getRenderedMetadataRoutes(manifest.routes)) {
+		const pathname = route.path ?? route.route;
+		let artifactPath;
+		try {
+			artifactPath = resolveContainedFile(prerenderDir, getAppRouteOutputPath(pathname));
+		} catch (error) {
+			console.warn(`[vinext] Skipping metadata prerender KV seed for ${pathname}: ${formatUnknownError(error)}`);
+			continue;
+		}
+		if (!fs.existsSync(artifactPath)) continue;
+		const cachePathname = normalizePregeneratedPathname(pathname);
+		if (typeof route.revalidate === "number" && route.revalidate <= 0) continue;
+		const revalidateSeconds = typeof route.revalidate === "number" ? route.revalidate : void 0;
+		const expireSeconds = typeof route.expire === "number" ? route.expire : void 0;
+		const staleSeconds = typeof route.stale === "number" && route.stale >= 0 ? route.stale : void 0;
+		const expirationTtl = revalidateSeconds === void 0 ? void 0 : ttlSeconds;
+		const tags = buildAppRouteCacheTags(cachePathname, route.tags ?? [], route.routeSegments ?? []);
+		const metadata = buildMetadata(tags);
+		const routeKey = appIsrCacheKey(cachePathname, "route", manifest.buildId);
+		pairs.push({
+			key: keySpace.entryKey(routeKey),
+			value: buildCacheEntry({
+				kind: "APP_ROUTE",
+				body: fs.readFileSync(artifactPath).toString("base64"),
+				headers: route.headers ?? {},
+				status: route.responseStatus ?? 200
+			}, tags, now, revalidateSeconds, expireSeconds, staleSeconds),
+			...expirationTtl !== void 0 ? { expiration_ttl: expirationTtl } : {},
+			...metadata ? { metadata } : {}
+		});
+		routeCount++;
+	}
 	return {
 		routeCount,
 		pairs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "description": "Cloudflare adapters for vinext (KV data cache and Images-backed image optimization).",
   "license": "MIT",
   "repository": {
@@ -54,10 +54,10 @@
     "@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.5"
+    "vinext": "1.0.0-beta.6"
   },
   "peerDependencies": {
-    "vinext": "^1.0.0-beta.5"
+    "vinext": "^1.0.0-beta.6"
   },
   "engines": {
     "node": ">=22"