void 0.21.9 → 0.23.0

package/dist/{cf-build-output-CGT03qCD.mjs → cf-build-output-BPqOT964.mjs}

@@ -1,9 +1,9 @@
 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, pathToFileURL } from "node:url";
-import { build } from "vite";
+import { fileURLToPath } from "node:url";
+import { randomUUID } from "node:crypto";
 import { tmpdir } from "node:os";
-import { spawnSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { isDeepStrictEqual } from "node:util";
 import { getWorkerBundleDir, normalizeDirectoryName, readBuildOutput, writeAssets, writeContainerConfig, writeRootConfig, writeWorkerConfig } from "@cloudflare/build-output-utils";
 import { InputConfigSchema, OutputContainerSchema } from "@cloudflare/config";
@@ -111,14 +111,12 @@ function uncredentialedEnvironment() {
 	env.CF_DELEGATION = "1";
 	return env;
 }
-function migrationFollowUps(output) {
-	return [...output.matchAll(/\[required\] ([^:\n]+): ([^\n]+)/g)].map((match) => ({
-		path: match[1],
-		message: match[2]
-	}));
-}
-function assertHandledFollowUps(output) {
-	for (const item of migrationFollowUps(output)) if (!(item.path === "assets.directory" && item.message.includes("assets directory") || /^d1_databases\.\d+$/.test(item.path) && /`migrations_(?:dir|table)`/.test(item.message) || /^durable_objects\.bindings\.\d+$/.test(item.path) || item.path === "migrations" || item.path === "containers")) throw new Error(`cf cannot migrate Cloudflare setting ${item.path}: ${item.message}`);
+function assertHandledFollowUps(followUps) {
+	for (const item of followUps) {
+		if (!item.blocking) 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;
@@ -172,8 +170,14 @@ function containersFromWrangler(raw, exports) {
 	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" || typeof value.image !== "string") throw new Error("cf requires a name, class_name and image for each Container.");
-		const fields = /* @__PURE__ */ new Set([
+		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",
@@ -184,23 +188,59 @@ function containersFromWrangler(raw, exports) {
 		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,
-			schedulingPolicy: "durable-object",
-			images: { default: { reference: value.image } },
+			image: { reference: value.image },
 			...typeof value.max_instances === "number" ? { maxInstances: value.max_instances } : {},
 			...typeof value.instance_type === "string" ? { instanceType: value.instance_type } : {}
 		};
 	});
 }
-/**
-* Ask the pinned cf CLI to translate the Vite plugin's generated JSON config.
-* Migration runs on a disposable copy without Cloudflare credentials; its
-* generated module is evaluated in a second uncredentialed Node process.
-*/
+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 cfBinary = join(dirname(cfPackage), "bin", "cf");
 	const directory = mkdtempSync(join(tmpdir(), "void-cf-config-"));
 	try {
 		mkdirSync(join(directory, "node_modules"));
@@ -216,44 +256,23 @@ function migrateBuiltWranglerConfig(raw) {
 		}), { mode: 384 });
 		const configPath = join(directory, "wrangler.json");
 		writeFileSync(configPath, JSON.stringify(migrationInput(raw)), { mode: 384 });
-		const env = uncredentialedEnvironment();
 		const migrated = spawnSync(process.execPath, [
-			cfBinary,
-			"migrate",
-			configPath,
-			"--bundler",
-			"vite",
-			"--no-install",
-			"--force"
-		], {
-			cwd: directory,
-			env,
-			encoding: "utf8",
-			timeout: 3e4,
-			maxBuffer: 4194304
-		});
-		const generatedPath = join(directory, "cloudflare.config.ts");
-		if (!existsSync(generatedPath) || migrated.error) throw new Error("cf could not translate the built Cloudflare configuration.");
-		assertHandledFollowUps(migrated.stdout);
-		const generated = readFileSync(generatedPath, "utf8");
-		const executable = generated.replace(/^throw new Error\("Migration incomplete\.[^\n]*\);\s*$/m, "");
-		if (executable === generated && migrated.status !== 0) throw new Error("cf did not provide a usable Cloudflare configuration.");
-		const executablePath = join(directory, "cloudflare.config.mjs");
-		writeFileSync(executablePath, executable, { mode: 384 });
-		const evaluated = spawnSync(process.execPath, [
 			"--input-type=module",
 			"-e",
-			"const mod = await import(process.argv[1]); process.stdout.write(JSON.stringify(mod.default));",
-			pathToFileURL(executablePath).href
+			migrationScript,
+			import.meta.resolve("@cloudflare/codemods"),
+			configPath
 		], {
 			cwd: directory,
-			env,
+			env: uncredentialedEnvironment(),
 			encoding: "utf8",
-			timeout: 1e4,
+			timeout: 3e4,
 			maxBuffer: 4194304
 		});
-		if (evaluated.status !== 0 || evaluated.error) throw new Error("cf generated a configuration that Void could not validate.");
-		const result = record(JSON.parse(evaluated.stdout));
+		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);
@@ -288,6 +307,37 @@ function migrateBuiltWranglerConfig(raw) {
 	}
 }
 //#endregion
+//#region 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" });
+		child.once("error", reject);
+		child.once("exit", (code) => code === 0 ? resolve() : reject(/* @__PURE__ */ new Error("Sandbox image preparation failed. Start Docker and retry the deployment.")));
+	});
+}
+/** Build locally; the pinned cf uploader pushes this tag to the managed registry. */
+async function buildContainerImage(dockerfile, buildContext = dirname(dockerfile)) {
+	const localReference = `void-sandbox-build:${randomUUID()}`;
+	await docker([
+		"build",
+		"--platform",
+		"linux/amd64",
+		"--file",
+		dockerfile,
+		"--tag",
+		localReference,
+		buildContext
+	]);
+	return {
+		localReference,
+		dispose: () => docker([
+			"image",
+			"rm",
+			localReference
+		], true).catch(() => {})
+	};
+}
+//#endregion
 //#region src/cli/cf-build-output.ts
 function object(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -298,6 +348,11 @@ const moduleTypes = {
 	".cjs": "cjs",
 	".wasm": "wasm",
 	".bin": "data",
+	".woff": "data",
+	".woff2": "data",
+	".ttf": "data",
+	".otf": "data",
+	".eot": "data",
 	".txt": "text",
 	".html": "text",
 	".sql": "text",
@@ -320,7 +375,7 @@ function copyBundle(source, destination) {
 		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()];
-		if (!type) return null;
+		if (!type) throw new Error(`The built Worker contains an unsupported module ${JSON.stringify(name)}. Emit public assets into the client output or configure the plugin that produced this file to run only in the client environment.`);
 		const destinationPath = join(destination, name);
 		mkdirSync(dirname(destinationPath), { recursive: true });
 		if (entry.isSymbolicLink()) copyFileSync(realpathSync(absolute), destinationPath);
@@ -337,10 +392,14 @@ async function prepareCfBuildOutput(workerDirectory, accountId) {
 	if (typeof raw.account_id === "string" && raw.account_id !== accountId) return null;
 	const config = migrateBuiltWranglerConfig(raw);
 	if (!config.worker) throw new Error("cf did not produce a Worker configuration.");
-	const main = raw.main;
-	if (typeof main !== "string" || basename(main) !== main || !existsSync(join(source, main))) return null;
+	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 (!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;
 	if (assetsDirectory !== void 0 && typeof assetsDirectory !== "string") return null;
+	const images = [];
 	const directory = mkdtempSync(join(tmpdir(), "void-cf-deploy-"));
 	try {
 		const bundle = getWorkerBundleDir(directory);
@@ -366,11 +425,23 @@ async function prepareCfBuildOutput(workerDirectory, accountId) {
 				modules
 			}
 		});
-		for (const container of config.containers ?? []) await writeContainerConfig({
-			root: directory,
-			config: OutputContainerSchema.parse(container),
-			directoryName: normalizeDirectoryName(container.name)
-		});
+		for (const container of config.containers ?? []) {
+			const builtContainer = { ...container };
+			if ("images" in container && container.images) {
+				const prepared = {};
+				for (const [name, image] of Object.entries(container.images)) if ("dockerfile" in image) {
+					const built = await buildContainerImage(resolve(source, image.dockerfile), image.buildContext ? resolve(source, image.buildContext) : void 0);
+					images.push(built);
+					prepared[name] = { localReference: built.localReference };
+				} else prepared[name] = image;
+				builtContainer.images = prepared;
+			}
+			await writeContainerConfig({
+				root: directory,
+				config: OutputContainerSchema.parse(builtContainer),
+				directoryName: normalizeDirectoryName(container.name)
+			});
+		}
 		if (typeof assetsDirectory === "string") {
 			const assetPath = resolve(source, assetsDirectory);
 			if (!existsSync(assetPath)) {
@@ -378,6 +449,7 @@ async function prepareCfBuildOutput(workerDirectory, accountId) {
 					recursive: true,
 					force: true
 				});
+				await Promise.all(images.map((image) => image.dispose()));
 				return null;
 			}
 			await writeAssets({
@@ -389,16 +461,20 @@ async function prepareCfBuildOutput(workerDirectory, accountId) {
 		return {
 			directory,
 			...typeof assetsDirectory === "string" ? { assetsDirectory: resolve(source, assetsDirectory) } : {},
-			dispose: () => rmSync(directory, {
-				recursive: true,
-				force: true
-			})
+			dispose: async () => {
+				rmSync(directory, {
+					recursive: true,
+					force: true
+				});
+				await Promise.all(images.map((image) => image.dispose()));
+			}
 		};
 	} catch (error) {
 		rmSync(directory, {
 			recursive: true,
 			force: true
 		});
+		await Promise.all(images.map((image) => image.dispose()));
 		throw error;
 	}
 }
@@ -410,6 +486,7 @@ async function prepareCfStaticBuildOutput(options) {
 	if (!existsSync(entry)) return null;
 	const scratch = mkdtempSync(join(tmpdir(), "void-cf-static-"));
 	try {
+		const { build } = await import("vite");
 		await build({
 			configFile: false,
 			root: options.projectRoot,
@@ -475,6 +552,7 @@ async function prepareCfFrameworkBuildOutput(options) {
 				copyFileSync(target, destination);
 			} else if (file.isFile()) copyFileSync(absolute, destination);
 		}
+		const { build } = await import("vite");
 		await build({
 			configFile: false,
 			root: options.projectRoot,

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

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