@vinext/cloudflare 1.2.1 → 1.3.1

package/dist/deploy.js

@@ -99,6 +99,7 @@ const deployArgOptions = {
 	env: { type: "string" },
 	name: { type: "string" },
 	config: { type: "string" },
+	"vite-config": { type: "string" },
 	"skip-build": {
 		type: "boolean",
 		default: false
@@ -249,6 +250,7 @@ function parseDeployArgs(args) {
 		env: values.env?.trim() || void 0,
 		name: values.name?.trim() || void 0,
 		config: values.config?.trim() || void 0,
+		viteConfig: values["vite-config"]?.trim() || void 0,
 		skipBuild: values["skip-build"],
 		dryRun: values["dry-run"],
 		verbose: values.verbose,
@@ -339,11 +341,11 @@ async function loadProjectWranglerApi(root) {
 function resolveViteBuildMode(deploymentTool, env) {
 	return deploymentTool === "cf" ? env ?? "production" : "production";
 }
-async function loadDeployViteConfigMetadata(root, mode) {
+async function loadDeployViteConfigMetadata(root, mode, configFile) {
 	const plugins = (await (await loadProjectViteApi(root)).loadConfigFromFile({
 		command: "build",
 		mode
-	}, void 0, root))?.config.plugins;
+	}, configFile, root))?.config.plugins;
 	return {
 		cacheConfig: await findVinextCacheConfigInPlugins(plugins),
 		nextConfig: await findVinextNextConfigInPlugins(plugins),
@@ -351,7 +353,7 @@ async function loadDeployViteConfigMetadata(root, mode) {
 		routeRootConfig: await findVinextRouteRootConfigInPlugins(plugins)
 	};
 }
-async function runBuild(info, env, mode) {
+async function runBuild(info, env, mode, configFile) {
 	console.log("\n  Building for Cloudflare Workers...\n");
 	const { createBuilder } = await loadProjectViteApi(info.root);
 	let completed = false;
@@ -362,6 +364,7 @@ async function runBuild(info, env, mode) {
 		await (await createBuilder({
 			root: info.root,
 			mode,
+			configFile,
 			[VINEXT_BUILD_LIFECYCLE_CONFIG]: invocation
 		})).buildApp();
 	});
@@ -1190,6 +1193,7 @@ async function deploy(options) {
 	if (isPreview && deploymentTool !== "cf") throw new Error("Worker Previews require a cloudflare.config.ts project and the cf CLI.");
 	if (deploymentTool === "cf" && options.name) throw new Error("--name is not supported for cloudflare.config.ts projects. Set `name` in cloudflare.config.ts instead.");
 	const viteMode = resolveViteBuildMode(deploymentTool, deployEnv);
+	const viteConfigFile = options.viteConfig ? path.resolve(root, options.viteConfig) : void 0;
 	const wranglerFallbackEnv = deploymentTool === "cf" ? void 0 : deployEnv;
 	if (!process.env.NODE_ENV) Reflect.set(process.env, "NODE_ENV", "production");
 	loadDotenv({
@@ -1210,16 +1214,25 @@ 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"].filter((value) => Boolean(value));
+	if (viteConfigFile && !fs.existsSync(viteConfigFile)) throw new Error(`Vite config file not found: ${viteConfigFile}`);
+	const hasViteConfig = Boolean(viteConfigFile) || info.hasViteConfig;
+	const missingScaffolding = [!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.`);
 	if (deploymentTool === "cf" && !isCfCliInstalled(root)) throw new Error("Missing deployment dependencies: cf. Run `vinext init --platform=cloudflare` first.");
-	if (info.hasViteConfig && !viteConfigHasCloudflarePlugin(root)) throw new Error(formatMissingCloudflarePluginError({ isAppRouter: info.isAppRouter }));
-	if (info.hasISR && !viteConfigHasCacheAdapter(root) && !workerEntryHasCacheHandler(root)) throw new Error(formatMissingCacheAdapterError({ typedConfig: deploymentTool === "cf" }));
-	if (!viteConfigHasImageAdapter(root)) {
+	if (hasViteConfig && !viteConfigHasCloudflarePlugin(root, viteConfigFile)) throw new Error(formatMissingCloudflarePluginError({
+		isAppRouter: info.isAppRouter,
+		configFile: viteConfigFile,
+		initUpdatesConfig: !viteConfigFile
+	}));
+	if (info.hasISR && !viteConfigHasCacheAdapter(root, viteConfigFile) && !workerEntryHasCacheHandler(root)) throw new Error(formatMissingCacheAdapterError({
+		configFile: viteConfigFile,
+		typedConfig: deploymentTool === "cf"
+	}));
+	if (!viteConfigHasImageAdapter(root, viteConfigFile)) {
 		console.log();
-		console.log(formatImageOptimizationHint(deploymentTool === "cf"));
+		console.log(formatImageOptimizationHint(deploymentTool === "cf", viteConfigFile));
 	}
 	if (options.dryRun) {
 		console.log("\n  Dry run complete. No build or deploy performed.\n");
@@ -1233,7 +1246,7 @@ async function deploy(options) {
 		}));
 		return;
 	}
-	const viteConfigMetadata = await withBuildContext(() => loadDeployViteConfigMetadata(info.root, viteMode));
+	const viteConfigMetadata = await withBuildContext(() => loadDeployViteConfigMetadata(info.root, viteMode, viteConfigFile));
 	const cdnAdapterConfig = resolveCdnAdapterConfig(viteConfigMetadata.cacheConfig);
 	const nextConfig = await withBuildContext(async () => {
 		const inlineNextConfig = viteConfigMetadata.nextConfig;
@@ -1259,7 +1272,7 @@ async function deploy(options) {
 		const replacement = isPreview ? "Preview deployments render these routes on request." : options.warmCdnCache ? "Routes will be rendered and warmed through the staged Worker instead." : "Use --warm-cache to render and warm routes through the deployed Worker instead.";
 		console.warn(`\n  Warning: ${trigger} is ignored by Cloudflare deploy. ${replacement}`);
 	}
-	if (!options.skipBuild) await withBuildContext(() => runBuild(info, cloudflareEnv, viteMode));
+	if (!options.skipBuild) await withBuildContext(() => runBuild(info, cloudflareEnv, viteMode, viteConfigFile));
 	else console.log("\n  Skipping build (--skip-build)");
 	const prerenderOutputDirs = resolvePrerenderOutputDirs(info.root, deploymentTool, viteConfigMetadata.routeRootConfig);
 	const canWarmTpr = options.experimentalTPR && !shouldPrerenderLocally && hasBuildIdentityHeader;

package/dist/previews-deploy.d.ts

@@ -5,5 +5,6 @@ export declare function parsePreviewsDeployArgs(args: string[]): {
   name: string | undefined;
   mode: string | undefined;
   skipBuild: boolean;
+  viteConfig: string | undefined;
 };
 //#endregion

package/dist/previews-deploy.js

@@ -28,7 +28,8 @@ function parsePreviewsDeployArgs(args) {
 			"skip-build": {
 				type: "boolean",
 				default: false
-			}
+			},
+			"vite-config": { type: "string" }
 		}
 	});
 	if (positionals.length > 1) throw new Error("Expected at most one Preview name: previews deploy [preview-name].");
@@ -36,7 +37,8 @@ function parsePreviewsDeployArgs(args) {
 		help: values.help,
 		name: positionals[0] === void 0 ? void 0 : validatePreviewName(positionals[0]),
 		mode: values.mode === void 0 ? void 0 : validateMode(values.mode),
-		skipBuild: values["skip-build"]
+		skipBuild: values["skip-build"],
+		viteConfig: values["vite-config"]?.trim() || void 0
 	};
 }
 //#endregion

package/dist/tpr.js

@@ -102,7 +102,6 @@ function filterTrafficPaths(entries) {
 		if (/\.(js|css|png|jpg|jpeg|gif|svg|ico|woff2?|ttf|eot|map|webp|avif)$/i.test(e.path)) return false;
 		if (e.path.startsWith("/api/")) return false;
 		if (e.path.startsWith("/_next/") || e.path.startsWith("/__vinext/")) return false;
-		if (e.path.endsWith(".rsc")) return false;
 		return true;
 	});
 }

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

@@ -6,5 +6,10 @@
  * helpers in the vinext core).
  */
 export declare function isUnknownRecord(value: unknown): value is Record<string, unknown>;
+/**
+ * When a `"use cache"` entry's generation started (`ctx.timestamp`), which dates
+ * the entry like Next.js does. Absent, malformed or future values fall back to `now`.
+ */
+export declare function readCacheTimestamp(ctx: Record<string, unknown> | undefined, now: number): number;
 export declare function readCacheControlNumberField(ctx: Record<string, unknown> | undefined, field: string): number | undefined;
 //#endregion

package/dist/utils/cache-control-metadata.js

@@ -12,9 +12,17 @@ function readRecordField(ctx, field) {
 	const value = ctx?.[field];
 	return isUnknownRecord(value) ? value : void 0;
 }
+/**
+* When a `"use cache"` entry's generation started (`ctx.timestamp`), which dates
+* the entry like Next.js does. Absent, malformed or future values fall back to `now`.
+*/
+function readCacheTimestamp(ctx, now) {
+	const value = ctx?.timestamp;
+	return typeof value === "number" && Number.isFinite(value) && value > 0 && value <= now ? value : now;
+}
 function readCacheControlNumberField(ctx, field) {
 	const value = readRecordField(ctx, "cacheControl")?.[field] ?? ctx?.[field];
 	return typeof value === "number" ? value : void 0;
 }
 //#endregion
-export { isUnknownRecord, readCacheControlNumberField };
+export { isUnknownRecord, readCacheControlNumberField, readCacheTimestamp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "Cloudflare cache and image adapters for vinext.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",
@@ -48,7 +48,7 @@
     }
   },
   "dependencies": {
-    "@cloudflare/workers-response-store": "1.1.3"
+    "@cloudflare/workers-response-store": "1.1.4"
   },
   "devDependencies": {
     "@types/node": "^25.9.2",
@@ -56,12 +56,12 @@
     "miniflare": "5.20260730.0-alpha",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0",
-    "vinext": "1.3.1"
+    "vinext": "1.4.1"
   },
   "peerDependencies": {
     "@cloudflare/vite-plugin": "*",
     "cf": "*",
-    "vinext": "^1.3.1"
+    "vinext": "^1.4.1"
   },
   "peerDependenciesMeta": {
     "@cloudflare/vite-plugin": {