@vinext/cloudflare 0.2.0 → 0.2.1

package/dist/cache/kv-data-adapter.runtime.js

@@ -48,6 +48,10 @@ function readStringArrayField(ctx, field) {
 	if (!Array.isArray(value)) return [];
 	return value.filter((item) => typeof item === "string");
 }
+function readPositiveNumberField(ctx, field) {
+	const value = ctx?.[field];
+	return typeof value === "number" && value > 0 ? value : void 0;
+}
 function validUniqueTags(tags) {
 	const result = [];
 	const seen = /* @__PURE__ */ new Set();
@@ -141,7 +145,10 @@ var KVCacheHandler = class {
 			this._deleteInBackground(kvKey);
 			return null;
 		}
-		if (entry.revalidateAt !== null && Date.now() > entry.revalidateAt) return {
+		const now = Date.now();
+		const requestedRevalidate = readPositiveNumberField(_ctx, "revalidate");
+		const requestedRevalidateAt = requestedRevalidate === void 0 ? null : entry.lastModified + requestedRevalidate * 1e3;
+		if (entry.revalidateAt !== null && now > entry.revalidateAt || requestedRevalidateAt !== null && now > requestedRevalidateAt) return {
 			lastModified: entry.lastModified,
 			value: restoredValue,
 			cacheState: "stale",

package/dist/deploy.js

@@ -214,11 +214,7 @@ async function deploy(options) {
 	console.log(`  Project: ${info.projectName}`);
 	console.log(`  Router:  ${info.isAppRouter ? "App Router" : "Pages Router"}`);
 	console.log(`  ISR:     ${info.hasISR ? "detected" : "none"}`);
-	const missingScaffolding = [
-		!info.hasViteConfig && "Vite config",
-		!info.hasWranglerConfig && "Wrangler config",
-		info.isPagesRouter && !info.hasWorkerEntry && "Worker entry"
-	].filter((value) => Boolean(value));
+	const missingScaffolding = [!info.hasViteConfig && "Vite config", !info.hasWranglerConfig && "Wrangler config"].filter((value) => Boolean(value));
 	if (missingScaffolding.length > 0) throw new Error(`Missing Cloudflare deployment setup: ${missingScaffolding.join(", ")}. Run \`vinext init --platform=cloudflare\` first.`);
 	const missingDeps = getMissingDeps(info);
 	if (missingDeps.length > 0) throw new Error(`Missing deployment dependencies: ${missingDeps.map((dependency) => dependency.name).join(", ")}. Run \`vinext init --platform=cloudflare\` first.`);

package/dist/tpr.js

@@ -306,6 +306,25 @@ const PRERENDER_PORT = 19384;
 const SERVER_STARTUP_TIMEOUT = 3e4;
 /** Max concurrent fetch requests during pre-rendering. */
 const FETCH_CONCURRENCY = 10;
+const NON_CACHEABLE_CACHE_CONTROL_RE = /\b(?:no-store|no-cache|private)\b/i;
+function getTprHeader(headers, name) {
+	const normalizedName = name.toLowerCase();
+	for (const [key, value] of Object.entries(headers)) if (key.toLowerCase() === normalizedName) return value;
+}
+function hasNonCacheableCacheControl(headers) {
+	const cacheControl = getTprHeader(headers, "cache-control");
+	return cacheControl ? NON_CACHEABLE_CACHE_CONTROL_RE.test(cacheControl) : false;
+}
+function readTprRevalidateHeader(headers) {
+	const revalidateHeader = getTprHeader(headers, VINEXT_REVALIDATE_HEADER);
+	if (revalidateHeader === void 0) return void 0;
+	return Number(revalidateHeader);
+}
+function isTprCacheable(headers) {
+	if (hasNonCacheableCacheControl(headers)) return false;
+	const revalidate = readTprRevalidateHeader(headers);
+	return revalidate === void 0 || Number.isFinite(revalidate) && revalidate > 0;
+}
 /**
 * Start a local production server, fetch each route to produce HTML,
 * and return the results. Pages that fail to render are skipped.
@@ -333,11 +352,12 @@ async function prerenderRoutes(routes, root, hostDomain) {
 						redirect: "manual"
 					});
 					if (response.status < 400) {
-						const html = await response.text();
 						const headers = {};
 						response.headers.forEach((value, key) => {
 							if (key === "content-type" || key === "cache-control" || key === VINEXT_REVALIDATE_HEADER || key === "location") headers[key] = value;
 						});
+						if (!isTprCacheable(headers)) return;
+						const html = await response.text();
 						results.set(routePath, {
 							html,
 							status: response.status,
@@ -427,10 +447,11 @@ function buildTprKVPairs(entries, buildId, defaultRevalidateSeconds) {
 	const now = Date.now();
 	const pairs = [];
 	for (const [routePath, result] of entries) {
-		const revalidateHeader = result.headers[VINEXT_REVALIDATE_HEADER];
-		const revalidateSeconds = revalidateHeader && !isNaN(Number(revalidateHeader)) ? Number(revalidateHeader) : defaultRevalidateSeconds;
-		const revalidateAt = revalidateSeconds > 0 ? now + revalidateSeconds * 1e3 : null;
-		const kvTtl = revalidateSeconds > 0 ? MAX_KV_TTL_SECONDS : 24 * 3600;
+		if (!isTprCacheable(result.headers)) continue;
+		const revalidateSeconds = readTprRevalidateHeader(result.headers) ?? defaultRevalidateSeconds;
+		if (!Number.isFinite(revalidateSeconds) || revalidateSeconds <= 0) continue;
+		const revalidateAt = now + revalidateSeconds * 1e3;
+		const kvTtl = MAX_KV_TTL_SECONDS;
 		const tags = buildAppPageCacheTags(routePath, []);
 		const entry = {
 			value: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Cloudflare adapters for vinext (KV data cache and Images-backed image optimization).",
   "license": "MIT",
   "repository": {
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@types/node": "^25.9.2",
     "vite-plus": "0.2.1",
-    "vinext": "0.2.0"
+    "vinext": "0.2.1"
   },
   "peerDependencies": {
     "vinext": ">=0.0.0"