@cloudflare/vite-plugin 1.42.2 → 1.42.4

package/dist/index.mjs

@@ -1506,7 +1506,7 @@ async function assertWranglerVersion() {
 * The default compatibility date to use when the user omits one.
 * This value is injected at build time and remains fixed for each release.
 */
-const DEFAULT_COMPAT_DATE = "2026-06-23";
+const DEFAULT_COMPAT_DATE = "2026-06-30";
 
 //#endregion
 //#region src/build-output-env.ts
@@ -61012,144 +61012,6 @@ var ImageRegistriesService = class {
 	}
 };
 
-//#endregion
-//#region ../containers-shared/src/build.ts
-async function constructBuildCommand(options, logger) {
-	const platform$1 = options.platform ?? "linux/amd64";
-	const buildCmd = [
-		"build",
-		"--load",
-		"-t",
-		options.tag,
-		"--platform",
-		platform$1,
-		"--provenance=false"
-	];
-	if (options.args) for (const arg in options.args) buildCmd.push("--build-arg", `${arg}=${options.args[arg]}`);
-	if (options.setNetworkToHost) buildCmd.push("--network", "host");
-	const dockerfile = readFileSync(options.pathToDockerfile, "utf-8");
-	buildCmd.push("-f", "-");
-	buildCmd.push(options.buildContext);
-	logger?.debug(`Building image with command: ${buildCmd.join(" ")}`);
-	return {
-		buildCmd,
-		dockerfile
-	};
-}
-function dockerBuild(dockerPath, options) {
-	let errorHandled = false;
-	let resolve$4;
-	let reject;
-	const ready = new Promise((res, rej) => {
-		resolve$4 = res;
-		reject = rej;
-	});
-	const child = spawn(dockerPath, options.buildCmd, {
-		stdio: [
-			"pipe",
-			"inherit",
-			"inherit"
-		],
-		detached: process.platform !== "win32",
-		windowsHide: true
-	});
-	if (child.stdin !== null) {
-		child.stdin.write(options.dockerfile);
-		child.stdin.end();
-	}
-	child.on("exit", (code) => {
-		if (code === 0) resolve$4();
-		else if (!errorHandled) {
-			errorHandled = true;
-			reject(new UserError(`Docker build exited with code: ${code}`, { telemetryMessage: false }));
-		}
-	});
-	child.on("error", (err) => {
-		if (!errorHandled) {
-			errorHandled = true;
-			reject(err);
-		}
-	});
-	return {
-		abort: () => {
-			child.unref();
-			if (child.pid !== void 0) if (process.platform === "win32") child.kill();
-			else process.kill(-child.pid);
-		},
-		ready
-	};
-}
-async function buildImage(dockerPath, options) {
-	const { buildCmd, dockerfile } = await constructBuildCommand({
-		tag: options.image_tag,
-		pathToDockerfile: options.dockerfile,
-		buildContext: options.image_build_context,
-		args: options.image_vars,
-		platform: "linux/amd64"
-	});
-	return dockerBuild(dockerPath, {
-		buildCmd,
-		dockerfile
-	});
-}
-
-//#endregion
-//#region ../containers-shared/src/login.ts
-function configureOpenAPIForContainerPull(accountId, apiToken, apiBase = "https://api.cloudflare.com/client/v4") {
-	OpenAPI.BASE = `${apiBase}/accounts/${accountId}/containers`;
-	OpenAPI.CREDENTIALS = "omit";
-	OpenAPI.HEADERS = {
-		...typeof OpenAPI.HEADERS === "object" ? OpenAPI.HEADERS : {},
-		Authorization: `Bearer ${apiToken}`
-	};
-}
-/**
-* Gets push and pull credentials for a configured image registry
-* and runs `docker login`, so subsequent image pushes or pulls are
-* authenticated
-*/
-async function dockerLoginImageRegistry(pathToDocker, domain) {
-	const credentials = await ImageRegistriesService.generateImageRegistryCredentials(domain, {
-		expiration_minutes: 15,
-		permissions: [ImageRegistryPermissions.PUSH, ImageRegistryPermissions.PULL]
-	});
-	const child = spawn(pathToDocker, [
-		"login",
-		"--password-stdin",
-		"--username",
-		credentials.username,
-		domain
-	], { stdio: [
-		"pipe",
-		"inherit",
-		"inherit"
-	] }).on("error", (err) => {
-		throw err;
-	});
-	child.stdin.write(credentials.password);
-	child.stdin.end();
-	await new Promise((resolve$4, reject) => {
-		child.on("close", (code) => {
-			if (code === 0) resolve$4();
-			else reject(new UserError(`Login failed with code: ${code}`, { telemetryMessage: false }));
-		});
-	});
-}
-
-//#endregion
-//#region ../containers-shared/src/registry.ts
-const MF_DEV_CONTAINER_PREFIX = "cloudflare-dev";
-
-//#endregion
-//#region ../containers-shared/src/knobs.ts
-const getCloudflareContainerRegistry = () => {
-	return process.env.CLOUDFLARE_CONTAINER_REGISTRY ?? (process.env.WRANGLER_API_ENVIRONMENT === "staging" ? "staging.registry.cloudflare.com" : "registry.cloudflare.com");
-};
-/** Prefixes with the cloudflare-dev namespace. The name should be the container's DO classname, and the tag a build uuid. */
-const getDevContainerImageName = (name, tag) => {
-	return `${MF_DEV_CONTAINER_PREFIX}/${name.toLowerCase()}:${tag}`;
-};
-
 //#endregion
 //#region ../containers-shared/src/inspect.ts
 async function dockerImageInspect(dockerPath, options) {
@@ -61244,31 +61106,41 @@ const isDockerRunning = async (dockerPath) => {
 * @throws {UserError} If the Docker CLI cannot be reached.
 *
 * @param options - Docker verification options.
+* @param options.dockerPath - Path to the Docker CLI executable.
+* @param options.operation - Optional human-readable operation description for the error message
+*   headline. When provided, produces "before ${operation}". When omitted, the clause is skipped.
+* @param options.imageNoun - Noun describing what needs to be built (e.g. "the configured image").
+* @param options.hint - Optional context-specific hint appended to the error message.
 */
-const verifyDockerInstalled = async ({ dockerPath, numberOfContainers, isDev = true, isDryRun = false }) => {
+const verifyDockerInstalled = async ({ dockerPath, operation, imageNoun, hint }) => {
 	if (!await isDockerRunning(dockerPath)) throw new UserError(getFailedToRunDockerErrorMessage({
-		numberOfContainers,
-		isDev,
-		isDryRun
+		operation,
+		imageNoun,
+		hint
 	}), { telemetryMessage: false });
 };
 /**
 * Builds the user-facing error message shown when Docker cannot be reached.
 *
-* @param options - Docker verification options.
+* @param options - Options controlling the error message content.
+* @param options.operation - Optional human-readable operation description for the headline.
+* @param options.imageNoun - Noun describing what needs to be built.
+* @param options.hint - Optional context-specific hint paragraph.
 *
 * @returns The formatted error message string.
 */
-function getFailedToRunDockerErrorMessage({ numberOfContainers, isDev, isDryRun }) {
-	const headline = `The Docker CLI is needed to build the configured ${numberOfContainers !== 1 ? "images" : "image"} before ${isDev ? "running dev" : `deploying${isDryRun ? " (even in dry-run mode)" : ""}`} but could not be launched.`;
+function getFailedToRunDockerErrorMessage({ operation, imageNoun, hint }) {
+	const headline = `The Docker CLI is needed to build ${imageNoun}${operation ? ` before ${operation}` : ""} but could not be launched.`;
 	let daemonHint;
 	if (process.platform === "darwin") daemonHint = "open the Docker Desktop app or run `open -a Docker`";
 	else if (process.platform === "win32") daemonHint = "open the Docker Desktop app";
 	else daemonHint = "run `sudo systemctl start docker`";
-	return `${headline}\n${`To fix this, try the following:
+	let message = `${headline}\n${`To fix this, try the following:
   - If Docker is not installed, download it from https://docs.docker.com/get-started/get-docker/
   - If Docker is installed but the daemon is not running,\n    ${daemonHint}.\n  - If you use an alternative Docker-compatible CLI (e.g. Podman),
-    set the WRANGLER_DOCKER_BIN environment variable to its path and DOCKER_HOST to its socket.`}\n\nNote: Other container tooling that is compatible with the Docker CLI and engine may work, but is not yet guaranteed to do so.\n\n${isDev ? "To suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your Wrangler config or pass --enable-containers=false." : "If you cannot run Docker locally, you can still deploy your Worker by passing --containers-rollout=none. This will not deploy or update your Container."}`;
+    set the WRANGLER_DOCKER_BIN environment variable to its path and DOCKER_HOST to its socket.`}\n\nNote: Other container tooling that is compatible with the Docker CLI and engine may work, but is not yet guaranteed to do so.`;
+	if (hint) message += `\n\n${hint}`;
+	return message;
 }
 /**
 * Kills and removes any containers which come from the given image tag
@@ -61390,6 +61262,176 @@ function getImageTag(imageTag) {
 	return tagSeparatorIndex === -1 ? void 0 : imageTag.slice(tagSeparatorIndex + 1);
 }
 
+//#endregion
+//#region ../containers-shared/src/build.ts
+async function constructBuildCommand(options, logger) {
+	const platform$1 = options.platform ?? "linux/amd64";
+	const buildCmd = [
+		"build",
+		"--load",
+		"-t",
+		options.tag,
+		"--platform",
+		platform$1,
+		"--provenance=false"
+	];
+	if (options.args) for (const arg in options.args) buildCmd.push("--build-arg", `${arg}=${options.args[arg]}`);
+	if (options.setNetworkToHost) buildCmd.push("--network", "host");
+	const dockerfile = readFileSync(options.pathToDockerfile, "utf-8");
+	buildCmd.push("-f", "-");
+	buildCmd.push(options.buildContext);
+	logger?.debug(`Building image with command: ${buildCmd.join(" ")}`);
+	return {
+		buildCmd,
+		dockerfile
+	};
+}
+/**
+* Spawns a Docker build process and returns a handle to abort or await the build.
+*
+* By default this function first verifies that the Docker daemon is reachable.
+* Callers that have already performed this check (e.g. the dev and deploy flows)
+* should pass `verifyDockerIsRunning: false` to avoid a redundant check.
+*
+* @param dockerPath - Path to the Docker CLI executable.
+* @param options - Build options including the command arguments and Dockerfile content.
+* @param options.buildCmd - The Docker build command arguments.
+* @param options.dockerfile - The Dockerfile content to pipe into stdin.
+* @param options.verifyDockerIsRunning - When `true` (the default), verifies Docker is installed
+*   and the daemon is running before spawning the build. Set to `false` to skip the check.
+*
+* @returns An object with an `abort` function and a `ready` promise.
+*/
+async function dockerBuild(dockerPath, options) {
+	if (options.verifyDockerIsRunning !== false) await verifyDockerInstalled({
+		dockerPath,
+		imageNoun: "the image"
+	});
+	let errorHandled = false;
+	let resolve$4;
+	let reject;
+	const ready = new Promise((res, rej) => {
+		resolve$4 = res;
+		reject = rej;
+	});
+	const child = spawn(dockerPath, options.buildCmd, {
+		stdio: [
+			"pipe",
+			"inherit",
+			"inherit"
+		],
+		detached: process.platform !== "win32",
+		windowsHide: true
+	});
+	if (child.stdin !== null) {
+		child.stdin.write(options.dockerfile);
+		child.stdin.end();
+	}
+	child.on("exit", (code) => {
+		if (code === 0) resolve$4();
+		else if (!errorHandled) {
+			errorHandled = true;
+			reject(new UserError(`Docker build exited with code: ${code}`, { telemetryMessage: false }));
+		}
+	});
+	child.on("error", (err) => {
+		if (!errorHandled) {
+			errorHandled = true;
+			reject(err);
+		}
+	});
+	return {
+		abort: () => {
+			child.unref();
+			if (child.pid !== void 0) if (process.platform === "win32") child.kill();
+			else process.kill(-child.pid);
+		},
+		ready
+	};
+}
+/**
+* Builds a container image from the given container dev options.
+*
+* @param dockerPath - Path to the Docker CLI executable.
+* @param options - Container configuration including the Dockerfile path, build context, and image tag.
+* @param verifyDockerIsRunning - When `true` (the default), verifies Docker is installed
+*   and the daemon is running before building. Set to `false` when the caller has already
+*   performed this check.
+*
+* @returns An object with an `abort` function and a `ready` promise.
+*/
+async function buildImage(dockerPath, options, verifyDockerIsRunning) {
+	const { buildCmd, dockerfile } = await constructBuildCommand({
+		tag: options.image_tag,
+		pathToDockerfile: options.dockerfile,
+		buildContext: options.image_build_context,
+		args: options.image_vars,
+		platform: "linux/amd64"
+	});
+	return dockerBuild(dockerPath, {
+		buildCmd,
+		dockerfile,
+		verifyDockerIsRunning
+	});
+}
+
+//#endregion
+//#region ../containers-shared/src/login.ts
+function configureOpenAPIForContainerPull(accountId, apiToken, apiBase = "https://api.cloudflare.com/client/v4") {
+	OpenAPI.BASE = `${apiBase}/accounts/${accountId}/containers`;
+	OpenAPI.CREDENTIALS = "omit";
+	OpenAPI.HEADERS = {
+		...typeof OpenAPI.HEADERS === "object" ? OpenAPI.HEADERS : {},
+		Authorization: `Bearer ${apiToken}`
+	};
+}
+/**
+* Gets push and pull credentials for a configured image registry
+* and runs `docker login`, so subsequent image pushes or pulls are
+* authenticated
+*/
+async function dockerLoginImageRegistry(pathToDocker, domain) {
+	const credentials = await ImageRegistriesService.generateImageRegistryCredentials(domain, {
+		expiration_minutes: 15,
+		permissions: [ImageRegistryPermissions.PUSH, ImageRegistryPermissions.PULL]
+	});
+	const child = spawn(pathToDocker, [
+		"login",
+		"--password-stdin",
+		"--username",
+		credentials.username,
+		domain
+	], { stdio: [
+		"pipe",
+		"inherit",
+		"inherit"
+	] }).on("error", (err) => {
+		throw err;
+	});
+	child.stdin.write(credentials.password);
+	child.stdin.end();
+	await new Promise((resolve$4, reject) => {
+		child.on("close", (code) => {
+			if (code === 0) resolve$4();
+			else reject(new UserError(`Login failed with code: ${code}`, { telemetryMessage: false }));
+		});
+	});
+}
+
+//#endregion
+//#region ../containers-shared/src/registry.ts
+const MF_DEV_CONTAINER_PREFIX = "cloudflare-dev";
+
+//#endregion
+//#region ../containers-shared/src/knobs.ts
+const getCloudflareContainerRegistry = () => {
+	return process.env.CLOUDFLARE_CONTAINER_REGISTRY ?? (process.env.WRANGLER_API_ENVIRONMENT === "staging" ? "staging.registry.cloudflare.com" : "registry.cloudflare.com");
+};
+/** Prefixes with the cloudflare-dev namespace. The name should be the container's DO classname, and the tag a build uuid. */
+const getDevContainerImageName = (name, tag) => {
+	return `${MF_DEV_CONTAINER_PREFIX}/${name.toLowerCase()}:${tag}`;
+};
+
 //#endregion
 //#region ../containers-shared/src/images.ts
 const DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE = "cloudflare/proxy-everything:3cb1195@sha256:0ef6716c52430096900b150d84a3302057d6cd2319dae7987128c85d0733e3c8";
@@ -61450,11 +61492,13 @@ async function prepareContainerImagesForDev(args) {
 	if (process.platform === "win32") throw new UserError("Local development with containers is currently not supported on Windows. You should use WSL instead. You can also set `enable_containers` to false if you do not need to develop the container part of your application.", { telemetryMessage: false });
 	await verifyDockerInstalled({
 		dockerPath,
-		numberOfContainers: containerOptions.length
+		operation: "running dev",
+		imageNoun: containerOptions.length !== 1 ? "the configured images" : "the configured image",
+		hint: "To suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your Wrangler config or pass --enable-containers=false."
 	});
 	for (const options of containerOptions) {
 		if ("dockerfile" in options) {
-			const build$8 = await buildImage(dockerPath, options);
+			const build$8 = await buildImage(dockerPath, options, false);
 			onContainerImagePreparationStart({
 				containerOptions: options,
 				abort: () => {
@@ -64980,19 +65024,13 @@ const outputConfigPlugin = createPlugin("output-config", (ctx) => {
 				assert(entryChunk, `Expected entry chunk with name "${MAIN_ENTRY_NAME}"`);
 				const isPrerenderWorker = this.environment.name === ctx.resolvedPluginConfig.prerenderWorkerEnvironmentName;
 				const isEntryWorker = ctx.resolvedPluginConfig.type === "workers" && this.environment.name === ctx.resolvedPluginConfig.entryWorkerEnvironmentName;
-				outputConfig = {
-					...inputWorkerConfig,
-					main: entryChunk.fileName,
-					no_bundle: true,
-					rules: [{
-						type: "ESModule",
-						globs: ["**/*.js", "**/*.mjs"]
-					}],
-					assets: isEntryWorker || isPrerenderWorker ? {
-						...inputWorkerConfig.assets,
-						directory: getAssetsDirectory(this.environment.config.build.outDir, ctx.resolvedViteConfig)
-					} : void 0
-				};
+				outputConfig = getOutputConfig({
+					inputWorkerConfig,
+					workerOutputDirectory: this.environment.config.build.outDir,
+					resolvedViteConfig: ctx.resolvedViteConfig,
+					entryFileName: entryChunk.fileName,
+					includeAssets: isEntryWorker || isPrerenderWorker
+				});
 				if (inputWorkerConfig.upload_source_maps === void 0 && this.environment.config.build.sourcemap) outputConfig.upload_source_maps = true;
 				if (inputWorkerConfig.configPath) {
 					const localDevVars = getLocalDevVarsForPreview(inputWorkerConfig, ctx.resolvedPluginConfig.cloudflareEnv);
@@ -65035,6 +65073,40 @@ const outputConfigPlugin = createPlugin("output-config", (ctx) => {
 		}
 	};
 });
+function getOutputConfig({ inputWorkerConfig, workerOutputDirectory, resolvedViteConfig, entryFileName, includeAssets }) {
+	const sourceConfigDirectory = inputWorkerConfig.configPath ? nodePath.dirname(inputWorkerConfig.configPath) : resolvedViteConfig.root;
+	const outputDirectory = nodePath.resolve(resolvedViteConfig.root, workerOutputDirectory);
+	return {
+		...inputWorkerConfig,
+		main: entryFileName,
+		no_bundle: true,
+		rules: [{
+			type: "ESModule",
+			globs: ["**/*.js", "**/*.mjs"]
+		}],
+		assets: includeAssets ? {
+			...inputWorkerConfig.assets,
+			directory: getAssetsDirectory(workerOutputDirectory, resolvedViteConfig)
+		} : void 0,
+		d1_databases: inputWorkerConfig.d1_databases.map((database) => {
+			const sourceMigrationsDir = database.migrations_dir ?? "migrations";
+			const sourceMigrationsPath = nodePath.resolve(sourceConfigDirectory, sourceMigrationsDir);
+			const outputMigrationsDir = vite.normalizePath(nodePath.relative(outputDirectory, sourceMigrationsPath) || ".");
+			return {
+				...database,
+				migrations_dir: outputMigrationsDir,
+				migrations_pattern: rewriteMigrationsPattern(database.migrations_pattern, sourceMigrationsDir, outputMigrationsDir)
+			};
+		})
+	};
+}
+function rewriteMigrationsPattern(migrationsPattern, fromMigrationsDir, toMigrationsDir) {
+	if (migrationsPattern === void 0) return;
+	const normalizedDir = nodePath.posix.normalize(vite.normalizePath(fromMigrationsDir));
+	const normalizedPattern = nodePath.posix.normalize(vite.normalizePath(migrationsPattern));
+	const suffix = normalizedDir === "." ? normalizedPattern : nodePath.posix.relative(normalizedDir, normalizedPattern);
+	return vite.normalizePath(nodePath.posix.normalize(toMigrationsDir === "." ? suffix : `${toMigrationsDir}/${suffix}`));
+}
 function readAssetsIgnoreFile(assetsIgnorePath) {
 	const content = fs$1.existsSync(assetsIgnorePath) ? fs$1.readFileSync(assetsIgnorePath, "utf-8") : "";
 	if (content.length === 0) return "";