void 1.4.0 → 1.5.0

package/dist/{cf-access-CWP4avfP.mjs → cf-access-BmBT2h8_.mjs}

@@ -1,7 +1,7 @@
-import { T as writeKeyringPassword, c as normalizePlatformApiUrl, u as platformCredentialAccount, w as readKeyringPassword } from "./platform-registry-B9mWX9LO.mjs";
-import { t as cfAccessHeaders } from "./cf-access-BM9G0lhO.mjs";
+import { T as writeKeyringPassword, c as normalizePlatformApiUrl, u as platformCredentialAccount, w as readKeyringPassword } from "./platform-registry-DZ_2Xuqd.mjs";
+import { t as cfAccessHeaders } from "./cf-access-pejlJmuy.mjs";
 import { spawnSync } from "node:child_process";
-//#region src/cli/cf-access.ts
+// src/cli/cf-access.ts
 const ACCESS_KEYRING_SERVICE = "dev.void.cli.access";
 const keyringTokens = /* @__PURE__ */ new Map();
 function usableToken(token) {
@@ -128,5 +128,4 @@ function ensurePlatformProxyAccess(apiUrl, proxyUrl) {
 	ensurePlatformAccessToken(apiUrl);
 	ensurePlatformAccessToken(proxyUrl, false, Object.keys(cfAccessHeaders(process.env, apiUrl)).length > 0);
 }
-//#endregion
 export { ensurePlatformProxyAccess as n, isCloudflareAccessChallenge as r, ensurePlatformAccessToken as t };

package/dist/{cf-access-BM9G0lhO.mjs → cf-access-pejlJmuy.mjs}

@@ -1,4 +1,4 @@
-//#region src/shared/cf-access.ts
+// src/shared/cf-access.ts
 /**
 * Resolve Cloudflare Access headers from an env-like object.
 *
@@ -64,5 +64,4 @@ function scopedAccessCredentials(env, targetUrl) {
 		CF_ACCESS_CLIENT_SECRET: headers["CF-Access-Client-Secret"]
 	} : { CF_ACCESS_TOKEN: headers["cf-access-token"] } });
 }
-//#endregion
 export { scopedAccessCredentials as n, trustedCloudflareWorkerAccessHeaders as r, cfAccessHeaders as t };

package/dist/{cf-build-output-XpNR9zoh.mjs → cf-build-output-B1C8U83u.mjs}

@@ -1,317 +1,15 @@
-import { a as join, c as resolve, i as isAbsolute, n as dirname, r as extname, s as relative, t as basename } from "./dist-ipQi0Q8y.mjs";
-import { n as readGeneratedWranglerConfigFile } from "./generated-wrangler-config-DeWj5F9Y.mjs";
-import { t as WORKER_CONDITIONS } from "./worker-conditions-AWFRcFxR.mjs";
+import { a as join, c as resolve, i as isAbsolute, n as dirname, r as extname, s as relative, t as basename } from "./dist-DMYe8CZJ.mjs";
+import { n as readGeneratedWranglerConfigFile } from "./generated-wrangler-config-CoDaaFsA.mjs";
+import { n as record, t as migrateBuiltWranglerConfig } from "./cf-config-migrate-Dy8MrKgF.mjs";
+import { t as WORKER_CONDITIONS } from "./worker-conditions-CBZ0RYsZ.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 { randomBytes, randomUUID } from "node:crypto";
 import { tmpdir } from "node:os";
-import { isDeepStrictEqual } from "node:util";
-import { spawn, spawnSync } from "node:child_process";
+import { spawn } from "node:child_process";
 import { getRootConfigPath, getWorkerAssetsDir, getWorkerBundleDir, getWorkerConfigPath, normalizeDirectoryName, readBuildOutput, writeAssets, writeContainerConfig, writeRootConfig, writeWorkerConfig } from "@cloudflare/build-output-utils";
-import { InputConfigSchema, OutputContainerSchema } from "@cloudflare/config";
+import { OutputContainerSchema } from "@cloudflare/config";
 import ignore from "ignore";
-//#region src/cli/cf-config-migrate.ts
-function record(value) {
-	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;
-}
-/** Remove build-only fields and settings translated into cf's typed config below. */
-function migrationInput(raw) {
-	const result = { ...raw };
-	if (!empty(result.rules) && !isDeepStrictEqual(result.rules, [{
-		type: "ESModule",
-		globs: ["**/*.js", "**/*.mjs"]
-	}])) throw new Error("cf cannot yet preserve custom Worker module rules in a prebuilt bundle.");
-	if (empty(result.logfwdr) || isDeepStrictEqual(result.logfwdr, { bindings: [] })) delete result.logfwdr;
-	for (const key of [
-		"configPath",
-		"userConfigPath",
-		"topLevelName",
-		"main",
-		"jsx_factory",
-		"jsx_fragment",
-		"rules",
-		"python_modules",
-		"dev",
-		"no_bundle",
-		"build",
-		"keep_vars",
-		"keep_secrets",
-		"keep_assets",
-		"send_metrics",
-		"workflows"
-	]) delete result[key];
-	for (const [key, value] of Object.entries(result)) if (empty(value)) delete result[key];
-	return result;
-}
-function applyPreservationFlags(raw, worker) {
-	const keepBindings = [...raw.keep_vars === true ? ["plain_text", "json"] : [], ...raw.keep_secrets === true ? ["secret_text", "secret_key"] : []];
-	if (keepBindings.length === 0 && raw.keep_assets !== true) return;
-	const unsafe = record(worker.unsafe) ?? {};
-	const metadata = record(unsafe.metadata) ?? {};
-	const previous = metadata.keep_bindings;
-	if (previous !== void 0 && (!Array.isArray(previous) || !previous.every((value) => typeof value === "string"))) throw new Error("Invalid keep_bindings in the built Cloudflare config.");
-	worker.unsafe = {
-		...unsafe,
-		metadata: {
-			...metadata,
-			...keepBindings.length > 0 ? { keep_bindings: [.../* @__PURE__ */ new Set([...previous ?? [], ...keepBindings])] } : {},
-			...raw.keep_assets === true ? { keep_assets: true } : {}
-		}
-	};
-}
-function applyWorkflows(raw, worker) {
-	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) ?? {};
-	for (const item of raw.workflows) {
-		const workflow = record(item);
-		if (!workflow || typeof workflow.binding !== "string" || typeof workflow.name !== "string" || typeof workflow.class_name !== "string" || workflow.script_name !== void 0 && typeof workflow.script_name !== "string") throw new Error("Invalid Workflow binding in the built Cloudflare config.");
-		const allowed = /* @__PURE__ */ new Set([
-			"binding",
-			"name",
-			"class_name",
-			"script_name",
-			"limits",
-			"concurrency",
-			"schedules",
-			"default_retention"
-		]);
-		for (const key of Object.keys(workflow)) if (!allowed.has(key)) throw new Error(`cf cannot migrate Workflow setting ${key}.`);
-		if (Object.hasOwn(env, workflow.binding)) throw new Error(`Duplicate Worker binding ${workflow.binding}.`);
-		env[workflow.binding] = {
-			type: "workflow",
-			name: workflow.name,
-			worker: workflow.script_name ?? worker.name,
-			exportName: workflow.class_name
-		};
-		if (workflow.script_name !== void 0 && workflow.script_name !== worker.name) continue;
-		const retention = record(workflow.default_retention);
-		if (Object.hasOwn(exports, workflow.class_name)) throw new Error(`Duplicate Worker export ${workflow.class_name}.`);
-		const schedules = Array.isArray(workflow.schedules) && workflow.schedules.length === 0 ? void 0 : workflow.schedules;
-		exports[workflow.class_name] = {
-			type: "workflow",
-			name: workflow.name,
-			...workflow.limits !== void 0 ? { limits: workflow.limits } : {},
-			...workflow.concurrency !== void 0 ? { concurrency: workflow.concurrency } : {},
-			...schedules !== void 0 ? { schedules } : {},
-			...retention ? { defaultRetention: {
-				...retention.success_retention !== void 0 ? { successRetention: retention.success_retention } : {},
-				...retention.error_retention !== void 0 ? { errorRetention: retention.error_retention } : {}
-			} } : {}
-		};
-	}
-	worker.env = env;
-	worker.exports = exports;
-}
-function uncredentialedEnvironment() {
-	const env = { ...process.env };
-	for (const key of Object.keys(env)) if (/^(?:CLOUDFLARE|CF_|WRANGLER|VOID_PLATFORM_|DATABASE_URL|VOID_ACCESS_)/i.test(key)) delete env[key];
-	env.CF_DELEGATION = "1";
-	return env;
-}
-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}`);
-	}
-}
-function durableObjectExports(raw) {
-	const migrations = raw.migrations;
-	if (migrations === void 0 || Array.isArray(migrations) && migrations.length === 0) return {};
-	if (!Array.isArray(migrations) || !migrations.every((entry) => record(entry))) throw new Error("Invalid Durable Object migrations in the built Cloudflare config.");
-	const exports = {};
-	for (const migration of migrations) {
-		const known = /* @__PURE__ */ new Set([
-			"tag",
-			"new_classes",
-			"new_sqlite_classes",
-			"renamed_classes",
-			"deleted_classes"
-		]);
-		for (const key of Object.keys(migration)) if (!known.has(key)) throw new Error(`cf cannot migrate Durable Object migration setting ${key}.`);
-		for (const [field, storage] of [["new_classes", "legacy-kv"], ["new_sqlite_classes", "sqlite"]]) {
-			const classes = migration[field] ?? [];
-			if (!Array.isArray(classes) || !classes.every((name) => typeof name === "string")) throw new Error(`Invalid ${field} in the built Cloudflare config.`);
-			for (const name of classes) exports[name] = {
-				type: "durable-object",
-				storage
-			};
-		}
-		const renamed = migration.renamed_classes ?? [];
-		if (!Array.isArray(renamed) || !renamed.every((entry) => record(entry))) throw new Error("Invalid renamed_classes in the built Cloudflare config.");
-		for (const item of renamed) {
-			if (typeof item.from !== "string" || typeof item.to !== "string") throw new Error("Invalid Durable Object class rename in the built Cloudflare config.");
-			const old = record(exports[item.from]);
-			if (!old || old.storage !== "sqlite" && old.storage !== "legacy-kv") throw new Error(`Cannot determine the storage of renamed Durable Object ${item.from}.`);
-			exports[item.from] = {
-				type: "durable-object",
-				state: "renamed",
-				renamedTo: item.to
-			};
-			exports[item.to] = {
-				type: "durable-object",
-				storage: old.storage
-			};
-		}
-		const deleted = migration.deleted_classes ?? [];
-		if (!Array.isArray(deleted) || !deleted.every((name) => typeof name === "string")) throw new Error("Invalid deleted_classes in the built Cloudflare config.");
-		for (const name of deleted) exports[name] = {
-			type: "durable-object",
-			state: "deleted"
-		};
-	}
-	return exports;
-}
-function containersFromWrangler(raw, exports) {
-	const values = raw.containers;
-	if (values === void 0) return [];
-	if (!Array.isArray(values) || !values.every((value) => record(value))) throw new Error("Invalid Containers in the built Cloudflare config.");
-	return values.map((value) => {
-		if (typeof value.name !== "string" || typeof value.class_name !== "string") throw new Error("cf requires a name and class_name for each Container.");
-		const managed = value.scheduling_policy === "durable_object";
-		const fields = new Set(managed ? [
-			"name",
-			"class_name",
-			"scheduling_policy",
-			"images"
-		] : [
-			"name",
-			"class_name",
-			"image",
-			"max_instances",
-			"instance_type"
-		]);
-		for (const key of Object.keys(value)) if (!fields.has(key)) throw new Error(`cf cannot migrate Container setting ${key}.`);
-		const declaration = record(exports[value.class_name]);
-		if (!declaration || declaration.storage !== "sqlite") throw new Error(`Container ${value.name} needs a SQLite Durable Object export.`);
-		declaration.container = value.name;
-		if (managed) {
-			const images = record(value.images);
-			if (!images) throw new Error("A Sandbox requires a named image.");
-			return {
-				name: value.name,
-				schedulingPolicy: "durable-object",
-				images: Object.fromEntries(Object.entries(images).map(([name, image]) => {
-					const source = record(image);
-					if (!source || Object.keys(source).some((key) => ![
-						"dockerfile",
-						"build_context",
-						"image"
-					].includes(key)) || source.dockerfile !== void 0 && source.image !== void 0 || source.build_context !== void 0 && typeof source.build_context !== "string") throw new Error("Invalid Sandbox image.");
-					if (typeof source.dockerfile === "string") return [name, {
-						dockerfile: source.dockerfile,
-						...typeof source.build_context === "string" ? { buildContext: source.build_context } : {}
-					}];
-					if (typeof source.image === "string") return [name, { reference: source.image }];
-					throw new Error("Invalid Sandbox image source.");
-				}))
-			};
-		}
-		if (typeof value.image !== "string") throw new Error("A Container requires an image.");
-		return {
-			name: value.name,
-			image: { reference: value.image },
-			...typeof value.max_instances === "number" ? { maxInstances: value.max_instances } : {},
-			...typeof value.instance_type === "string" ? { instanceType: value.instance_type } : {}
-		};
-	});
-}
-const migrationScript = String.raw`
-import { readFileSync, writeFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { pathToFileURL } from 'node:url';
-const { migrateWranglerToCf } = await import(process.argv[1]);
-const configPath = process.argv[2];
-const migration = await migrateWranglerToCf(configPath, {
-  bundler: 'vite', force: true, installDependencies: false,
-});
-const directory = dirname(configPath);
-const generated = readFileSync(join(directory, 'cloudflare.config.ts'), 'utf8');
-const executable = generated.replace(/^throw new Error\("Migration incomplete\.[^\n]*\);\s*$/m, '');
-if (executable === generated && migration.status !== 'complete') {
-  throw new Error('cf did not provide a usable Cloudflare configuration.');
-}
-const executablePath = join(directory, 'cloudflare.config.mjs');
-writeFileSync(executablePath, executable, { mode: 0o600 });
-const config = (await import(pathToFileURL(executablePath).href)).default;
-process.stdout.write(JSON.stringify({ config, followUps: migration.followUps }));
-`;
-function migrateBuiltWranglerConfig(raw) {
-	const cfPackage = fileURLToPath(import.meta.resolve("cf/package.json"));
-	const directory = mkdtempSync(join(tmpdir(), "void-cf-config-"));
-	try {
-		mkdirSync(join(directory, "node_modules"));
-		symlinkSync(dirname(cfPackage), join(directory, "node_modules", "cf"), "junction");
-		writeFileSync(join(directory, "package.json"), JSON.stringify({
-			name: "void-private-cf-build",
-			private: true,
-			type: "module",
-			dependencies: {
-				cf: "1.0.0",
-				"@cloudflare/vite-plugin": "1.0.0"
-			}
-		}), { mode: 384 });
-		const configPath = join(directory, "wrangler.json");
-		writeFileSync(configPath, JSON.stringify(migrationInput(raw)), { mode: 384 });
-		const migrated = spawnSync(process.execPath, [
-			"--input-type=module",
-			"-e",
-			migrationScript,
-			import.meta.resolve("@cloudflare/codemods"),
-			configPath
-		], {
-			cwd: directory,
-			env: uncredentialedEnvironment(),
-			encoding: "utf8",
-			timeout: 3e4,
-			maxBuffer: 4194304
-		});
-		if (migrated.status !== 0 || migrated.error) throw new Error("cf could not translate the built Cloudflare configuration.");
-		const migration = JSON.parse(migrated.stdout);
-		assertHandledFollowUps(migration.followUps);
-		const result = record(migration.config);
-		const worker = record(result?.worker);
-		if (!result || !worker) throw new Error("cf did not generate a Worker configuration.");
-		applyPreservationFlags(raw, worker);
-		applyWorkflows(raw, worker);
-		const exports = {
-			...record(worker.exports),
-			...durableObjectExports(raw)
-		};
-		const containers = containersFromWrangler(raw, exports);
-		if (containers.length > 0) {
-			const envBindings = record(worker.env);
-			const durableBindings = record(raw.durable_objects)?.bindings;
-			if (!envBindings || !Array.isArray(durableBindings)) throw new Error("A Container Durable Object binding was not found in the built config.");
-			for (const container of containers) {
-				const className = raw.containers.find((entry) => entry.name === container.name)?.class_name;
-				const binding = durableBindings.find((entry) => record(entry)?.class_name === className);
-				if (!record(binding) || typeof binding.name !== "string" || binding.script_name !== void 0 && binding.script_name !== worker.name) throw new Error(`Container ${container.name} must use a local Durable Object binding.`);
-				envBindings[binding.name] = {
-					type: "unsafe:durable_object_namespace",
-					class_name: className
-				};
-			}
-			result.containers = containers;
-		}
-		if (Object.keys(exports).length > 0) worker.exports = exports;
-		return InputConfigSchema.parse(result);
-	} finally {
-		rmSync(directory, {
-			recursive: true,
-			force: true
-		});
-	}
-}
-//#endregion
-//#region src/cli/container-image.ts
+// src/cli/container-image.ts
 function docker(args, quiet = false) {
 	return new Promise((resolve, reject) => {
 		const child = spawn(process.env.WRANGLER_DOCKER_BIN ?? "docker", args, { stdio: quiet ? "ignore" : "inherit" });
@@ -341,8 +39,7 @@ async function buildContainerImage(dockerfile, buildContext = dirname(dockerfile
 		], true).catch(() => {})
 	};
 }
-//#endregion
-//#region src/cli/cf-build-output.ts
+// src/cli/cf-build-output.ts
 const moduleTypes = {
 	".js": "esm",
 	".mjs": "esm",
@@ -411,7 +108,38 @@ function stagePackageContext(directory, projectRoot) {
 /** Create a disposable cf Build Output tree from an existing Cloudflare Worker build. */
 async function prepareCfBuildOutput(workerDirectory, accountId, mode, projectRoot = workerDirectory) {
 	const source = resolve(workerDirectory);
-	if (existsSync(getRootConfigPath(source))) return prepareNativeBuildOutput(source, accountId, mode, projectRoot);
+	if (existsSync(getRootConfigPath(source))) {
+		const deferredContainers = join(dirname(getRootConfigPath(source)), "void-containers.json");
+		if (existsSync(deferredContainers)) {
+			const built = await readBuildOutput(source);
+			if (accountId !== void 0 && built.rootConfig.accountId !== void 0 && accountId !== built.rootConfig.accountId || mode !== void 0 && mode !== built.rootConfig.buildContext.mode) return null;
+			const path = record(JSON.parse(readFileSync(deferredContainers, "utf8")))?.workerDirectory;
+			if (typeof path !== "string" || isAbsolute(path) || path.includes("\\") || path.includes(":") || !isInside(source, resolve(source, path)) || resolve(source, path) === source) throw new Error("Invalid Void Container build output directory.");
+			const directory = realpathSync(resolve(source, path));
+			const canonicalRoot = realpathSync(source);
+			if (directory === canonicalRoot || !isInside(canonicalRoot, directory)) throw new Error("Void Container output must stay inside the project.");
+			const prepared = await prepareCfBuildOutput(directory, accountId, mode ?? built.rootConfig.buildContext.mode, projectRoot);
+			if (!prepared) return null;
+			let native = null;
+			try {
+				native = await prepareNativeBuildOutput(source, accountId, mode, projectRoot);
+				if (!native) {
+					await prepared.dispose();
+					return null;
+				}
+				const staged = await readBuildOutput(native.directory);
+				for (const [name, worker] of Object.entries(staged.workers)) if (name !== "default") cpSync(dirname(worker.configPath), dirname(getWorkerConfigPath(prepared.directory, name)), { recursive: true });
+				await readBuildOutput(prepared.directory);
+				return prepared;
+			} catch (error) {
+				await prepared.dispose();
+				throw error;
+			} finally {
+				await native?.dispose();
+			}
+		}
+		return prepareNativeBuildOutput(source, accountId, mode, projectRoot);
+	}
 	if (!existsSync(join(source, "wrangler.json"))) throw new Error(`No Cloudflare Worker build found in ${source}. Pass the project root that contains .cloudflare/output/v0, or the Worker output directory that contains wrangler.json.`);
 	const raw = record(JSON.parse(readFileSync(join(source, "wrangler.json"), "utf8")));
 	if (!raw) return null;
@@ -753,5 +481,4 @@ async function prepareCfFrameworkBuildOutput(options) {
 		});
 	}
 }
-//#endregion
-export { record as a, migrateBuiltWranglerConfig as i, prepareCfFrameworkBuildOutput as n, prepareCfStaticBuildOutput as r, prepareCfBuildOutput as t };
+export { prepareCfFrameworkBuildOutput as n, prepareCfStaticBuildOutput as r, prepareCfBuildOutput as t };

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

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

package/dist/{cf-command-values-ByHk0xg4.mjs → cf-command-values-Ccl-zRhl.mjs}

@@ -1,4 +1,4 @@
-//#region src/cli/cf-command-values.ts
+// src/cli/cf-command-values.ts
 const CF_VERSION_SOURCE_MAX_OUTPUT_BYTES = 134217728;
 /** Accept a cf positional only when it cannot be read as a flag or carry control characters. */
 function safePositional(value) {
@@ -11,13 +11,16 @@ function safePositional(value) {
 function isD1Bookmark(value) {
 	return typeof value === "string" && /^[0-9a-f]+(?:-[0-9a-f]+)+$/i.test(value);
 }
-/** Read the version ID and URLs that cf prints after a prebuilt upload. */
-function readCfUploadOutput(stdout) {
+/**
+* Read the version ID and URLs that cf prints after a prebuilt upload: on stdout before
+* cf 1.0.0-beta.21, and on stderr since.
+*/
+function readCfUploadOutput(result) {
+	const output = `${result.stdout}\n${result.stderr}`;
 	return {
-		versionId: stdout.match(/(?:Worker|Current) Version ID:\s*([0-9a-f]{8}-[0-9a-f-]{27})/i)?.[1],
-		previewUrl: stdout.match(/Version Preview(?: Alias)? URL:\s*(https:\/\/\S+)/i)?.[1],
-		workersDevUrl: stdout.match(/(https:\/\/[a-z0-9.-]+\.workers\.dev(?:\/[^\s]*)?)/i)?.[1]
+		versionId: output.match(/(?:Worker|Current) Version ID:\s*([0-9a-f]{8}-[0-9a-f-]{27})/i)?.[1],
+		previewUrl: output.match(/Version Preview(?: Alias)? URL:\s*(https:\/\/\S+)/i)?.[1],
+		workersDevUrl: output.match(/(https:\/\/[a-z0-9.-]+\.workers\.dev(?:\/[^\s]*)?)/i)?.[1]
 	};
 }
-//#endregion
 export { safePositional as i, isD1Bookmark as n, readCfUploadOutput as r, CF_VERSION_SOURCE_MAX_OUTPUT_BYTES as t };