@vinext/cloudflare 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/deploy.js

@@ -1,8 +1,8 @@
 import { readPrerenderWarmPaths, warmCdnCache } from "./cdn-warm.js";
 import { parseWranglerConfig, runTPR } from "./tpr.js";
 import { formatImageOptimizationHint, formatMissingCacheAdapterError, resolveKvDataAdapterConfig, viteConfigHasCacheAdapter, viteConfigHasCloudflarePlugin, viteConfigHasImageAdapter, workerEntryHasCacheHandler } from "./deploy-config.js";
-import { parseWorkersDevUrl } from "./workers-dev-url.js";
 import { runWranglerDeploymentStatus, runWranglerTriggersDeploy, runWranglerVersionDeploy, runWranglerVersionUpload } from "./version-deploy.js";
+import { parseWorkerDeploymentUrl } from "./worker-deployment-url.js";
 import { buildPrerenderKVPairs } from "./prerender-kv-populate.js";
 import { createRequire } from "node:module";
 import path from "node:path";
@@ -344,7 +344,7 @@ async function runWranglerDeploy(root, options, execute = spawn) {
 			reject(/* @__PURE__ */ new Error(`Wrangler deploy failed with ${exitReason}.`));
 		});
 	});
-	return parseWorkersDevUrl(output) ?? "(URL not detected in wrangler output)";
+	return parseWorkerDeploymentUrl(output) ?? "(URL not detected in wrangler output)";
 }
 async function deployWithCdnWarmup(root, paths, options) {
 	const upload = runWranglerVersionUpload(root, options);

package/dist/prerender-kv-populate.js

@@ -80,7 +80,7 @@ function buildPrerenderKVPairs(serverDir, options) {
 		const revalidateSeconds = typeof route.revalidate === "number" ? route.revalidate : void 0;
 		const expireSeconds = typeof route.expire === "number" ? route.expire : void 0;
 		const expirationTtl = revalidateSeconds === void 0 ? void 0 : ttlSeconds;
-		const tags = buildAppPageCacheTags(cachePathname, []);
+		const tags = buildAppPageCacheTags(cachePathname, route.tags ?? []);
 		const metadata = buildMetadata(tags);
 		const htmlKey = appIsrCacheKey(cachePathname, "html", manifest.buildId);
 		const rscKey = appIsrCacheKey(cachePathname, "rsc", manifest.buildId);

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

@@ -0,0 +1,4 @@
+//#region src/worker-deployment-url.d.ts
+declare function parseWorkerDeploymentUrl(output: string): string | null;
+//#endregion
+export { parseWorkerDeploymentUrl };

package/dist/worker-deployment-url.js

@@ -0,0 +1,23 @@
+import { parseWorkersDevUrl } from "./workers-dev-url.js";
+//#region src/worker-deployment-url.ts
+function parseWorkerDeploymentUrl(output) {
+	return parseWorkersDevUrl(output) ?? parseCustomDomainUrl(output);
+}
+function parseCustomDomainUrl(output) {
+	for (const line of output.split(/\r?\n/)) {
+		const match = /^\s*(\S+)\s+\(custom domain(?: - zone (?:id|name): [^)]+)?\)(?: \[([^\]\r\n]+)\])?\s*$/.exec(line);
+		const hostname = match?.[1];
+		if (!hostname) continue;
+		if (match[2]?.split(",").some((flag) => flag.trim() === "disabled")) continue;
+		try {
+			const url = new URL(`https://${hostname}`);
+			if (url.username !== "" || url.password !== "" || url.port !== "" || url.pathname !== "/" || url.search !== "" || url.hash !== "") continue;
+			return url.origin;
+		} catch {
+			continue;
+		}
+	}
+	return null;
+}
+//#endregion
+export { parseWorkerDeploymentUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "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.2",
     "vite-plus": "0.2.2",
-    "vinext": "1.0.0-beta.2"
+    "vinext": "1.0.0-beta.4"
   },
   "peerDependencies": {
-    "vinext": "^1.0.0-beta.2"
+    "vinext": "^1.0.0-beta.4"
   },
   "engines": {
     "node": ">=22"