void 0.26.0 → 0.27.0

package/dist/{cancel-deploy-mZsD88Xa.mjs → cancel-deploy-CQ3NnMvf.mjs}

@@ -1,7 +1,8 @@
-import { r as readProjectConfig } from "./project-DQstYTxO.mjs";
-import { c as getToken } from "./auth-D52yG7hl.mjs";
-import { A as confirm, H as outro, L as log, tt as isCancel } from "./prompts-6OSVA7DJ.mjs";
-import { r as PlatformClient } from "./client-mC-dFGDD.mjs";
+import { r as readProjectConfig } from "./project-BAm2aB6Q.mjs";
+import { c as getToken } from "./auth-Dn2vw-SG.mjs";
+import { A as confirm, H as outro, L as log, tt as isCancel } from "./dist-D3m88sjf.mjs";
+import { d as printSuccess } from "./output-C50ag2r3.mjs";
+import { r as PlatformClient } from "./client-DlDJuY0s.mjs";
 //#region src/cli/cancel-deploy.ts
 const ACTIVE_STATUSES = /* @__PURE__ */ new Set([
 	"pending",
@@ -48,7 +49,7 @@ async function runCancelDeployCommand(root, deployId) {
 		return;
 	}
 	await client.cancelDeployment(linked.projectId, target.id);
-	outro(`Cancellation requested for deployment ${target.id}.`);
+	printSuccess(`Cancellation requested for deployment ${target.id}.`);
 }
 function formatDeployment(deployment) {
 	const suffix = deployment.commit ? ` (${deployment.commit.slice(0, 7)})` : "";

package/dist/{cf-access-YTlqvAsk.mjs → cf-access-BcIBSKqG.mjs}

@@ -1,4 +1,4 @@
-import { T as writeKeyringPassword, c as normalizePlatformApiUrl, u as platformCredentialAccount, w as readKeyringPassword } from "./platform-registry-P387v42A.mjs";
+import { T as writeKeyringPassword, c as normalizePlatformApiUrl, u as platformCredentialAccount, w as readKeyringPassword } from "./platform-registry-Cjv2Qf0r.mjs";
 import { t as cfAccessHeaders } from "./cf-access-TWNzXltp.mjs";
 import { spawnSync } from "node:child_process";
 //#region src/cli/cf-access.ts
@@ -12,23 +12,22 @@ function usableToken(token) {
 		return false;
 	}
 }
+function readOriginCredentials(raw) {
+	const parsed = JSON.parse(raw);
+	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("platform: VOID_ACCESS_CREDENTIALS must contain an origin-keyed JSON object.");
+	return parsed;
+}
 function rememberOriginToken(origin, token) {
-	let entries = {};
-	if (process.env.VOID_ACCESS_CREDENTIALS) {
-		const parsed = JSON.parse(process.env.VOID_ACCESS_CREDENTIALS);
-		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("platform: VOID_ACCESS_CREDENTIALS must contain an origin-keyed JSON object.");
-		entries = parsed;
-	}
+	const raw = process.env.VOID_ACCESS_CREDENTIALS;
 	process.env.VOID_ACCESS_CREDENTIALS = JSON.stringify({
-		...entries,
+		...raw ? readOriginCredentials(raw) : {},
 		[origin]: { CF_ACCESS_TOKEN: token }
 	});
 }
 function forgetOriginToken(origin) {
-	if (!process.env.VOID_ACCESS_CREDENTIALS) return;
-	const parsed = JSON.parse(process.env.VOID_ACCESS_CREDENTIALS);
-	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("platform: VOID_ACCESS_CREDENTIALS must contain an origin-keyed JSON object.");
-	const entries = { ...parsed };
+	const raw = process.env.VOID_ACCESS_CREDENTIALS;
+	if (!raw) return;
+	const entries = { ...readOriginCredentials(raw) };
 	delete entries[origin];
 	process.env.VOID_ACCESS_CREDENTIALS = JSON.stringify(entries);
 }

package/dist/{cf-build-output-U8o1Gl6X.mjs → cf-build-output-DjvB_872.mjs}

@@ -1,6 +1,7 @@
 import { a as join, i as isAbsolute, l as relative, n as dirname, r as extname, t as basename, u as resolve } from "./dist-BVqXeR_h.mjs";
 import { copyFileSync, cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import { isRecord } from "@void/deploy-core";
 import { randomUUID } from "node:crypto";
 import { tmpdir } from "node:os";
 import { isDeepStrictEqual } from "node:util";
@@ -10,7 +11,7 @@ import { InputConfigSchema, OutputContainerSchema } from "@cloudflare/config";
 import ignore from "ignore";
 //#region src/cli/cf-config-migrate.ts
 function record(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+	return isRecord(value) ? value : null;
 }
 function empty(value) {
 	return value === void 0 || value === null || Array.isArray(value) && value.length === 0 || record(value) !== null && Object.keys(value).length === 0;
@@ -61,7 +62,7 @@ function applyPreservationFlags(raw, worker) {
 	};
 }
 function applyWorkflows(raw, worker) {
-	if (raw.workflows === void 0 || empty(raw.workflows)) return;
+	if (empty(raw.workflows)) return;
 	if (!Array.isArray(raw.workflows)) throw new Error("Invalid Workflow bindings in the built Cloudflare config.");
 	const env = record(worker.env) ?? {};
 	const exports = record(worker.exports) ?? {};
@@ -114,6 +115,7 @@ function uncredentialedEnvironment() {
 function assertHandledFollowUps(followUps) {
 	for (const item of followUps) {
 		if (!item.blocking) continue;
+		if (item.code === "vite-plugin-install-disabled" && item.sourcePath === void 0) continue;
 		const path = item.sourcePath ?? item.code;
 		if (!(path === "assets.directory" && item.message.includes("assets directory") || /^d1_databases\.\d+$/.test(path) && /`migrations_(?:dir|table)`/.test(item.message) || /^durable_objects\.bindings\.\d+$/.test(path) || path === "migrations" || path === "containers")) throw new Error(`cf cannot migrate Cloudflare setting ${path}: ${item.message}`);
 	}
@@ -295,9 +297,9 @@ function migrateBuiltWranglerConfig(raw) {
 					class_name: className
 				};
 			}
+			result.containers = containers;
 		}
 		if (Object.keys(exports).length > 0) worker.exports = exports;
-		if (containers.length > 0) result.containers = containers;
 		return InputConfigSchema.parse(result);
 	} finally {
 		rmSync(directory, {
@@ -339,9 +341,6 @@ async function buildContainerImage(dockerfile, buildContext = dirname(dockerfile
 }
 //#endregion
 //#region src/cli/cf-build-output.ts
-function object(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
-}
 const moduleTypes = {
 	".js": "esm",
 	".mjs": "esm",
@@ -359,6 +358,11 @@ const moduleTypes = {
 	".json": "json",
 	".map": "sourcemap"
 };
+/** Whether `path` resolves strictly inside `directory`. */
+function isInside(directory, path) {
+	const child = relative(directory, path);
+	return child !== "" && child !== ".." && !child.startsWith("../") && !isAbsolute(child);
+}
 function copyBundle(source, destination) {
 	const modules = {};
 	for (const entry of readdirSync(source, {
@@ -367,11 +371,7 @@ function copyBundle(source, destination) {
 	})) {
 		if (!entry.isFile() && !entry.isSymbolicLink()) continue;
 		const absolute = join(entry.parentPath, entry.name);
-		if (entry.isSymbolicLink()) {
-			const target = realpathSync(absolute);
-			const targetRelative = relative(realpathSync(source), target).replace(/\\/g, "/");
-			if (!targetRelative || targetRelative === ".." || targetRelative.startsWith("../") || isAbsolute(targetRelative)) throw new Error("The built Worker contains a symlink outside its output directory.");
-		}
+		if (entry.isSymbolicLink() && !isInside(realpathSync(source), realpathSync(absolute))) throw new Error("The built Worker contains a symlink outside its output directory.");
 		const name = relative(source, absolute);
 		if (name === "wrangler.json" || name === ".dev.vars" || name === join(".vite", "manifest.json") || name.endsWith(".css") || name.endsWith(".css.map")) continue;
 		const type = moduleTypes[extname(entry.name).toLowerCase()];
@@ -387,7 +387,7 @@ function copyBundle(source, destination) {
 /** Create a private cf Build Output tree from Void's verified Vite artifact. */
 async function prepareCfBuildOutput(workerDirectory, accountId) {
 	const source = resolve(workerDirectory);
-	const raw = object(JSON.parse(readFileSync(join(source, "wrangler.json"), "utf8")));
+	const raw = record(JSON.parse(readFileSync(join(source, "wrangler.json"), "utf8")));
 	if (!raw) return null;
 	if (typeof raw.account_id === "string" && raw.account_id !== accountId) return null;
 	const config = migrateBuiltWranglerConfig(raw);
@@ -395,23 +395,23 @@ async function prepareCfBuildOutput(workerDirectory, accountId) {
 	if (typeof raw.main !== "string" || !raw.main) throw new Error("The built Worker configuration is missing its main entry. Rebuild the app.");
 	const entry = raw.main.replaceAll("\\", "/");
 	const main = relative(source, resolve(source, entry));
-	if (isAbsolute(entry) || /^[a-z]:/i.test(entry) || !main || main === ".." || main.startsWith("../")) throw new Error("The built Worker main entry must be inside its output directory.");
+	if (isAbsolute(entry) || /^[a-z]:/i.test(entry) || !isInside(source, resolve(source, entry))) throw new Error("The built Worker main entry must be inside its output directory.");
 	if (!existsSync(join(source, main))) throw new Error(`The built Worker main entry ${JSON.stringify(main)} is missing. Rebuild the app.`);
-	const assetsDirectory = object(raw.assets)?.directory;
+	const assetsDirectory = record(raw.assets)?.directory;
 	if (assetsDirectory !== void 0 && typeof assetsDirectory !== "string") return null;
 	const images = [];
 	const directory = mkdtempSync(join(tmpdir(), "void-cf-deploy-"));
+	const dispose = async () => {
+		rmSync(directory, {
+			recursive: true,
+			force: true
+		});
+		await Promise.all(images.map((image) => image.dispose()));
+	};
 	try {
 		const bundle = getWorkerBundleDir(directory);
 		mkdirSync(bundle, { recursive: true });
 		const modules = copyBundle(source, bundle);
-		if (!modules) {
-			rmSync(directory, {
-				recursive: true,
-				force: true
-			});
-			return null;
-		}
 		await writeRootConfig(directory, { accountId }, {
 			isPreview: false,
 			mode: "production"
@@ -445,11 +445,7 @@ async function prepareCfBuildOutput(workerDirectory, accountId) {
 		if (typeof assetsDirectory === "string") {
 			const assetPath = resolve(source, assetsDirectory);
 			if (!existsSync(assetPath)) {
-				rmSync(directory, {
-					recursive: true,
-					force: true
-				});
-				await Promise.all(images.map((image) => image.dispose()));
+				await dispose();
 				return null;
 			}
 			await writeAssets({
@@ -461,30 +457,16 @@ async function prepareCfBuildOutput(workerDirectory, accountId) {
 		return {
 			directory,
 			...typeof assetsDirectory === "string" ? { assetsDirectory: resolve(source, assetsDirectory) } : {},
-			dispose: async () => {
-				rmSync(directory, {
-					recursive: true,
-					force: true
-				});
-				await Promise.all(images.map((image) => image.dispose()));
-			}
+			dispose
 		};
 	} catch (error) {
-		rmSync(directory, {
-			recursive: true,
-			force: true
-		});
-		await Promise.all(images.map((image) => image.dispose()));
+		await dispose();
 		throw error;
 	}
 }
-/** Bundle Void's generated thin static Worker before handing it to cf as prebuilt output. */
-async function prepareCfStaticBuildOutput(options) {
-	const raw = object(JSON.parse(readFileSync(options.configPath, "utf8")));
-	if (!raw || typeof raw.main !== "string" || basename(raw.main) !== raw.main) return null;
-	const entry = join(dirname(options.configPath), raw.main);
-	if (!existsSync(entry)) return null;
-	const scratch = mkdtempSync(join(tmpdir(), "void-cf-static-"));
+/** Bundle a generated Worker entry with Vite, then hand the result to `prepareCfBuildOutput`. */
+async function prepareBundledBuildOutput(options) {
+	const scratch = mkdtempSync(join(tmpdir(), options.scratchPrefix));
 	try {
 		const { build } = await import("vite");
 		await build({
@@ -496,20 +478,18 @@ async function prepareCfStaticBuildOutput(options) {
 				outDir: scratch,
 				emptyOutDir: true,
 				lib: {
-					entry,
+					entry: options.entry,
 					formats: ["es"],
 					fileName: "index"
 				},
+				...options.external ? { rollupOptions: { external: options.external } } : {},
 				target: "es2022"
 			}
 		});
 		writeFileSync(join(scratch, "wrangler.json"), JSON.stringify({
-			...raw,
+			...options.config,
 			main: "index.js",
-			assets: {
-				...object(raw.assets),
-				directory: resolve(options.assetsDirectory)
-			}
+			assets: options.assets
 		}), { mode: 384 });
 		return await prepareCfBuildOutput(scratch, options.accountId);
 	} finally {
@@ -519,16 +499,33 @@ async function prepareCfStaticBuildOutput(options) {
 		});
 	}
 }
+/** Bundle Void's generated thin static Worker before handing it to cf as prebuilt output. */
+async function prepareCfStaticBuildOutput(options) {
+	const raw = record(JSON.parse(readFileSync(options.configPath, "utf8")));
+	if (!raw || typeof raw.main !== "string" || basename(raw.main) !== raw.main) return null;
+	const entry = join(dirname(options.configPath), raw.main);
+	if (!existsSync(entry)) return null;
+	return prepareBundledBuildOutput({
+		projectRoot: options.projectRoot,
+		entry,
+		scratchPrefix: "void-cf-static-",
+		config: raw,
+		assets: {
+			...record(raw.assets),
+			directory: resolve(options.assetsDirectory)
+		},
+		accountId: options.accountId
+	});
+}
 /** Bundle an adapter-produced Worker and copy only its public framework assets. */
 async function prepareCfFrameworkBuildOutput(options) {
-	const raw = object(JSON.parse(readFileSync(options.configPath, "utf8")));
-	const assets = object(raw?.assets);
+	const raw = record(JSON.parse(readFileSync(options.configPath, "utf8")));
+	const assets = record(raw?.assets);
 	if (!raw || typeof raw.main !== "string" || typeof assets?.directory !== "string") return null;
 	const configDirectory = dirname(options.configPath);
 	const entry = resolve(configDirectory, raw.main);
 	const sourceAssets = resolve(configDirectory, assets.directory);
 	if (!existsSync(entry) || !existsSync(sourceAssets)) return null;
-	const scratch = mkdtempSync(join(tmpdir(), "void-cf-framework-"));
 	const publicAssets = mkdtempSync(join(tmpdir(), "void-cf-framework-assets-"));
 	try {
 		const ignored = ignore();
@@ -547,47 +544,27 @@ async function prepareCfFrameworkBuildOutput(options) {
 			mkdirSync(dirname(destination), { recursive: true });
 			if (file.isSymbolicLink()) {
 				const target = realpathSync(absolute);
-				const targetRelative = relative(realAssets, target);
-				if (targetRelative === ".." || targetRelative.startsWith("../") || isAbsolute(targetRelative)) throw new Error("The framework assets contain a symlink outside the asset directory.");
+				if (!isInside(realAssets, target)) throw new Error("The framework assets contain a symlink outside the asset directory.");
 				copyFileSync(target, destination);
 			} else if (file.isFile()) copyFileSync(absolute, destination);
 		}
-		const { build } = await import("vite");
-		await build({
-			configFile: false,
-			root: options.projectRoot,
-			publicDir: false,
-			logLevel: "error",
-			build: {
-				outDir: scratch,
-				emptyOutDir: true,
-				lib: {
-					entry,
-					formats: ["es"],
-					fileName: "index"
-				},
-				rollupOptions: { external: [/^cloudflare:/, /^node:/] },
-				target: "es2022"
-			}
-		});
-		writeFileSync(join(scratch, "wrangler.json"), JSON.stringify({
-			...raw,
-			main: "index.js",
+		const prepared = await prepareBundledBuildOutput({
+			projectRoot: options.projectRoot,
+			entry,
+			scratchPrefix: "void-cf-framework-",
+			config: raw,
 			assets: {
 				...assets,
 				directory: publicAssets
-			}
-		}), { mode: 384 });
-		const prepared = await prepareCfBuildOutput(scratch, options.accountId);
+			},
+			accountId: options.accountId,
+			external: [/^cloudflare:/, /^node:/]
+		});
 		return prepared ? {
 			...prepared,
 			assetsDirectory: sourceAssets
 		} : null;
 	} finally {
-		rmSync(scratch, {
-			recursive: true,
-			force: true
-		});
 		rmSync(publicAssets, {
 			recursive: true,
 			force: true
@@ -595,4 +572,4 @@ async function prepareCfFrameworkBuildOutput(options) {
 	}
 }
 //#endregion
-export { migrateBuiltWranglerConfig as i, prepareCfFrameworkBuildOutput as n, prepareCfStaticBuildOutput as r, prepareCfBuildOutput as t };
+export { record as a, migrateBuiltWranglerConfig as i, prepareCfFrameworkBuildOutput as n, prepareCfStaticBuildOutput as r, prepareCfBuildOutput as t };

package/dist/cf-build-output-H9a97vME.mjs

@@ -0,0 +1,2 @@
+import { t as prepareCfBuildOutput } from "./cf-build-output-DjvB_872.mjs";
+export { prepareCfBuildOutput };

package/dist/cf-user-agent-lKblH3zU.mjs

@@ -0,0 +1,17 @@
+import { a as join } from "./dist-BVqXeR_h.mjs";
+import { n as getPackageDir } from "./agents-B_pX_HmQ.mjs";
+import { readFileSync } from "node:fs";
+//#region src/cli/cf-user-agent.ts
+let voidUserAgent;
+let cfCliVersion;
+function getVoidUserAgent() {
+	if (voidUserAgent === void 0) voidUserAgent = `void/${JSON.parse(readFileSync(join(getPackageDir(), "package.json"), "utf8")).version}`;
+	return voidUserAgent;
+}
+/** cf prepends `cf-cli/` to CLI_VERSION for both API requests and uploads. */
+function getCfCliVersion() {
+	if (cfCliVersion === void 0) cfCliVersion = `${JSON.parse(readFileSync(new URL(import.meta.resolve("cf/package.json")), "utf8")).version} ${getVoidUserAgent()}`;
+	return cfCliVersion;
+}
+//#endregion
+export { getVoidUserAgent as n, getCfCliVersion as t };