@cloudflare/vite-plugin 1.22.0 → 1.23.0

package/dist/index.mjs

@@ -3,7 +3,7 @@ import assert from "node:assert";
 import { CoreHeaders, Log, LogLevel, Miniflare, Request as Request$1, Response as Response$1, coupleWebSocket, getDefaultDevRegistryPath, getNodeCompat, getWorkerRegistry, kUnsafeEphemeralUniqueKey } from "miniflare";
 import * as wrangler from "wrangler";
 import * as nodePath from "node:path";
-import path4, { relative, resolve } from "node:path";
+import path3, { relative, resolve } from "node:path";
 import * as util$1 from "node:util";
 import { format, inspect } from "node:util";
 import * as vite from "vite";
@@ -1776,12 +1776,12 @@ var PluginContext = class {
 		return this.#resolvedViteConfig;
 	}
 	isChildEnvironment(environmentName) {
-		if (this.resolvedPluginConfig.type !== "workers") return false;
+		if (this.resolvedPluginConfig.type === "preview") return false;
 		for (const childEnvironmentNames of this.resolvedPluginConfig.environmentNameToChildEnvironmentNamesMap.values()) if (childEnvironmentNames.includes(environmentName)) return true;
 		return false;
 	}
 	#getWorker(environmentName) {
-		if (this.resolvedPluginConfig.type !== "workers") return;
+		if (this.resolvedPluginConfig.type === "preview") return;
 		const worker = this.resolvedPluginConfig.environmentNameToWorkerMap.get(environmentName);
 		if (worker) return worker;
 		for (const [parentEnvironmentName, childEnvironmentNames] of this.resolvedPluginConfig.environmentNameToChildEnvironmentNamesMap) if (childEnvironmentNames.includes(environmentName)) return this.resolvedPluginConfig.environmentNameToWorkerMap.get(parentEnvironmentName);
@@ -1790,11 +1790,8 @@ var PluginContext = class {
 		return this.#getWorker(environmentName)?.config;
 	}
 	get allWorkerConfigs() {
-		switch (this.resolvedPluginConfig.type) {
-			case "workers": return Array.from(this.resolvedPluginConfig.environmentNameToWorkerMap.values()).map((worker) => worker.config);
-			case "preview": return this.resolvedPluginConfig.workers;
-			default: return [];
-		}
+		if (this.resolvedPluginConfig.type === "preview") return this.resolvedPluginConfig.workers;
+		return Array.from(this.resolvedPluginConfig.environmentNameToWorkerMap.values()).map((worker) => worker.config);
 	}
 	get entryWorkerConfig() {
 		if (this.resolvedPluginConfig.type !== "workers") return;
@@ -1928,10 +1925,10 @@ var ENVIRONMENT_TAG_PREFIX = "cf:environment=";
 var PATH_TO_DEPLOY_CONFIG = ".wrangler/deploy/config.json";
 
 //#endregion
-//#region ../workers-utils/dist/chunk-4N6XW2IM.mjs
+//#region ../workers-utils/dist/chunk-4233U5MA.mjs
 function getLocalWorkerdCompatibilityDate({ projectPath = process.cwd() } = {}) {
 	try {
-		const miniflareEntry = module$1.createRequire(projectPath).resolve("miniflare");
+		const miniflareEntry = module$1.createRequire(path3.join(projectPath, "package.json")).resolve("miniflare");
 		const workerdDate = module$1.createRequire(miniflareEntry)("workerd").compatibilityDate;
 		return {
 			date: toSafeCompatibilityDate(new Date(workerdDate)),
@@ -2226,7 +2223,7 @@ __name(constructWranglerConfig, "constructWranglerConfig");
 
 //#endregion
 //#region ../workers-utils/dist/chunk-AT3LIX2I.mjs
-var UserError$1 = class extends Error {
+var UserError = class extends Error {
 	static {
 		__name(this, "UserError");
 	}
@@ -2237,7 +2234,7 @@ var UserError$1 = class extends Error {
 		this.telemetryMessage = options?.telemetryMessage === true ? message : options?.telemetryMessage;
 	}
 };
-var DeprecationError = class extends UserError$1 {
+var DeprecationError = class extends UserError {
 	static {
 		__name(this, "DeprecationError");
 	}
@@ -2246,7 +2243,7 @@ var DeprecationError = class extends UserError$1 {
 ${message}`, options);
 	}
 };
-var FatalError = class extends UserError$1 {
+var FatalError = class extends UserError {
 	constructor(message, code, options) {
 		super(message, options);
 		this.code = code;
@@ -2255,7 +2252,7 @@ var FatalError = class extends UserError$1 {
 		__name(this, "FatalError");
 	}
 };
-var CommandLineArgsError = class extends UserError$1 {
+var CommandLineArgsError = class extends UserError {
 	static {
 		__name(this, "CommandLineArgsError");
 	}
@@ -2981,10 +2978,10 @@ function parseTree(text, errors = [], options = ParseOptions.DEFAULT) {
 	return result;
 }
 __name(parseTree, "parseTree");
-function findNodeAtLocation(root, path4$1) {
+function findNodeAtLocation(root, path4) {
 	if (!root) return;
 	let node = root;
-	for (let segment of path4$1) if (typeof segment === "string") {
+	for (let segment of path4) if (typeof segment === "string") {
 		if (node.type !== "object" || !Array.isArray(node.children)) return;
 		let found = false;
 		for (const propertyNode of node.children) if (Array.isArray(propertyNode.children) && propertyNode.children[0].value === segment && propertyNode.children.length === 2) {
@@ -3211,13 +3208,13 @@ function getNodeType(value) {
 }
 __name(getNodeType, "getNodeType");
 function setProperty(text, originalPath, value, options) {
-	const path4$1 = originalPath.slice();
+	const path4 = originalPath.slice();
 	const root = parseTree(text, []);
 	let parent = void 0;
 	let lastSegment = void 0;
-	while (path4$1.length > 0) {
-		lastSegment = path4$1.pop();
-		parent = findNodeAtLocation(root, path4$1);
+	while (path4.length > 0) {
+		lastSegment = path4.pop();
+		parent = findNodeAtLocation(root, path4);
 		if (parent === void 0 && value !== void 0) if (typeof lastSegment === "string") value = { [lastSegment]: value };
 		else value = [value];
 		else break;
@@ -3459,8 +3456,8 @@ function format2(documentText, range, options) {
 	return format$1(documentText, range, options);
 }
 __name(format2, "format");
-function modify(text, path4$1, value, options) {
-	return setProperty(text, path4$1, value, options);
+function modify(text, path4, value, options) {
+	return setProperty(text, path4, value, options);
 }
 __name(modify, "modify");
 function applyEdits(text, edits) {
@@ -4198,7 +4195,7 @@ var dist_default = {
 	TomlDate,
 	TomlError
 };
-var ParseError = class extends UserError$1 {
+var ParseError = class extends UserError {
 	static {
 		__name(this, "ParseError");
 	}
@@ -4507,15 +4504,15 @@ function locatePathSync(paths, { cwd = process2.cwd(), type = "file", allowSymli
 	cwd = toPath(cwd);
 	const statFunction = allowSymlinks ? fs.statSync : fs.lstatSync;
 	for (const path_ of paths) try {
-		if (matchType(type, statFunction(path4.resolve(cwd, path_)))) return path_;
+		if (matchType(type, statFunction(path3.resolve(cwd, path_)))) return path_;
 	} catch {}
 }
 __name(locatePathSync, "locatePathSync");
 var toPath2 = /* @__PURE__ */ __name((urlOrPath) => urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath, "toPath");
 var findUpStop = Symbol("findUpStop");
 function findUpMultipleSync(name, options = {}) {
-	let directory = path4.resolve(toPath2(options.cwd) || "");
-	const { root } = path4.parse(directory);
+	let directory = path3.resolve(toPath2(options.cwd) || "");
+	const { root } = path3.parse(directory);
 	const stopAt = options.stopAt || root;
 	const limit = options.limit || Number.POSITIVE_INFINITY;
 	const paths = [name].flat();
@@ -4532,9 +4529,9 @@ function findUpMultipleSync(name, options = {}) {
 			cwd: directory
 		});
 		if (foundPath === findUpStop) break;
-		if (foundPath) matches.push(path4.resolve(directory, foundPath));
+		if (foundPath) matches.push(path3.resolve(directory, foundPath));
 		if (directory === stopAt || matches.length >= limit) break;
-		directory = path4.dirname(directory);
+		directory = path3.dirname(directory);
 	}
 	return matches;
 }
@@ -4587,7 +4584,7 @@ function resolveWranglerConfigPath({ config, script }, options) {
 		deployConfigPath: void 0,
 		redirected: false
 	};
-	return findWranglerConfig$1(script !== void 0 ? path4.dirname(script) : process.cwd(), options);
+	return findWranglerConfig$1(script !== void 0 ? path3.dirname(script) : process.cwd(), options);
 }
 __name(resolveWranglerConfigPath, "resolveWranglerConfigPath");
 function findWranglerConfig$1(referencePath = process.cwd(), { useRedirectIfAvailable = false } = {}) {
@@ -4618,26 +4615,26 @@ function findRedirectedWranglerConfig(cwd, userConfigPath) {
 	const deployConfigFile = readFileSync$1(deployConfigPath);
 	try {
 		const deployConfig = parseJSONC(deployConfigFile, deployConfigPath);
-		redirectedConfigPath = deployConfig.configPath && path4.resolve(path4.dirname(deployConfigPath), deployConfig.configPath);
+		redirectedConfigPath = deployConfig.configPath && path3.resolve(path3.dirname(deployConfigPath), deployConfig.configPath);
 	} catch (e) {
-		throw new UserError$1(`Failed to parse the deploy configuration file at ${path4.relative(".", deployConfigPath)}`, { cause: e });
+		throw new UserError(`Failed to parse the deploy configuration file at ${path3.relative(".", deployConfigPath)}`, { cause: e });
 	}
-	if (!redirectedConfigPath) throw new UserError$1(esm_default`
-			A deploy configuration file was found at "${path4.relative(".", deployConfigPath)}".
+	if (!redirectedConfigPath) throw new UserError(esm_default`
+			A deploy configuration file was found at "${path3.relative(".", deployConfigPath)}".
 			But this is not valid - the required "configPath" property was not found.
 			Instead this file contains:
 			\`\`\`
 			${deployConfigFile}
 			\`\`\`
 		`);
-	if (!existsSync(redirectedConfigPath)) throw new UserError$1(esm_default`
-				There is a deploy configuration at "${path4.relative(".", deployConfigPath)}".
-				But the redirected configuration path it points to, "${path4.relative(".", redirectedConfigPath)}", does not exist.
+	if (!existsSync(redirectedConfigPath)) throw new UserError(esm_default`
+				There is a deploy configuration at "${path3.relative(".", deployConfigPath)}".
+				But the redirected configuration path it points to, "${path3.relative(".", redirectedConfigPath)}", does not exist.
 			`);
 	if (userConfigPath) {
-		if (path4.join(path4.dirname(userConfigPath), PATH_TO_DEPLOY_CONFIG) !== deployConfigPath) throw new UserError$1(esm_default`
-					Found both a user configuration file at "${path4.relative(".", userConfigPath)}"
-					and a deploy configuration file at "${path4.relative(".", deployConfigPath)}".
+		if (path3.join(path3.dirname(userConfigPath), PATH_TO_DEPLOY_CONFIG) !== deployConfigPath) throw new UserError(esm_default`
+					Found both a user configuration file at "${path3.relative(".", userConfigPath)}"
+					and a deploy configuration file at "${path3.relative(".", deployConfigPath)}".
 					But these do not share the same base path so it is not clear which should be used.
 				`);
 	}
@@ -4696,7 +4693,7 @@ var require_XDGAppPaths = __commonJS({ "../../node_modules/.pnpm/xdg-app-paths@8
 	}
 	__name(typeOf, "typeOf");
 	function Adapt(adapter_) {
-		var meta = adapter_.meta, path5 = adapter_.path, xdg = adapter_.xdg;
+		var meta = adapter_.meta, path4 = adapter_.path, xdg = adapter_.xdg;
 		return { XDGAppPaths: new (/* @__PURE__ */ function() {
 			function XDGAppPaths_2(options_) {
 				if (options_ === void 0) options_ = {};
@@ -4714,7 +4711,7 @@ var require_XDGAppPaths = __commonJS({ "../../node_modules/.pnpm/xdg-app-paths@8
 					meta.pkgMainFilename(),
 					meta.mainFilename()
 				];
-				var name = path5.parse(((_c = namePriorityList.find(function(e) {
+				var name = path4.parse(((_c = namePriorityList.find(function(e) {
 					return isString2(e);
 				})) !== null && _c !== void 0 ? _c : "$eval") + suffix).name;
 				XDGAppPaths.$name = /* @__PURE__ */ __name(function $name() {
@@ -4734,28 +4731,28 @@ var require_XDGAppPaths = __commonJS({ "../../node_modules/.pnpm/xdg-app-paths@8
 				}
 				__name(finalPathSegment, "finalPathSegment");
 				XDGAppPaths.cache = /* @__PURE__ */ __name(function cache$2(dirOptions) {
-					return path5.join(xdg.cache(), finalPathSegment(dirOptions));
+					return path4.join(xdg.cache(), finalPathSegment(dirOptions));
 				}, "cache");
 				XDGAppPaths.config = /* @__PURE__ */ __name(function config(dirOptions) {
-					return path5.join(xdg.config(), finalPathSegment(dirOptions));
+					return path4.join(xdg.config(), finalPathSegment(dirOptions));
 				}, "config");
 				XDGAppPaths.data = /* @__PURE__ */ __name(function data$1(dirOptions) {
-					return path5.join(xdg.data(), finalPathSegment(dirOptions));
+					return path4.join(xdg.data(), finalPathSegment(dirOptions));
 				}, "data");
 				XDGAppPaths.runtime = /* @__PURE__ */ __name(function runtime(dirOptions) {
-					return xdg.runtime() ? path5.join(xdg.runtime(), finalPathSegment(dirOptions)) : void 0;
+					return xdg.runtime() ? path4.join(xdg.runtime(), finalPathSegment(dirOptions)) : void 0;
 				}, "runtime");
 				XDGAppPaths.state = /* @__PURE__ */ __name(function state(dirOptions) {
-					return path5.join(xdg.state(), finalPathSegment(dirOptions));
+					return path4.join(xdg.state(), finalPathSegment(dirOptions));
 				}, "state");
 				XDGAppPaths.configDirs = /* @__PURE__ */ __name(function configDirs(dirOptions) {
 					return xdg.configDirs().map(function(s) {
-						return path5.join(s, finalPathSegment(dirOptions));
+						return path4.join(s, finalPathSegment(dirOptions));
 					});
 				}, "configDirs");
 				XDGAppPaths.dataDirs = /* @__PURE__ */ __name(function dataDirs(dirOptions) {
 					return xdg.dataDirs().map(function(s) {
-						return path5.join(s, finalPathSegment(dirOptions));
+						return path4.join(s, finalPathSegment(dirOptions));
 					});
 				}, "dataDirs");
 				return XDGAppPaths;
@@ -4775,7 +4772,7 @@ var require_XDG = __commonJS({ "../../node_modules/.pnpm/xdg-portable@10.6.0/nod
 	exports$1.__esModule = true;
 	exports$1.Adapt = void 0;
 	function Adapt(adapter_) {
-		var env$1 = adapter_.env, osPaths = adapter_.osPaths, path5 = adapter_.path;
+		var env$1 = adapter_.env, osPaths = adapter_.osPaths, path4 = adapter_.path;
 		var isMacOS = /^darwin$/i.test(adapter_.process.platform);
 		var isWinOS = /^win/i.test(adapter_.process.platform);
 		function baseDir() {
@@ -4783,7 +4780,7 @@ var require_XDG = __commonJS({ "../../node_modules/.pnpm/xdg-portable@10.6.0/nod
 		}
 		__name(baseDir, "baseDir");
 		function valOrPath(val, pathSegments) {
-			return val || path5.join.apply(path5, pathSegments);
+			return val || path4.join.apply(path4, pathSegments);
 		}
 		__name(valOrPath, "valOrPath");
 		var linux = /* @__PURE__ */ __name(function() {
@@ -4897,11 +4894,11 @@ var require_XDG = __commonJS({ "../../node_modules/.pnpm/xdg-portable@10.6.0/nod
 				XDG.state = extension.state;
 				XDG.configDirs = /* @__PURE__ */ __name(function configDirs() {
 					var pathList = env$1.get("XDG_CONFIG_DIRS");
-					return __spreadArray([extension.config()], pathList ? pathList.split(path5.delimiter) : []);
+					return __spreadArray([extension.config()], pathList ? pathList.split(path4.delimiter) : []);
 				}, "configDirs");
 				XDG.dataDirs = /* @__PURE__ */ __name(function dataDirs() {
 					var pathList = env$1.get("XDG_DATA_DIRS");
-					return __spreadArray([extension.data()], pathList ? pathList.split(path5.delimiter) : []);
+					return __spreadArray([extension.data()], pathList ? pathList.split(path4.delimiter) : []);
 				}, "dataDirs");
 				return XDG;
 			}
@@ -4924,7 +4921,7 @@ var require_OSPaths = __commonJS({ "../../node_modules/.pnpm/os-paths@7.4.0/node
 	}
 	__name(isEmpty, "isEmpty");
 	function Adapt(adapter_) {
-		var env$1 = adapter_.env, os2 = adapter_.os, path5 = adapter_.path;
+		var env$1 = adapter_.env, os2 = adapter_.os, path4 = adapter_.path;
 		var isWinOS = /^win/i.test(adapter_.process.platform);
 		function normalizePath$1(path_) {
 			return path_ ? adapter_.path.normalize(adapter_.path.join(path_, ".")) : void 0;
@@ -4936,7 +4933,7 @@ var require_OSPaths = __commonJS({ "../../node_modules/.pnpm/os-paths@7.4.0/node
 					typeof os2.homedir === "function" ? os2.homedir() : void 0,
 					env$1.get("USERPROFILE"),
 					env$1.get("HOME"),
-					env$1.get("HOMEDRIVE") || env$1.get("HOMEPATH") ? path5.join(env$1.get("HOMEDRIVE") || "", env$1.get("HOMEPATH") || "") : void 0
+					env$1.get("HOMEDRIVE") || env$1.get("HOMEPATH") ? path4.join(env$1.get("HOMEDRIVE") || "", env$1.get("HOMEPATH") || "") : void 0
 				].find(function(v) {
 					return !isEmpty(v);
 				}));
@@ -4947,7 +4944,7 @@ var require_OSPaths = __commonJS({ "../../node_modules/.pnpm/os-paths@7.4.0/node
 		__name(home, "home");
 		function temp() {
 			function joinPathToBase(base, segments) {
-				return base ? path5.join.apply(path5, __spreadArray([base], segments)) : void 0;
+				return base ? path4.join.apply(path4, __spreadArray([base], segments)) : void 0;
 			}
 			__name(joinPathToBase, "joinPathToBase");
 			function posix$1() {
@@ -5052,14 +5049,14 @@ var require_node = __commonJS({ "../../node_modules/.pnpm/os-paths@7.4.0/node_mo
 	exports$1.__esModule = true;
 	exports$1.adapter = void 0;
 	var os2 = __importStar$1(__require("os"));
-	var path5 = __importStar$1(__require("path"));
+	var path4 = __importStar$1(__require("path"));
 	exports$1.adapter = {
 		atImportPermissions: { env: true },
 		env: { get: /* @__PURE__ */ __name(function(s) {
 			return process.env[s];
 		}, "get") },
 		os: os2,
-		path: path5,
+		path: path4,
 		process
 	};
 } });
@@ -5103,7 +5100,7 @@ var require_node2 = __commonJS({ "../../node_modules/.pnpm/xdg-portable@10.6.0/n
 	};
 	exports$1.__esModule = true;
 	exports$1.adapter = void 0;
-	var path5 = __importStar$1(__require("path"));
+	var path4 = __importStar$1(__require("path"));
 	var os_paths_1 = __importDefault$2(require_mod_cjs());
 	exports$1.adapter = {
 		atImportPermissions: { env: true },
@@ -5111,7 +5108,7 @@ var require_node2 = __commonJS({ "../../node_modules/.pnpm/xdg-portable@10.6.0/n
 			return process.env[s];
 		}, "get") },
 		osPaths: os_paths_1["default"],
-		path: path5,
+		path: path4,
 		process
 	};
 } });
@@ -5155,7 +5152,7 @@ var require_node3 = __commonJS({ "../../node_modules/.pnpm/xdg-app-paths@8.3.0/n
 	};
 	exports$1.__esModule = true;
 	exports$1.adapter = void 0;
-	var path5 = __importStar$1(__require("path"));
+	var path4 = __importStar$1(__require("path"));
 	var xdg_portable_1 = __importDefault$2(require_mod_cjs2());
 	exports$1.adapter = {
 		atImportPermissions: {
@@ -5171,7 +5168,7 @@ var require_node3 = __commonJS({ "../../node_modules/.pnpm/xdg-app-paths@8.3.0/n
 				return process.pkg ? process.execPath : void 0;
 			}, "pkgMainFilename")
 		},
-		path: path5,
+		path: path4,
 		process,
 		xdg: xdg_portable_1["default"]
 	};
@@ -5284,174 +5281,6 @@ var PatchConfigError = class extends Error {
 		__name(this, "PatchConfigError");
 	}
 };
-var ApplicationRollout$1;
-((ApplicationRollout2) => {
-	((kind2) => {
-		kind2["FULL_AUTO"] = "full_auto";
-		kind2["FULL_MANUAL"] = "full_manual";
-		kind2["DURABLE_OBJECTS_AUTO"] = "durable_objects_auto";
-	})(ApplicationRollout2.kind || (ApplicationRollout2.kind = {}));
-	((strategy2) => {
-		strategy2["ROLLING"] = "rolling";
-	})(ApplicationRollout2.strategy || (ApplicationRollout2.strategy = {}));
-	((status2) => {
-		status2["PENDING"] = "pending";
-		status2["PROGRESSING"] = "progressing";
-		status2["COMPLETED"] = "completed";
-		status2["REVERTED"] = "reverted";
-		status2["REPLACED"] = "replaced";
-	})(ApplicationRollout2.status || (ApplicationRollout2.status = {}));
-})(ApplicationRollout$1 || (ApplicationRollout$1 = {}));
-var BadRequestWithCodeError$1;
-((BadRequestWithCodeError2) => {
-	((error2) => {
-		error2["VALIDATE_INPUT"] = "VALIDATE_INPUT";
-	})(BadRequestWithCodeError2.error || (BadRequestWithCodeError2.error = {}));
-})(BadRequestWithCodeError$1 || (BadRequestWithCodeError$1 = {}));
-var CreateApplicationRolloutRequest$1;
-((CreateApplicationRolloutRequest2) => {
-	((strategy2) => {
-		strategy2["ROLLING"] = "rolling";
-	})(CreateApplicationRolloutRequest2.strategy || (CreateApplicationRolloutRequest2.strategy = {}));
-	((step_percentage2) => {
-		step_percentage2[step_percentage2["_5"] = 5] = "_5";
-		step_percentage2[step_percentage2["_10"] = 10] = "_10";
-		step_percentage2[step_percentage2["_20"] = 20] = "_20";
-		step_percentage2[step_percentage2["_25"] = 25] = "_25";
-		step_percentage2[step_percentage2["_50"] = 50] = "_50";
-		step_percentage2[step_percentage2["_100"] = 100] = "_100";
-	})(CreateApplicationRolloutRequest2.step_percentage || (CreateApplicationRolloutRequest2.step_percentage = {}));
-	((kind2) => {
-		kind2["FULL_AUTO"] = "full_auto";
-		kind2["FULL_MANUAL"] = "full_manual";
-	})(CreateApplicationRolloutRequest2.kind || (CreateApplicationRolloutRequest2.kind = {}));
-})(CreateApplicationRolloutRequest$1 || (CreateApplicationRolloutRequest$1 = {}));
-var DeploymentNotFoundError$1;
-((DeploymentNotFoundError2) => {
-	((error2) => {
-		error2["DEPLOYMENT_NOT_FOUND"] = "DEPLOYMENT_NOT_FOUND";
-	})(DeploymentNotFoundError2.error || (DeploymentNotFoundError2.error = {}));
-})(DeploymentNotFoundError$1 || (DeploymentNotFoundError$1 = {}));
-var ImageRegistryAlreadyExistsError$1;
-((ImageRegistryAlreadyExistsError2) => {
-	((error2) => {
-		error2["IMAGE_REGISTRY_ALREADY_EXISTS"] = "IMAGE_REGISTRY_ALREADY_EXISTS";
-	})(ImageRegistryAlreadyExistsError2.error || (ImageRegistryAlreadyExistsError2.error = {}));
-})(ImageRegistryAlreadyExistsError$1 || (ImageRegistryAlreadyExistsError$1 = {}));
-var ImageRegistryIsPublic$1;
-((ImageRegistryIsPublic2) => {
-	((error2) => {
-		error2["IMAGE_REGISTRY_IS_PUBLIC"] = "IMAGE_REGISTRY_IS_PUBLIC";
-	})(ImageRegistryIsPublic2.error || (ImageRegistryIsPublic2.error = {}));
-})(ImageRegistryIsPublic$1 || (ImageRegistryIsPublic$1 = {}));
-var ImageRegistryNotAllowedError$1;
-((ImageRegistryNotAllowedError2) => {
-	((error2) => {
-		error2["IMAGE_REGISTRY_NOT_ALLOWED"] = "IMAGE_REGISTRY_NOT_ALLOWED";
-	})(ImageRegistryNotAllowedError2.error || (ImageRegistryNotAllowedError2.error = {}));
-})(ImageRegistryNotAllowedError$1 || (ImageRegistryNotAllowedError$1 = {}));
-var ImageRegistryNotFoundError$1;
-((ImageRegistryNotFoundError2) => {
-	((error2) => {
-		error2["IMAGE_REGISTRY_NOT_FOUND"] = "IMAGE_REGISTRY_NOT_FOUND";
-	})(ImageRegistryNotFoundError2.error || (ImageRegistryNotFoundError2.error = {}));
-})(ImageRegistryNotFoundError$1 || (ImageRegistryNotFoundError$1 = {}));
-var ImageRegistryProtocolAlreadyExists$1;
-((ImageRegistryProtocolAlreadyExists2) => {
-	((error2) => {
-		error2["IMAGE_REGISTRY_PROTOCOL_ALREADY_EXISTS"] = "IMAGE_REGISTRY_PROTOCOL_ALREADY_EXISTS";
-	})(ImageRegistryProtocolAlreadyExists2.error || (ImageRegistryProtocolAlreadyExists2.error = {}));
-})(ImageRegistryProtocolAlreadyExists$1 || (ImageRegistryProtocolAlreadyExists$1 = {}));
-var ImageRegistryProtocolIsReferencedError$1;
-((ImageRegistryProtocolIsReferencedError2) => {
-	((error2) => {
-		error2["IMAGE_REGISTRY_PROTO_IS_REFERENCED"] = "IMAGE_REGISTRY_PROTO_IS_REFERENCED";
-	})(ImageRegistryProtocolIsReferencedError2.error || (ImageRegistryProtocolIsReferencedError2.error = {}));
-})(ImageRegistryProtocolIsReferencedError$1 || (ImageRegistryProtocolIsReferencedError$1 = {}));
-var ImageRegistryProtocolNotFound$1;
-((ImageRegistryProtocolNotFound2) => {
-	((error2) => {
-		error2["IMAGE_REGISTRY_PROTOCOL_NOT_FOUND"] = "IMAGE_REGISTRY_PROTOCOL_NOT_FOUND";
-	})(ImageRegistryProtocolNotFound2.error || (ImageRegistryProtocolNotFound2.error = {}));
-})(ImageRegistryProtocolNotFound$1 || (ImageRegistryProtocolNotFound$1 = {}));
-var ProvisionerConfiguration$1;
-((ProvisionerConfiguration2) => {
-	((type2) => {
-		type2["NONE"] = "none";
-		type2["CLOUDINIT"] = "cloudinit";
-	})(ProvisionerConfiguration2.type || (ProvisionerConfiguration2.type = {}));
-})(ProvisionerConfiguration$1 || (ProvisionerConfiguration$1 = {}));
-var RolloutStep$1;
-((RolloutStep2) => {
-	((status2) => {
-		status2["PENDING"] = "pending";
-		status2["PROGRESSING"] = "progressing";
-		status2["REVERTING"] = "reverting";
-		status2["COMPLETED"] = "completed";
-		status2["REVERTED"] = "reverted";
-	})(RolloutStep2.status || (RolloutStep2.status = {}));
-})(RolloutStep$1 || (RolloutStep$1 = {}));
-var SecretNameAlreadyExists$1;
-((SecretNameAlreadyExists2) => {
-	((error2) => {
-		error2["SECRET_NAME_ALREADY_EXISTS"] = "SECRET_NAME_ALREADY_EXISTS";
-	})(SecretNameAlreadyExists2.error || (SecretNameAlreadyExists2.error = {}));
-})(SecretNameAlreadyExists$1 || (SecretNameAlreadyExists$1 = {}));
-var SecretNotFound$1;
-((SecretNotFound2) => {
-	((error2) => {
-		error2["SECRET_NAME_NOT_FOUND"] = "SECRET_NAME_NOT_FOUND";
-	})(SecretNotFound2.error || (SecretNotFound2.error = {}));
-})(SecretNotFound$1 || (SecretNotFound$1 = {}));
-var SSHPublicKeyNotFoundError$1;
-((SSHPublicKeyNotFoundError2) => {
-	((error2) => {
-		error2["SSH_PUBLIC_KEY_NOT_FOUND"] = "SSH_PUBLIC_KEY_NOT_FOUND";
-	})(SSHPublicKeyNotFoundError2.error || (SSHPublicKeyNotFoundError2.error = {}));
-})(SSHPublicKeyNotFoundError$1 || (SSHPublicKeyNotFoundError$1 = {}));
-var UpdateApplicationRolloutRequest$1;
-((UpdateApplicationRolloutRequest2) => {
-	((action2) => {
-		action2["NEXT"] = "next";
-		action2["PREVIOUS"] = "previous";
-		action2["REVERT"] = "revert";
-	})(UpdateApplicationRolloutRequest2.action || (UpdateApplicationRolloutRequest2.action = {}));
-})(UpdateApplicationRolloutRequest$1 || (UpdateApplicationRolloutRequest$1 = {}));
-var UserError2 = class extends Error {
-	static {
-		__name(this, "UserError");
-	}
-	telemetryMessage;
-	constructor(message, options) {
-		super(message, options);
-		Object.setPrototypeOf(this, new.target.prototype);
-		this.telemetryMessage = options?.telemetryMessage === true ? message : options?.telemetryMessage;
-	}
-};
-function isDir$1(inputPath) {
-	return statSync(inputPath).isDirectory();
-}
-__name(isDir$1, "isDir");
-var isDockerfile$1 = /* @__PURE__ */ __name((image, configPath) => {
-	const baseDir = configPath ? path4.dirname(configPath) : process.cwd();
-	const maybeDockerfile = path4.resolve(baseDir, image);
-	if (existsSync(maybeDockerfile)) {
-		if (isDir$1(maybeDockerfile)) throw new UserError2(`${image} is a directory, you should specify a path to the Dockerfile`);
-		return true;
-	}
-	const errorPrefix = `The image "${image}" does not appear to be a valid path to a Dockerfile, or a valid image registry path:
-`;
-	try {
-		new URL(`https://${image}`);
-	} catch (e) {
-		if (e instanceof Error) throw new UserError2(errorPrefix + e.message);
-		throw e;
-	}
-	const imageParts = image.split("/");
-	if (!imageParts[imageParts.length - 1]?.includes(":")) throw new UserError2(errorPrefix + `If this is an image registry path, it needs to include at least a tag ':' (e.g: docker.io/httpd:1)`);
-	if (image.includes("://")) throw new UserError2(errorPrefix + `Image reference should not include the protocol part (e.g: docker.io/httpd:1, not https://docker.io/httpd:1)`);
-	return false;
-}, "isDockerfile");
 var MAX_WORKFLOW_NAME_LENGTH = 64;
 var ALLOWED_WORKFLOW_NAME_REGEX = new RegExp("^[a-zA-Z0-9_][a-zA-Z0-9-_]*$");
 function isValidWorkflowName(name) {
@@ -5465,9 +5294,9 @@ __export(mod_esm_exports, { default: () => mod_esm_default });
 var import_mod_cjs = __toESM(require_mod_cjs3(), 1);
 __reExport(mod_esm_exports, __toESM(require_mod_cjs3(), 1));
 var mod_esm_default = import_mod_cjs.default;
-function isDirectory(configPath) {
+function isDirectory(path4) {
 	try {
-		return fs.statSync(configPath).isDirectory();
+		return fs.statSync(path4).isDirectory();
 	} catch {
 		return false;
 	}
@@ -5475,7 +5304,7 @@ function isDirectory(configPath) {
 __name(isDirectory, "isDirectory");
 function getGlobalWranglerConfigPath() {
 	const configDir = mod_esm_default(".wrangler").config();
-	const legacyConfigDir = path4.join(os.homedir(), ".wrangler");
+	const legacyConfigDir = path3.join(os.homedir(), ".wrangler");
 	if (isDirectory(legacyConfigDir)) return legacyConfigDir;
 	else return configDir;
 }
@@ -5486,7 +5315,7 @@ function getBooleanEnvironmentVariableFactory(options) {
 		switch (process.env[options.variableName]?.toLowerCase()) {
 			case "true": return true;
 			case "false": return false;
-			default: throw new UserError$1(`Expected ${options.variableName} to be "true" or "false", but got ${JSON.stringify(process.env[options.variableName])}`);
+			default: throw new UserError(`Expected ${options.variableName} to be "true" or "false", but got ${JSON.stringify(process.env[options.variableName])}`);
 		}
 	};
 }
@@ -5512,7 +5341,7 @@ function getProcessEnv(variableName, choices) {
 }
 __name(getProcessEnv, "getProcessEnv");
 function assertOneOf(choices, value) {
-	if (Array.isArray(choices) && !choices.includes(value)) throw new UserError$1(`Expected ${JSON.stringify(value)} to be one of ${JSON.stringify(choices)}`);
+	if (Array.isArray(choices) && !choices.includes(value)) throw new UserError(`Expected ${JSON.stringify(value)} to be one of ${JSON.stringify(choices)}`);
 }
 __name(assertOneOf, "assertOneOf");
 var getC3CommandFromEnv = getEnvironmentVariableFactory({
@@ -5532,7 +5361,7 @@ var getCloudflareComplianceRegionFromEnv = getEnvironmentVariableFactory({
 });
 var getCloudflareComplianceRegion = /* @__PURE__ */ __name((complianceConfig) => {
 	const complianceRegionFromEnv = getCloudflareComplianceRegionFromEnv();
-	if (complianceRegionFromEnv !== void 0 && complianceConfig?.compliance_region !== void 0 && complianceRegionFromEnv !== complianceConfig.compliance_region) throw new UserError$1(dedent`
+	if (complianceRegionFromEnv !== void 0 && complianceConfig?.compliance_region !== void 0 && complianceRegionFromEnv !== complianceConfig.compliance_region) throw new UserError(dedent`
 			The compliance region has been set to different values in two places:
 			 - \`CLOUDFLARE_COMPLIANCE_REGION\` environment variable: \`${complianceRegionFromEnv}\`
 			 - \`compliance_region\` configuration property: \`${complianceConfig.compliance_region}\`
@@ -5571,7 +5400,7 @@ var getBuildPlatformFromEnv = getEnvironmentVariableFactory({ variableName: "WRA
 var getRegistryPath = getEnvironmentVariableFactory({
 	variableName: "WRANGLER_REGISTRY_PATH",
 	defaultValue() {
-		return path4.join(getGlobalWranglerConfigPath(), "registry");
+		return path3.join(getGlobalWranglerConfigPath(), "registry");
 	}
 });
 var getD1ExtraLocationChoices = getEnvironmentVariableFactory({ variableName: "WRANGLER_D1_EXTRA_LOCATION_CHOICES" });
@@ -5604,7 +5433,7 @@ var getWranglerHideBanner = getBooleanEnvironmentVariableFactory({
 });
 var getCloudflareEnv = getEnvironmentVariableFactory({ variableName: "CLOUDFLARE_ENV" });
 var getOpenNextDeployFromEnv = getEnvironmentVariableFactory({ variableName: "OPEN_NEXT_DEPLOY" });
-var getLocalExplorerFromEnv = getBooleanEnvironmentVariableFactory({
+var getLocalExplorerEnabledFromEnv = getBooleanEnvironmentVariableFactory({
 	variableName: "X_LOCAL_EXPLORER",
 	defaultValue: false
 });
@@ -5695,9 +5524,9 @@ Please add "${field}" to "env.${envName}".`);
 	return rawEnv[field] ?? defaultValue;
 }
 __name(notInheritable, "notInheritable");
-function unwindPropertyPath(root, path5) {
+function unwindPropertyPath(root, path4) {
 	let container = root;
-	const parts = path5.split(".");
+	const parts = path4.split(".");
 	for (let i$1 = 0; i$1 < parts.length - 1; i$1++) {
 		if (!hasProperty(container, parts[i$1])) return;
 		container = container[parts[i$1]];
@@ -5910,7 +5739,7 @@ function isPagesConfig(rawConfig) {
 }
 __name(isPagesConfig, "isPagesConfig");
 function normalizeAndValidateConfig(rawConfig, configPath, userConfigPath, args, preserveOriginalMain = false) {
-	const diagnostics = new Diagnostics(`Processing ${configPath ? path4.relative(process.cwd(), configPath) : "wrangler"} configuration:`);
+	const diagnostics = new Diagnostics(`Processing ${configPath ? path3.relative(process.cwd(), configPath) : "wrangler"} configuration:`);
 	validateOptionalProperty(diagnostics, "", "legacy_env", rawConfig.legacy_env, "boolean");
 	validateOptionalProperty(diagnostics, "", "send_metrics", rawConfig.send_metrics, "boolean");
 	validateOptionalProperty(diagnostics, "", "keep_vars", rawConfig.keep_vars, "boolean");
@@ -6001,7 +5830,7 @@ function applyPythonConfig(config, args) {
 			type: "PythonModule",
 			globs: ["**/*.py"]
 		});
-		if (!config.compatibility_flags.includes("python_workers")) throw new UserError$1("The `python_workers` compatibility flag is required to use Python.");
+		if (!config.compatibility_flags.includes("python_workers")) throw new UserError("The `python_workers` compatibility flag is required to use Python.");
 	}
 }
 __name(applyPythonConfig, "applyPythonConfig");
@@ -6014,34 +5843,34 @@ function normalizeAndValidateBuild(diagnostics, rawEnv, rawBuild, configPath) {
 	else validateOptionalProperty(diagnostics, "build", "watch_dir", watch_dir, "string");
 	return {
 		command,
-		watch_dir: command && configPath ? Array.isArray(watch_dir) ? watch_dir.map((dir) => path4.relative(process.cwd(), path4.join(path4.dirname(configPath), `${dir}`))) : path4.relative(process.cwd(), path4.join(path4.dirname(configPath), `${watch_dir}`)) : watch_dir,
+		watch_dir: command && configPath ? Array.isArray(watch_dir) ? watch_dir.map((dir) => path3.relative(process.cwd(), path3.join(path3.dirname(configPath), `${dir}`))) : path3.relative(process.cwd(), path3.join(path3.dirname(configPath), `${watch_dir}`)) : watch_dir,
 		cwd
 	};
 }
 __name(normalizeAndValidateBuild, "normalizeAndValidateBuild");
 function normalizeAndValidateMainField(configPath, rawMain) {
-	const configDir = path4.dirname(configPath ?? "wrangler.toml");
+	const configDir = path3.dirname(configPath ?? "wrangler.toml");
 	if (rawMain !== void 0) if (typeof rawMain === "string") {
-		const directory = path4.resolve(configDir);
-		return path4.resolve(directory, rawMain);
+		const directory = path3.resolve(configDir);
+		return path3.resolve(directory, rawMain);
 	} else return rawMain;
 	else return;
 }
 __name(normalizeAndValidateMainField, "normalizeAndValidateMainField");
 function normalizeAndValidateBaseDirField(configPath, rawDir) {
-	const configDir = path4.dirname(configPath ?? "wrangler.toml");
+	const configDir = path3.dirname(configPath ?? "wrangler.toml");
 	if (rawDir !== void 0) if (typeof rawDir === "string") {
-		const directory = path4.resolve(configDir);
-		return path4.resolve(directory, rawDir);
+		const directory = path3.resolve(configDir);
+		return path3.resolve(directory, rawDir);
 	} else return rawDir;
 	else return;
 }
 __name(normalizeAndValidateBaseDirField, "normalizeAndValidateBaseDirField");
 function normalizeAndValidatePagesBuildOutputDir(configPath, rawPagesDir) {
-	const configDir = path4.dirname(configPath ?? "wrangler.toml");
+	const configDir = path3.dirname(configPath ?? "wrangler.toml");
 	if (rawPagesDir !== void 0) if (typeof rawPagesDir === "string") {
-		const directory = path4.resolve(configDir);
-		return path4.resolve(directory, rawPagesDir);
+		const directory = path3.resolve(configDir);
+		return path3.resolve(directory, rawPagesDir);
 	} else return rawPagesDir;
 	else return;
 }
@@ -6094,7 +5923,7 @@ function normalizeAndValidateSite(diagnostics, configPath, rawConfig, mainEntryP
 		validateOptionalProperty(diagnostics, "site", "entry-point", rawConfig.site["entry-point"], "string");
 		deprecated(diagnostics, rawConfig, `site.entry-point`, `Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration file:
 \`\`\`
-main = "${path4.join(String(rawConfig.site["entry-point"]) || "workers-site", path4.extname(String(rawConfig.site["entry-point"]) || "workers-site") ? "" : "index.js")}"
+main = "${path3.join(String(rawConfig.site["entry-point"]) || "workers-site", path3.extname(String(rawConfig.site["entry-point"]) || "workers-site") ? "" : "index.js")}"
 \`\`\``, false, void 0, "warning");
 		let siteEntryPoint = rawConfig.site["entry-point"];
 		if (!mainEntryPoint && !siteEntryPoint) {
@@ -6107,7 +5936,7 @@ main = "workers-site/index.js"
 		} else if (mainEntryPoint && siteEntryPoint) diagnostics.errors.push(`Don't define both the \`main\` and \`site.entry-point\` fields in your configuration.
 They serve the same purpose: to point to the entry-point of your worker.
 Delete the deprecated \`site.entry-point\` field from your config.`);
-		if (configPath && siteEntryPoint) siteEntryPoint = path4.relative(process.cwd(), path4.join(path4.dirname(configPath), siteEntryPoint));
+		if (configPath && siteEntryPoint) siteEntryPoint = path3.relative(process.cwd(), path3.join(path3.dirname(configPath), siteEntryPoint));
 		return {
 			bucket,
 			"entry-point": siteEntryPoint,
@@ -6139,7 +5968,7 @@ function normalizeAndValidateModulePaths(diagnostics, configPath, field, rawMapp
 	if (rawMapping === void 0) return;
 	const mapping = {};
 	for (const [name, filePath] of Object.entries(rawMapping)) if (isString$2(diagnostics, `${field}['${name}']`, filePath, void 0)) {
-		if (configPath) mapping[name] = configPath ? path4.relative(process.cwd(), path4.join(path4.dirname(configPath), filePath)) : filePath;
+		if (configPath) mapping[name] = configPath ? path3.relative(process.cwd(), path3.join(path3.dirname(configPath), filePath)) : filePath;
 	}
 	return mapping;
 }
@@ -6363,12 +6192,13 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
 		python_modules: inheritable(diagnostics, topLevelEnv, rawEnv, "python_modules", validatePythonModules, { exclude: ["**/*.pyc"] })
 	};
 	warnIfDurableObjectsHaveNoMigrations(diagnostics, environment.durable_objects, environment.migrations, configPath);
+	if (envName !== "top level") validateAdditionalProperties(diagnostics, "env." + envName, Object.keys(rawEnv), Object.keys(environment));
 	return environment;
 }
 __name(normalizeAndValidateEnvironment, "normalizeAndValidateEnvironment");
 function validateAndNormalizeTsconfig(diagnostics, topLevelEnv, rawEnv, configPath) {
 	const tsconfig = inheritable(diagnostics, topLevelEnv, rawEnv, "tsconfig", isString$2, void 0);
-	return configPath && tsconfig ? path4.relative(process.cwd(), path4.join(path4.dirname(configPath), tsconfig)) : tsconfig;
+	return configPath && tsconfig ? path3.relative(process.cwd(), path3.join(path3.dirname(configPath), tsconfig)) : tsconfig;
 }
 __name(validateAndNormalizeTsconfig, "validateAndNormalizeTsconfig");
 var validateAndNormalizeRules = /* @__PURE__ */ __name((diagnostics, topLevelEnv, rawEnv, envName) => {
@@ -6808,10 +6638,10 @@ function validateContainerApp(envName, topLevelName, configPath) {
 			let resolvedImage = containerAppOptional.image ?? containerAppOptional.configuration?.image;
 			let resolvedBuildContextPath = void 0;
 			try {
-				if (isDockerfile$1(resolvedImage, configPath)) {
-					const baseDir = configPath ? path4.dirname(configPath) : process.cwd();
-					resolvedImage = path4.resolve(baseDir, resolvedImage);
-					resolvedBuildContextPath = containerAppOptional.image_build_context ? path4.resolve(baseDir, containerAppOptional.image_build_context) : path4.dirname(resolvedImage);
+				if (isDockerfile(resolvedImage, configPath)) {
+					const baseDir = configPath ? path3.dirname(configPath) : process.cwd();
+					resolvedImage = path3.resolve(baseDir, resolvedImage);
+					resolvedBuildContextPath = containerAppOptional.image_build_context ? path3.resolve(baseDir, containerAppOptional.image_build_context) : path3.dirname(resolvedImage);
 				}
 			} catch (err) {
 				if (err instanceof Error && err.message) diagnostics.errors.push(err.message);
@@ -7544,7 +7374,10 @@ var validateRateLimitBinding = /* @__PURE__ */ __name((diagnostics, field, value
 	return isValid$1;
 }, "validateRateLimitBinding");
 function normalizeAndValidateLimits(diagnostics, topLevelEnv, rawEnv) {
-	if (rawEnv.limits) validateRequiredProperty(diagnostics, "limits", "cpu_ms", rawEnv.limits.cpu_ms, "number");
+	if (rawEnv.limits) {
+		validateOptionalProperty(diagnostics, "limits", "cpu_ms", rawEnv.limits.cpu_ms, "number");
+		validateOptionalProperty(diagnostics, "limits", "subrequests", rawEnv.limits.subrequests, "number");
+	}
 	return inheritable(diagnostics, topLevelEnv, rawEnv, "limits", () => true, void 0);
 }
 __name(normalizeAndValidateLimits, "normalizeAndValidateLimits");
@@ -7659,7 +7492,7 @@ function warnIfDurableObjectsHaveNoMigrations(diagnostics, durableObjects, migra
 				\`\`\`
 				${formatConfigSnippet({ migrations: [{
 					tag: "v1",
-					new_classes: durableObjectClassnames
+					new_sqlite_classes: durableObjectClassnames
 				}] }, configPath)}
 				\`\`\`
 
@@ -7688,6 +7521,27 @@ function isRemoteValid(targetObject, fieldPath, diagnostics) {
 	return true;
 }
 __name(isRemoteValid, "isRemoteValid");
+function isDockerfile(imagePath, configPath) {
+	const baseDir = configPath ? path3.dirname(configPath) : process.cwd();
+	const maybeDockerfile = path3.resolve(baseDir, imagePath);
+	if (fs.existsSync(maybeDockerfile)) {
+		if (isDirectory(maybeDockerfile)) throw new UserError(`${imagePath} is a directory, you should specify a path to the Dockerfile`);
+		return true;
+	}
+	const errorPrefix = `The image "${imagePath}" does not appear to be a valid path to a Dockerfile, or a valid image registry path:
+`;
+	try {
+		new URL(`https://${imagePath}`);
+	} catch (e) {
+		if (e instanceof Error) throw new UserError(errorPrefix + e.message);
+		throw e;
+	}
+	const imageParts = imagePath.split("/");
+	if (!imageParts[imageParts.length - 1]?.includes(":")) throw new UserError(errorPrefix + `If this is an image registry path, it needs to include at least a tag ':' (e.g: docker.io/httpd:1)`);
+	if (imagePath.includes("://")) throw new UserError(errorPrefix + `Image reference should not include the protocol part (e.g: docker.io/httpd:1, not https://docker.io/httpd:1)`);
+	return false;
+}
+__name(isDockerfile, "isDockerfile");
 var supportedPagesConfigFields = [
 	"pages_build_output_dir",
 	"name",
@@ -7816,10 +7670,14 @@ const defuArrayFn = createDefu((object, key, currentValue) => {
 function getDeployConfigPath(root) {
 	return nodePath.resolve(root, ".wrangler", "deploy", "config.json");
 }
-function getWorkerConfigs(root) {
+function getWorkerConfigs(root, isPrerender) {
 	const deployConfigPath = getDeployConfigPath(root);
 	const deployConfig = JSON.parse(fs$1.readFileSync(deployConfigPath, "utf-8"));
-	return [{ configPath: deployConfig.configPath }, ...deployConfig.auxiliaryWorkers].map(({ configPath }) => {
+	return [
+		...isPrerender && deployConfig.prerenderWorkerConfigPath ? [{ configPath: deployConfig.prerenderWorkerConfigPath }] : [],
+		{ configPath: deployConfig.configPath },
+		...deployConfig.auxiliaryWorkers
+	].map(({ configPath }) => {
 		const resolvedConfigPath = nodePath.resolve(nodePath.dirname(deployConfigPath), configPath);
 		return wrangler.unstable_readConfig({ config: resolvedConfigPath });
 	});
@@ -7834,25 +7692,30 @@ function writeDeployConfig(resolvedPluginConfig, resolvedViteConfig) {
 	if (resolvedPluginConfig.type === "assets-only") {
 		const clientOutputDirectory = resolvedViteConfig.environments.client?.build.outDir;
 		assert(clientOutputDirectory, "Unexpected error: client environment output directory is undefined");
+		const prerenderOutputDirectory = resolvedPluginConfig.prerenderWorkerEnvironmentName ? resolvedViteConfig.environments[resolvedPluginConfig.prerenderWorkerEnvironmentName]?.build.outDir : void 0;
 		const deployConfig = {
 			configPath: getRelativePathToWorkerConfig(deployConfigDirectory, resolvedViteConfig.root, clientOutputDirectory),
-			auxiliaryWorkers: []
+			auxiliaryWorkers: [],
+			prerenderWorkerConfigPath: prerenderOutputDirectory ? getRelativePathToWorkerConfig(deployConfigDirectory, resolvedViteConfig.root, prerenderOutputDirectory) : void 0
 		};
 		fs$1.writeFileSync(deployConfigPath, JSON.stringify(deployConfig));
 	} else {
 		let entryWorkerConfigPath;
+		let prerenderWorkerConfigPath;
 		const auxiliaryWorkers = [];
 		for (const environmentName of resolvedPluginConfig.environmentNameToWorkerMap.keys()) {
 			const outputDirectory = resolvedViteConfig.environments[environmentName]?.build.outDir;
 			assert(outputDirectory, `Unexpected error: ${environmentName} environment output directory is undefined`);
 			const configPath = getRelativePathToWorkerConfig(deployConfigDirectory, resolvedViteConfig.root, outputDirectory);
 			if (environmentName === resolvedPluginConfig.entryWorkerEnvironmentName) entryWorkerConfigPath = configPath;
+			else if (environmentName === resolvedPluginConfig.prerenderWorkerEnvironmentName) prerenderWorkerConfigPath = configPath;
 			else auxiliaryWorkers.push({ configPath });
 		}
 		assert(entryWorkerConfigPath, `Unexpected error: entryWorkerConfigPath is undefined`);
 		const deployConfig = {
 			configPath: entryWorkerConfigPath,
-			auxiliaryWorkers
+			auxiliaryWorkers,
+			prerenderWorkerConfigPath
 		};
 		fs$1.writeFileSync(deployConfigPath, JSON.stringify(deployConfig));
 	}
@@ -13228,7 +13091,7 @@ function read(jsonPath, { base, specifier }) {
 	/** @type {string | undefined} */
 	let string;
 	try {
-		string = fs.readFileSync(path4.toNamespacedPath(jsonPath), "utf8");
+		string = fs.readFileSync(path3.toNamespacedPath(jsonPath), "utf8");
 	} catch (error) {
 		const exception = error;
 		if (exception.code !== "ENOENT") throw exception;
@@ -13434,7 +13297,7 @@ function emitLegacyIndexDeprecation(url, packageJsonUrl, base, main) {
 	const packagePath = fileURLToPath(new URL$1(".", packageJsonUrl));
 	const basePath = fileURLToPath(base);
 	if (!main) process2.emitWarning(`No "main" or "exports" field defined in the package.json for ${packagePath} resolving the main entry point "${urlPath.slice(packagePath.length)}", imported from ${basePath}.\nDefault "index" lookups for the main are deprecated for ES modules.`, "DeprecationWarning", "DEP0151");
-	else if (path4.resolve(packagePath, main) !== urlPath) process2.emitWarning(`Package ${packagePath} has a "main" field set to "${main}", excluding the full filename and extension to the resolved file at "${urlPath.slice(packagePath.length)}", imported from ${basePath}.\n Automatic extension resolution of the "main" field is deprecated for ES modules.`, "DeprecationWarning", "DEP0151");
+	else if (path3.resolve(packagePath, main) !== urlPath) process2.emitWarning(`Package ${packagePath} has a "main" field set to "${main}", excluding the full filename and extension to the resolved file at "${urlPath.slice(packagePath.length)}", imported from ${basePath}.\n Automatic extension resolution of the "main" field is deprecated for ES modules.`, "DeprecationWarning", "DEP0151");
 }
 /**
 * @param {string} path
@@ -13541,7 +13404,7 @@ function finalizeResolution(resolved, base, preserveSymlinks) {
 	{
 		const real = realpathSync(filePath);
 		const { search, hash } = resolved;
-		resolved = pathToFileURL(real + (filePath.endsWith(path4.sep) ? "/" : ""));
+		resolved = pathToFileURL(real + (filePath.endsWith(path3.sep) ? "/" : ""));
 		resolved.search = search;
 		resolved.hash = hash;
 	}
@@ -14037,6 +13900,148 @@ function resolvePathSync(id, options) {
 	return fileURLToPath$1(resolveSync(id, options));
 }
 
+//#endregion
+//#region src/shared.ts
+const UNKNOWN_HOST = "http://localhost";
+const INIT_PATH = "/__vite_plugin_cloudflare_init__";
+const GET_EXPORT_TYPES_PATH = "/__vite_plugin_cloudflare_get_export_types__";
+const WORKER_ENTRY_PATH_HEADER = "__VITE_WORKER_ENTRY_PATH__";
+const IS_ENTRY_WORKER_HEADER = "__VITE_IS_ENTRY_WORKER__";
+const ENVIRONMENT_NAME_HEADER = "__VITE_ENVIRONMENT_NAME__";
+const IS_PARENT_ENVIRONMENT_HEADER = "__VITE_IS_PARENT_ENVIRONMENT__";
+const virtualPrefix = "virtual:cloudflare/";
+const VIRTUAL_WORKER_ENTRY = `${virtualPrefix}worker-entry`;
+const VIRTUAL_EXPORT_TYPES = `${virtualPrefix}export-types`;
+
+//#endregion
+//#region src/plugins/virtual-modules.ts
+const VIRTUAL_USER_ENTRY = `${virtualPrefix}user-entry`;
+const VIRTUAL_CLIENT_FALLBACK_ENTRY = `${virtualPrefix}client-fallback-entry`;
+const VIRTUAL_NODEJS_GLOBAL_INJECT_PREFIX = `${virtualPrefix}nodejs-global-inject/`;
+const virtualCloudflareResolveRE = /^virtual:cloudflare\//;
+const virtualCloudflareLoadRE = /^\0virtual:cloudflare\//;
+/**
+* Plugin to provide virtual modules
+*/
+const virtualModulesPlugin = createPlugin("virtual-modules", (ctx) => {
+	return {
+		applyToEnvironment(environment) {
+			return !ctx.isChildEnvironment(environment.name) && ctx.getWorkerConfig(environment.name) !== void 0;
+		},
+		resolveId: {
+			filter: { id: virtualCloudflareResolveRE },
+			async handler(source) {
+				if (!virtualCloudflareResolveRE.test(source)) return;
+				if (source === VIRTUAL_USER_ENTRY) {
+					const workerConfig = ctx.getWorkerConfig(this.environment.name);
+					assert(workerConfig, "Expected `workerConfig` to be defined");
+					const main = await this.resolve(workerConfig.main);
+					if (!main) throw new Error(`Failed to resolve main entry file "${workerConfig.main}" for environment "${this.environment.name}"`);
+					return main;
+				}
+				return `\0${source}`;
+			}
+		},
+		load: {
+			filter: { id: virtualCloudflareLoadRE },
+			handler(id) {
+				if (id === `\0${VIRTUAL_WORKER_ENTRY}`) {
+					const nodeJsCompat = ctx.getNodeJsCompat(this.environment.name);
+					return `
+${nodeJsCompat ? nodeJsCompat.injectGlobalCode() : ""}
+import { getExportTypes } from "${VIRTUAL_EXPORT_TYPES}";
+import * as mod from "${VIRTUAL_USER_ENTRY}";
+export * from "${VIRTUAL_USER_ENTRY}";
+export default mod.default ?? {};
+if (import.meta.hot) {
+	import.meta.hot.accept((module) => {
+		const exportTypes = getExportTypes(module);
+		import.meta.hot.send("vite-plugin-cloudflare:worker-export-types", exportTypes);
+	});
+}
+					`;
+				}
+				if (id === `\0${VIRTUAL_EXPORT_TYPES}`) return `
+import {
+	WorkerEntrypoint,
+	DurableObject,
+	WorkflowEntrypoint,
+} from "cloudflare:workers";
+
+const baseClasses = new Map([
+	["WorkerEntrypoint", WorkerEntrypoint],
+	["DurableObject", DurableObject],
+	["WorkflowEntrypoint", WorkflowEntrypoint],
+]);
+
+export function getExportTypes(module) {
+	const exportTypes = {};
+
+	for (const [key, value] of Object.entries(module)) {
+		if (key === "default") {
+			continue;
+		}
+
+		let exportType;
+
+		if (typeof value === "function") {
+			for (const [type, baseClass] of baseClasses) {
+				if (baseClass.prototype.isPrototypeOf(value.prototype)) {
+					exportType = type;
+					break;
+				}
+			}
+
+			if (!exportType) {
+				exportType = "DurableObject";
+			}
+		} else if (typeof value === "object" && value !== null) {
+			exportType = "WorkerEntrypoint";
+		}
+
+		exportTypes[key] = exportType;
+	}
+
+	return exportTypes;
+}
+					`;
+				if (id.startsWith(`\0${VIRTUAL_NODEJS_GLOBAL_INJECT_PREFIX}`)) {
+					const nodeJsCompat = ctx.getNodeJsCompat(this.environment.name);
+					assertHasNodeJsCompat(nodeJsCompat);
+					return nodeJsCompat.getGlobalVirtualModule(id.slice(1));
+				}
+			}
+		}
+	};
+});
+const virtualClientFallbackResolveRE = /^virtual:cloudflare\/client-fallback-entry$/;
+const virtualClientFallbackLoadRE = /^\0virtual:cloudflare\/client-fallback-entry$/;
+/**
+* Plugin to provide a virtual fallback entry file for the `client` environment.
+* This is used as the entry file for the client build when only the `public` directory is present.
+*/
+const virtualClientFallbackPlugin = createPlugin("virtual-client-fallback", () => {
+	return {
+		applyToEnvironment(environment) {
+			return environment.name === "client";
+		},
+		resolveId: {
+			filter: { id: virtualClientFallbackResolveRE },
+			handler(source) {
+				if (!virtualClientFallbackResolveRE.test(source)) return;
+				return `\0${VIRTUAL_CLIENT_FALLBACK_ENTRY}`;
+			}
+		},
+		load: {
+			filter: { id: virtualClientFallbackLoadRE },
+			handler(id) {
+				if (!virtualClientFallbackLoadRE.test(id)) return;
+				return "";
+			}
+		}
+	};
+});
+
 //#endregion
 //#region src/nodejs-compat.ts
 var NodeJsCompat = class {
@@ -14084,7 +14089,6 @@ var NodeJsCompat = class {
 	#getInjects() {
 		const injectsByModule = /* @__PURE__ */ new Map();
 		const virtualModulePathToSpecifier = /* @__PURE__ */ new Map();
-		const virtualModulePrefix = `\0_nodejs_global_inject-`;
 		for (const [injectedName, moduleSpecifier] of Object.entries(this.#env.inject)) {
 			const [module$2, exportName, importName] = Array.isArray(moduleSpecifier) ? [
 				moduleSpecifier[0],
@@ -14097,7 +14101,7 @@ var NodeJsCompat = class {
 			];
 			if (!injectsByModule.has(module$2)) {
 				injectsByModule.set(module$2, []);
-				virtualModulePathToSpecifier.set(`${virtualModulePrefix}${module$2.replaceAll("/", "-")}`, module$2);
+				virtualModulePathToSpecifier.set(`${VIRTUAL_NODEJS_GLOBAL_INJECT_PREFIX}${module$2}`, module$2);
 			}
 			const injects = injectsByModule.get(module$2);
 			assert(injects, `expected injects for "${module$2}" to be defined`);
@@ -14171,6 +14175,7 @@ function hasNodeJsAls(workerConfig) {
 function isNodeAlsModule(modulePath) {
 	return /^(?:node:)?async_hooks$/.test(modulePath);
 }
+const nodeBuiltinsRE = /* @__PURE__ */ new RegExp(`^(${nonPrefixedNodeModules.join("|")}|node:.+)$`);
 function assertHasNodeJsCompat(nodeJsCompat) {
 	assert(nodeJsCompat, `expected nodeJsCompat to be defined`);
 }
@@ -14482,7 +14487,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 	const shared = {
 		persistState: pluginConfig.persistState ?? true,
 		inspectorPort: pluginConfig.inspectorPort,
-		experimental: pluginConfig.experimental ?? {}
+		experimental: { headersAndRedirectsDevModeSupport: pluginConfig.experimental?.headersAndRedirectsDevModeSupport }
 	};
 	const root = userConfig.root ? nodePath.resolve(userConfig.root) : process.cwd();
 	const prefixedEnv = vite.loadEnv(viteEnv.mode, root, ["CLOUDFLARE_", "WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_"]);
@@ -14491,34 +14496,57 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 		...shared,
 		remoteBindings: pluginConfig.remoteBindings ?? true,
 		type: "preview",
-		workers: getWorkerConfigs(root)
+		workers: getWorkerConfigs(root, !!process.env.CLOUDFLARE_VITE_BUILD)
 	};
 	const configPaths = /* @__PURE__ */ new Set();
 	const cloudflareEnv = prefixedEnv.CLOUDFLARE_ENV;
+	const validateAndAddEnvironmentName = createEnvironmentNameValidator();
 	const entryWorkerResolvedConfig = resolveWorkerConfig({
 		root,
 		configPath: getValidatedWranglerConfigPath(root, pluginConfig.configPath),
-		env: prefixedEnv.CLOUDFLARE_ENV,
+		env: cloudflareEnv,
 		configCustomizer: pluginConfig.config,
 		visitedConfigPaths: configPaths
 	});
+	const environmentNameToWorkerMap = /* @__PURE__ */ new Map();
+	const environmentNameToChildEnvironmentNamesMap = /* @__PURE__ */ new Map();
+	const prerenderWorkerConfig = pluginConfig.experimental?.prerenderWorker;
+	let prerenderWorkerEnvironmentName;
+	if (prerenderWorkerConfig && viteEnv.command === "build") {
+		const workerResolvedConfig = resolveWorkerConfig({
+			root,
+			configPath: getValidatedWranglerConfigPath(root, prerenderWorkerConfig.configPath, true),
+			env: cloudflareEnv,
+			configCustomizer: "config" in prerenderWorkerConfig ? prerenderWorkerConfig.config : void 0,
+			entryWorkerConfig: entryWorkerResolvedConfig.config,
+			visitedConfigPaths: configPaths
+		});
+		prerenderWorkerEnvironmentName = prerenderWorkerConfig.viteEnvironment?.name ?? workerNameToEnvironmentName(workerResolvedConfig.config.topLevelName);
+		validateAndAddEnvironmentName(prerenderWorkerEnvironmentName);
+		environmentNameToWorkerMap.set(prerenderWorkerEnvironmentName, resolveWorker(workerResolvedConfig.config));
+		const prerenderWorkerChildEnvironments = prerenderWorkerConfig.viteEnvironment?.childEnvironments;
+		if (prerenderWorkerChildEnvironments) {
+			for (const childName of prerenderWorkerChildEnvironments) validateAndAddEnvironmentName(childName);
+			environmentNameToChildEnvironmentNamesMap.set(prerenderWorkerEnvironmentName, prerenderWorkerChildEnvironments);
+		}
+	}
 	if (entryWorkerResolvedConfig.type === "assets-only") return {
 		...shared,
 		type: "assets-only",
 		cloudflareEnv,
 		config: entryWorkerResolvedConfig.config,
+		environmentNameToWorkerMap,
+		environmentNameToChildEnvironmentNamesMap,
+		prerenderWorkerEnvironmentName,
 		configPaths,
 		remoteBindings: pluginConfig.remoteBindings ?? true,
 		rawConfigs: { entryWorker: entryWorkerResolvedConfig }
 	};
-	const entryWorkerConfig = entryWorkerResolvedConfig.config;
-	const entryWorkerEnvironmentName = pluginConfig.viteEnvironment?.name ?? workerNameToEnvironmentName(entryWorkerConfig.topLevelName);
-	const validateAndAddEnvironmentName = createEnvironmentNameValidator();
-	validateAndAddEnvironmentName(entryWorkerEnvironmentName);
 	let staticRouting;
-	if (Array.isArray(entryWorkerConfig.assets?.run_worker_first)) staticRouting = parseStaticRouting(entryWorkerConfig.assets.run_worker_first);
-	const environmentNameToWorkerMap = new Map([[entryWorkerEnvironmentName, resolveWorker(entryWorkerConfig)]]);
-	const environmentNameToChildEnvironmentNamesMap = /* @__PURE__ */ new Map();
+	if (Array.isArray(entryWorkerResolvedConfig.config.assets?.run_worker_first)) staticRouting = parseStaticRouting(entryWorkerResolvedConfig.config.assets.run_worker_first);
+	const entryWorkerEnvironmentName = pluginConfig.viteEnvironment?.name ?? workerNameToEnvironmentName(entryWorkerResolvedConfig.config.topLevelName);
+	validateAndAddEnvironmentName(entryWorkerEnvironmentName);
+	environmentNameToWorkerMap.set(entryWorkerEnvironmentName, resolveWorker(entryWorkerResolvedConfig.config));
 	const entryWorkerChildEnvironments = pluginConfig.viteEnvironment?.childEnvironments;
 	if (entryWorkerChildEnvironments) {
 		for (const childName of entryWorkerChildEnvironments) validateAndAddEnvironmentName(childName);
@@ -14531,7 +14559,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 			configPath: getValidatedWranglerConfigPath(root, auxiliaryWorker.configPath, true),
 			env: cloudflareEnv,
 			configCustomizer: "config" in auxiliaryWorker ? auxiliaryWorker.config : void 0,
-			entryWorkerConfig,
+			entryWorkerConfig: entryWorkerResolvedConfig.config,
 			visitedConfigPaths: configPaths
 		});
 		auxiliaryWorkersResolvedConfigs.push(workerResolvedConfig);
@@ -14551,6 +14579,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 		configPaths,
 		environmentNameToWorkerMap,
 		environmentNameToChildEnvironmentNamesMap,
+		prerenderWorkerEnvironmentName,
 		entryWorkerEnvironmentName,
 		staticRouting,
 		remoteBindings: pluginConfig.remoteBindings ?? true,
@@ -15590,16 +15619,19 @@ const additionalModulesPlugin = createPlugin("additional-modules", (ctx) => {
 		applyToEnvironment(environment) {
 			return ctx.getWorkerConfig(environment.name) !== void 0;
 		},
-		async resolveId(source, importer, options) {
-			const additionalModuleType = matchAdditionalModule(source);
-			if (!additionalModuleType) return;
-			const resolved = await this.resolve(cleanUrl(source), importer, options);
-			if (!resolved) throw new Error(`Import "${source}" not found. Does the file exist?`);
-			additionalModulePaths.add(resolved.id);
-			return {
-				external: true,
-				id: createModuleReference(additionalModuleType, resolved.id)
-			};
+		resolveId: {
+			filter: { id: moduleRuleFilters },
+			async handler(source, importer, options) {
+				const additionalModuleType = matchAdditionalModule(source);
+				if (!additionalModuleType) return;
+				const resolved = await this.resolve(cleanUrl(source), importer, options);
+				if (!resolved) throw new Error(`Import "${source}" not found. Does the file exist?`);
+				additionalModulePaths.add(resolved.id);
+				return {
+					external: true,
+					id: createModuleReference(additionalModuleType, resolved.id)
+				};
+			}
 		},
 		hotUpdate(options) {
 			if (additionalModulePaths.has(options.file)) {
@@ -15607,34 +15639,37 @@ const additionalModulesPlugin = createPlugin("additional-modules", (ctx) => {
 				return [];
 			}
 		},
-		async renderChunk(code, chunk) {
-			const matches = code.matchAll(additionalModuleGlobalRE);
-			let magicString;
-			for (const match of matches) {
-				magicString ??= new MagicString(code);
-				const [full, _, modulePath] = match;
-				assert(modulePath, `Unexpected error: module path not found in reference ${full}.`);
-				let source;
-				try {
-					source = await fsp.readFile(modulePath);
-				} catch {
-					throw new Error(`Import "${modulePath}" not found. Does the file exist?`);
+		renderChunk: {
+			filter: { code: { include: additionalModuleRE } },
+			async handler(code, chunk) {
+				const matches = code.matchAll(additionalModuleGlobalRE);
+				let magicString;
+				for (const match of matches) {
+					magicString ??= new MagicString(code);
+					const [full, _, modulePath] = match;
+					assert(modulePath, `Unexpected error: module path not found in reference ${full}.`);
+					let source;
+					try {
+						source = await fsp.readFile(modulePath);
+					} catch {
+						throw new Error(`Import "${modulePath}" not found. Does the file exist?`);
+					}
+					const referenceId = this.emitFile({
+						type: "asset",
+						name: nodePath.basename(modulePath),
+						originalFileName: modulePath,
+						source
+					});
+					const emittedFileName = this.getFileName(referenceId);
+					const relativePath = vite.normalizePath(nodePath.relative(nodePath.dirname(chunk.fileName), emittedFileName));
+					const importPath = relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
+					magicString.update(match.index, match.index + full.length, importPath);
 				}
-				const referenceId = this.emitFile({
-					type: "asset",
-					name: nodePath.basename(modulePath),
-					originalFileName: modulePath,
-					source
-				});
-				const emittedFileName = this.getFileName(referenceId);
-				const relativePath = vite.normalizePath(nodePath.relative(nodePath.dirname(chunk.fileName), emittedFileName));
-				const importPath = relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
-				magicString.update(match.index, match.index + full.length, importPath);
-			}
-			if (magicString) return {
-				code: magicString.toString(),
-				map: this.environment.config.build.sourcemap ? magicString.generateMap({ hires: "boundary" }) : null
-			};
+				if (magicString) return {
+					code: magicString.toString(),
+					map: this.environment.config.build.sourcemap ? magicString.generateMap({ hires: "boundary" }) : null
+				};
+			}
 		}
 	};
 });
@@ -15648,23 +15683,20 @@ const additionalModuleGlobalRE = new RegExp(ADDITIONAL_MODULE_PATTERN, "g");
 const moduleRules = [
 	{
 		type: "CompiledWasm",
-		extensions: [".wasm", ".wasm?module"]
+		pattern: /\.wasm(\?module)?$/
 	},
 	{
 		type: "Data",
-		extensions: [".bin"]
+		pattern: /\.bin$/
 	},
 	{
 		type: "Text",
-		extensions: [
-			".txt",
-			".html",
-			".sql"
-		]
+		pattern: /\.(txt|html|sql)$/
 	}
 ];
+const moduleRuleFilters = moduleRules.map((rule) => rule.pattern);
 function matchAdditionalModule(source) {
-	for (const rule of moduleRules) for (const extension of rule.extensions) if (source.endsWith(extension)) return rule.type;
+	for (const rule of moduleRules) if (rule.pattern.test(source)) return rule.type;
 	return null;
 }
 function createModuleReference(type, id) {
@@ -21353,126 +21385,9 @@ var require_picocolors = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnp
 	module.exports.createColors = createColors;
 }) });
 
-//#endregion
-//#region src/shared.ts
-var import_picocolors$4 = /* @__PURE__ */ __toESM$1(require_picocolors(), 1);
-const UNKNOWN_HOST = "http://localhost";
-const INIT_PATH = "/__vite_plugin_cloudflare_init__";
-const GET_EXPORT_TYPES_PATH = "/__vite_plugin_cloudflare_get_export_types__";
-const WORKER_ENTRY_PATH_HEADER = "__VITE_WORKER_ENTRY_PATH__";
-const IS_ENTRY_WORKER_HEADER = "__VITE_IS_ENTRY_WORKER__";
-const ENVIRONMENT_NAME_HEADER = "__VITE_ENVIRONMENT_NAME__";
-const IS_PARENT_ENVIRONMENT_HEADER = "__VITE_IS_PARENT_ENVIRONMENT__";
-const virtualPrefix = "virtual:cloudflare/";
-const VIRTUAL_WORKER_ENTRY = `${virtualPrefix}worker-entry`;
-const VIRTUAL_EXPORT_TYPES = `${virtualPrefix}export-types`;
-
-//#endregion
-//#region src/plugins/virtual-modules.ts
-const VIRTUAL_USER_ENTRY = `${virtualPrefix}user-entry`;
-const VIRTUAL_CLIENT_FALLBACK_ENTRY = `${virtualPrefix}client-fallback-entry`;
-/**
-* Plugin to provide virtual modules
-*/
-const virtualModulesPlugin = createPlugin("virtual-modules", (ctx) => {
-	return {
-		applyToEnvironment(environment) {
-			return !ctx.isChildEnvironment(environment.name) && ctx.getWorkerConfig(environment.name) !== void 0;
-		},
-		async resolveId(source) {
-			if (source === VIRTUAL_WORKER_ENTRY || source === VIRTUAL_EXPORT_TYPES) return `\0${source}`;
-			if (source === VIRTUAL_USER_ENTRY) {
-				const workerConfig = ctx.getWorkerConfig(this.environment.name);
-				assert(workerConfig, "Expected `workerConfig` to be defined");
-				const main = await this.resolve(workerConfig.main);
-				if (!main) throw new Error(`Failed to resolve main entry file "${workerConfig.main}" for environment "${this.environment.name}"`);
-				return main;
-			}
-		},
-		load(id) {
-			if (id === `\0${VIRTUAL_WORKER_ENTRY}`) {
-				const nodeJsCompat = ctx.getNodeJsCompat(this.environment.name);
-				return `
-${nodeJsCompat ? nodeJsCompat.injectGlobalCode() : ""}
-import { getExportTypes } from "${VIRTUAL_EXPORT_TYPES}";
-import * as mod from "${VIRTUAL_USER_ENTRY}";
-export * from "${VIRTUAL_USER_ENTRY}";
-export default mod.default ?? {};
-if (import.meta.hot) {
-	import.meta.hot.accept((module) => {
-		const exportTypes = getExportTypes(module);
-		import.meta.hot.send("vite-plugin-cloudflare:worker-export-types", exportTypes);
-	});
-}
-				`;
-			}
-			if (id === `\0${VIRTUAL_EXPORT_TYPES}`) return `
-import {
-	WorkerEntrypoint,
-	DurableObject,
-	WorkflowEntrypoint,
-} from "cloudflare:workers";
-
-const baseClasses = new Map([
-	["WorkerEntrypoint", WorkerEntrypoint],
-	["DurableObject", DurableObject],
-	["WorkflowEntrypoint", WorkflowEntrypoint],
-]);
-
-export function getExportTypes(module) {
-	const exportTypes = {};
-
-	for (const [key, value] of Object.entries(module)) {
-		if (key === "default") {
-			continue;
-		}
-
-		let exportType;
-
-		if (typeof value === "function") {
-			for (const [type, baseClass] of baseClasses) {
-				if (baseClass.prototype.isPrototypeOf(value.prototype)) {
-					exportType = type;
-					break;
-				}
-			}
-
-			if (!exportType) {
-				exportType = "DurableObject";
-			}
-		} else if (typeof value === "object" && value !== null) {
-			exportType = "WorkerEntrypoint";
-		}
-
-		exportTypes[key] = exportType;
-	}
-
-	return exportTypes;
-}
-				`;
-		}
-	};
-});
-/**
-* Plugin to provide a virtual fallback entry file for the `client` environment.
-* This is used as the entry file for the client build when only the `public` directory is present.
-*/
-const virtualClientFallbackPlugin = createPlugin("virtual-client-fallback", () => {
-	return {
-		applyToEnvironment(environment) {
-			return environment.name === "client";
-		},
-		resolveId(source) {
-			if (source === VIRTUAL_CLIENT_FALLBACK_ENTRY) return `\0${VIRTUAL_CLIENT_FALLBACK_ENTRY}`;
-		},
-		load(id) {
-			if (id === `\0${VIRTUAL_CLIENT_FALLBACK_ENTRY}`) return ``;
-		}
-	};
-});
-
 //#endregion
 //#region src/build.ts
+var import_picocolors$4 = /* @__PURE__ */ __toESM$1(require_picocolors(), 1);
 const CLIENT_FALLBACK_ENTRY_NAME = "__cloudflare_fallback_entry__";
 function createBuildApp(resolvedPluginConfig) {
 	return async (builder) => {
@@ -21480,24 +21395,24 @@ function createBuildApp(resolvedPluginConfig) {
 		assert(clientEnvironment, `No "client" environment`);
 		const defaultHtmlPath = nodePath.resolve(builder.config.root, "index.html");
 		const hasClientEntry = clientEnvironment.config.build.rollupOptions.input || fs$1.existsSync(defaultHtmlPath);
-		if (resolvedPluginConfig.type === "assets-only") {
-			if (hasClientEntry) await builder.build(clientEnvironment);
-			else if (getHasPublicAssets(builder.config)) await fallbackBuild(builder, clientEnvironment);
-			return;
-		}
 		const workerEnvironments = [...resolvedPluginConfig.environmentNameToWorkerMap.keys()].map((environmentName) => {
 			const environment = builder.environments[environmentName];
 			assert(environment, `"${environmentName}" environment not found`);
 			return environment;
 		});
 		await Promise.all(workerEnvironments.map((environment) => builder.build(environment)));
+		if (resolvedPluginConfig.type === "assets-only") {
+			if (hasClientEntry) await builder.build(clientEnvironment);
+			else if (getHasPublicAssets(builder.config) || resolvedPluginConfig.prerenderWorkerEnvironmentName) await fallbackBuild(builder, clientEnvironment);
+			return;
+		}
 		const { entryWorkerEnvironmentName } = resolvedPluginConfig;
 		const entryWorkerEnvironment = builder.environments[entryWorkerEnvironmentName];
 		assert(entryWorkerEnvironment, `No "${entryWorkerEnvironmentName}" environment`);
 		const entryWorkerBuildDirectory = nodePath.resolve(builder.config.root, entryWorkerEnvironment.config.build.outDir);
 		const importedAssetPaths = getImportedAssetPaths(loadViteManifest(entryWorkerBuildDirectory));
 		if (hasClientEntry) await builder.build(clientEnvironment);
-		else if (importedAssetPaths.size || getHasPublicAssets(builder.config)) await fallbackBuild(builder, clientEnvironment);
+		else if (importedAssetPaths.size || getHasPublicAssets(builder.config) || resolvedPluginConfig.prerenderWorkerEnvironmentName) await fallbackBuild(builder, clientEnvironment);
 		else {
 			if (!satisfiesViteVersion("7.0.0")) removeAssetsField(entryWorkerBuildDirectory);
 			return;
@@ -21839,7 +21754,7 @@ const configPlugin = createPlugin("config", (ctx) => {
 		},
 		configResolved(resolvedViteConfig) {
 			ctx.setResolvedViteConfig(resolvedViteConfig);
-			if (ctx.resolvedPluginConfig.type === "workers") validateWorkerEnvironmentOptions(ctx.resolvedPluginConfig, ctx.resolvedViteConfig);
+			if (ctx.resolvedPluginConfig.type !== "preview") validateWorkerEnvironmentOptions(ctx.resolvedPluginConfig, ctx.resolvedViteConfig);
 		},
 		buildStart() {
 			ctx.setHasShownWorkerConfigWarnings(false);
@@ -21879,21 +21794,22 @@ const configPlugin = createPlugin("config", (ctx) => {
 * Generates the environment configuration for all Worker environments.
 */
 function getEnvironmentsConfig(ctx, userConfig, mode) {
-	if (ctx.resolvedPluginConfig.type !== "workers") return;
-	const workersConfig = ctx.resolvedPluginConfig;
+	assertIsNotPreview(ctx);
+	if (!ctx.resolvedPluginConfig.environmentNameToWorkerMap.size) return;
 	return {
-		...Object.fromEntries([...workersConfig.environmentNameToWorkerMap].flatMap(([environmentName, worker]) => {
-			const childEnvironmentNames = workersConfig.environmentNameToChildEnvironmentNamesMap.get(environmentName) ?? [];
+		...Object.fromEntries([...ctx.resolvedPluginConfig.environmentNameToWorkerMap].flatMap(([environmentName, worker]) => {
+			const childEnvironmentNames = ctx.resolvedPluginConfig.environmentNameToChildEnvironmentNamesMap.get(environmentName) ?? [];
 			const sharedOptions = {
 				workerConfig: worker.config,
 				userConfig,
 				mode,
 				hasNodeJsCompat: ctx.getNodeJsCompat(environmentName) !== void 0
 			};
+			const isEntryWorker = environmentName === ctx.resolvedPluginConfig.prerenderWorkerEnvironmentName || ctx.resolvedPluginConfig.type === "workers" && environmentName === ctx.resolvedPluginConfig.entryWorkerEnvironmentName;
 			return [[environmentName, createCloudflareEnvironmentOptions({
 				...sharedOptions,
 				environmentName,
-				isEntryWorker: environmentName === workersConfig.entryWorkerEnvironmentName,
+				isEntryWorker,
 				isParentEnvironment: true
 			})], ...childEnvironmentNames.map((childEnvironmentName) => [childEnvironmentName, createCloudflareEnvironmentOptions({
 				...sharedOptions,
@@ -22804,23 +22720,6 @@ var ImageRegistriesService = class {
 	}
 };
 
-//#endregion
-//#region ../containers-shared/src/error.ts
-/**
-* Base class for errors where the user has done something wrong. These are not
-* reported to Sentry. API errors are intentionally *not* `UserError`s, and are
-* reported to Sentry. This will help us understand which API errors need better
-* messaging.
-*/
-var UserError = class extends Error {
-	telemetryMessage;
-	constructor(message, options) {
-		super(message, options);
-		Object.setPrototypeOf(this, new.target.prototype);
-		this.telemetryMessage = options?.telemetryMessage === true ? message : options?.telemetryMessage;
-	}
-};
-
 //#endregion
 //#region ../containers-shared/src/build.ts
 async function constructBuildCommand(options, logger) {
@@ -23040,29 +22939,6 @@ const verifyDockerInstalled = async (dockerPath, isDev = true) => {
 	if (!await isDockerRunning(dockerPath)) throw new UserError(`The Docker CLI could not be launched. Please ensure that the Docker CLI is installed and the daemon is running.
 Other container tooling that is compatible with the Docker CLI and engine may work, but is not yet guaranteed to do so. You can specify an executable with the environment variable WRANGLER_DOCKER_BIN and a socket with DOCKER_HOST.${isDev ? "\nTo suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your Wrangler config or passing in --enable-containers=false." : ""}`);
 };
-function isDir(inputPath) {
-	return statSync(inputPath).isDirectory();
-}
-/** returns true if it is a dockerfile, false if it is a registry link, throws if neither */
-const isDockerfile = (image, configPath) => {
-	const baseDir = configPath ? path4.dirname(configPath) : process.cwd();
-	const maybeDockerfile = path4.resolve(baseDir, image);
-	if (existsSync(maybeDockerfile)) {
-		if (isDir(maybeDockerfile)) throw new UserError(`${image} is a directory, you should specify a path to the Dockerfile`);
-		return true;
-	}
-	const errorPrefix = `The image "${image}" does not appear to be a valid path to a Dockerfile, or a valid image registry path:\n`;
-	try {
-		new URL(`https://${image}`);
-	} catch (e) {
-		if (e instanceof Error) throw new UserError(errorPrefix + e.message);
-		throw e;
-	}
-	const imageParts = image.split("/");
-	if (!imageParts[imageParts.length - 1]?.includes(":")) throw new UserError(errorPrefix + `If this is an image registry path, it needs to include at least a tag ':' (e.g: docker.io/httpd:1)`);
-	if (image.includes("://")) throw new UserError(errorPrefix + `Image reference should not include the protocol part (e.g: docker.io/httpd:1, not https://docker.io/httpd:1)`);
-	return false;
-};
 /**
 * Kills and removes any containers which come from the given image tag
 */
@@ -23316,7 +23192,7 @@ function getContainerOptions(options) {
 	return containersConfig.map((container) => {
 		if (isDockerfile(container.image, configPath)) return {
 			dockerfile: container.image,
-			image_build_context: container.image_build_context ?? path4.dirname(container.image),
+			image_build_context: container.image_build_context ?? path3.dirname(container.image),
 			image_vars: container.image_vars,
 			class_name: container.class_name,
 			image_tag: getDevContainerImageName(container.class_name, containerBuildId)
@@ -26110,7 +25986,7 @@ async function getDevMiniflareOptions(ctx, viteDevServer) {
 			inspectorPort: inputInspectorPort === false ? void 0 : inputInspectorPort,
 			unsafeDevRegistryPath: getDefaultDevRegistryPath(),
 			unsafeTriggerHandlers: true,
-			unsafeLocalExplorer: getLocalExplorerFromEnv(),
+			unsafeLocalExplorer: getLocalExplorerEnabledFromEnv(),
 			handleStructuredLogs: getStructuredLogsLogger(logger),
 			defaultPersistRoot: getPersistenceRoot(resolvedViteConfig.root, resolvedPluginConfig.persistState),
 			workers: [
@@ -26213,7 +26089,7 @@ async function getPreviewMiniflareOptions(ctx, vitePreviewServer) {
 			inspectorPort: inputInspectorPort === false ? void 0 : inputInspectorPort,
 			unsafeDevRegistryPath: getDefaultDevRegistryPath(),
 			unsafeTriggerHandlers: true,
-			unsafeLocalExplorer: getLocalExplorerFromEnv(),
+			unsafeLocalExplorer: getLocalExplorerEnabledFromEnv(),
 			handleStructuredLogs: getStructuredLogsLogger(logger),
 			defaultPersistRoot: getPersistenceRoot(resolvedViteConfig.root, resolvedPluginConfig.persistState),
 			workers
@@ -26428,39 +26304,50 @@ const nodeJsCompatPlugin = createPlugin("nodejs-compat", (ctx) => {
 			const nodeJsCompat = ctx.getNodeJsCompat(name);
 			if (nodeJsCompat) return {
 				resolve: { builtins: [...nodeJsCompat.externals] },
-				optimizeDeps: { exclude: [
-					...nonPrefixedNodeModules,
-					...nonPrefixedNodeModules.map((module$2) => `node:${module$2}`),
-					...[
-						"node:sea",
-						"node:sqlite",
-						"node:test",
-						"node:test/reporters"
-					]
-				] }
+				...isRolldown ? { build: { rolldownOptions: { plugins: [vite.esmExternalRequirePlugin({
+					external: [...nodeJsCompat.externals],
+					skipDuplicateCheck: true
+				})] } } } : {},
+				optimizeDeps: {
+					exclude: [
+						...nonPrefixedNodeModules,
+						...nonPrefixedNodeModules.map((module$2) => `node:${module$2}`),
+						...[
+							"node:sea",
+							"node:sqlite",
+							"node:test",
+							"node:test/reporters"
+						]
+					],
+					...isRolldown ? { rolldownOptions: { plugins: [vite.esmExternalRequirePlugin({
+						external: [nodeBuiltinsRE],
+						skipDuplicateCheck: true
+					})] } } : {}
+				}
 			};
 		},
 		applyToEnvironment(environment) {
 			return ctx.getNodeJsCompat(environment.name) !== void 0;
 		},
 		enforce: "pre",
-		async resolveId(source, importer, options) {
-			const nodeJsCompat = ctx.getNodeJsCompat(this.environment.name);
-			assertHasNodeJsCompat(nodeJsCompat);
-			if (nodeJsCompat.isGlobalVirtualModule(source)) return source;
-			const result = nodeJsCompat.resolveNodeJsImport(source);
-			if (!result) return this.resolve(source, importer, options);
-			if (this.environment.mode === "dev") {
-				assert(this.environment.depsOptimizer, "depsOptimizer is required in dev mode");
-				const { id } = this.environment.depsOptimizer.registerMissingImport(result.unresolved, result.resolved);
-				return this.resolve(id, importer, options);
-			}
-			return this.resolve(result.resolved, importer, options);
-		},
-		load(id) {
-			const nodeJsCompat = ctx.getNodeJsCompat(this.environment.name);
-			assertHasNodeJsCompat(nodeJsCompat);
-			return nodeJsCompat.getGlobalVirtualModule(id);
+		resolveId: {
+			filter: { id: [
+				nodeBuiltinsRE,
+				/^unenv\//,
+				/^@cloudflare\/unenv-preset\//
+			] },
+			async handler(source, importer, options) {
+				const nodeJsCompat = ctx.getNodeJsCompat(this.environment.name);
+				assertHasNodeJsCompat(nodeJsCompat);
+				const result = nodeJsCompat.resolveNodeJsImport(source);
+				if (!result) return;
+				if (this.environment.mode === "dev") {
+					assert(this.environment.depsOptimizer, "depsOptimizer is required in dev mode");
+					const { id } = this.environment.depsOptimizer.registerMissingImport(result.unresolved, result.resolved);
+					return this.resolve(id, importer, options);
+				}
+				return this.resolve(result.resolved, importer, options);
+			}
 		},
 		async configureServer(viteDevServer) {
 			await Promise.all(Object.values(viteDevServer.environments).flatMap(async (environment) => {
@@ -26489,18 +26376,16 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 		for (const nodeJsCompatWarnings of nodeJsCompatWarningsMap.values()) nodeJsCompatWarnings.renderWarnings();
 	};
 	function resolveId(environmentName, source, importer) {
+		if (!nodeBuiltinsRE.test(source)) return;
 		const workerConfig = ctx.getWorkerConfig(environmentName);
 		const nodeJsCompat = ctx.getNodeJsCompat(environmentName);
 		if (workerConfig && !nodeJsCompat) {
 			if (hasNodeJsAls(workerConfig) && isNodeAlsModule(source)) return;
-			const nodeJsCompatWarnings = nodeJsCompatWarningsMap.get(workerConfig);
-			if (source.startsWith("node:") || nonPrefixedNodeModules.includes(source)) {
-				nodeJsCompatWarnings?.registerImport(source, importer);
-				return {
-					id: source,
-					external: true
-				};
-			}
+			nodeJsCompatWarningsMap.get(workerConfig)?.registerImport(source, importer);
+			return {
+				id: source,
+				external: true
+			};
 		}
 	}
 	return {
@@ -26510,13 +26395,16 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 			const nodeJsCompat = ctx.getNodeJsCompat(environmentName);
 			if (workerConfig && !nodeJsCompat) return { optimizeDeps: { ...isRolldown ? { rolldownOptions: { plugins: [{
 				name: "vite-plugin-cloudflare:nodejs-compat-warnings-resolver",
-				resolveId(source, importer) {
-					return resolveId(environmentName, source, importer);
+				resolveId: {
+					filter: { id: nodeBuiltinsRE },
+					handler(source, importer) {
+						return resolveId(environmentName, source, importer);
+					}
 				}
 			}] } } : { esbuildOptions: { plugins: [{
 				name: "vite-plugin-cloudflare:nodejs-compat-warnings-resolver",
 				setup(build$8) {
-					build$8.onResolve({ filter: /* @__PURE__ */ new RegExp(`^(${nonPrefixedNodeModules.join("|")}|node:.+)$`) }, ({ path: path$1, importer }) => {
+					build$8.onResolve({ filter: nodeBuiltinsRE }, ({ path: path$1, importer }) => {
 						if (hasNodeJsAls(workerConfig) && isNodeAlsModule(path$1)) return;
 						nodeJsCompatWarningsMap.get(workerConfig)?.registerImport(path$1, importer);
 						return {
@@ -26537,8 +26425,11 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 		applyToEnvironment(environment) {
 			return ctx.getWorkerConfig(environment.name) !== void 0 && !ctx.getNodeJsCompat(environment.name);
 		},
-		async resolveId(source, importer) {
-			return resolveId(this.environment.name, source, importer);
+		resolveId: {
+			filter: { id: nodeBuiltinsRE },
+			handler(source, importer) {
+				return resolveId(this.environment.name, source, importer);
+			}
 		}
 	};
 });
@@ -26554,27 +26445,27 @@ const outputConfigPlugin = createPlugin("output-config", (ctx) => {
 			assertIsNotPreview(ctx);
 			if (ctx.isChildEnvironment(this.environment.name)) return;
 			let outputConfig;
-			if (ctx.resolvedPluginConfig.type === "workers") {
-				const inputConfig = ctx.getWorkerConfig(this.environment.name);
-				if (!inputConfig) return;
+			const inputWorkerConfig = ctx.getWorkerConfig(this.environment.name);
+			if (inputWorkerConfig) {
 				const entryChunk = Object.values(bundle).find((chunk) => chunk.type === "chunk" && chunk.isEntry && chunk.name === MAIN_ENTRY_NAME);
 				assert(entryChunk, `Expected entry chunk with name "${MAIN_ENTRY_NAME}"`);
-				const isEntryWorker = this.environment.name === ctx.resolvedPluginConfig.entryWorkerEnvironmentName;
+				const isPrerenderWorker = this.environment.name === ctx.resolvedPluginConfig.prerenderWorkerEnvironmentName;
+				const isEntryWorker = ctx.resolvedPluginConfig.type === "workers" && this.environment.name === ctx.resolvedPluginConfig.entryWorkerEnvironmentName;
 				outputConfig = {
-					...inputConfig,
+					...inputWorkerConfig,
 					main: entryChunk.fileName,
 					no_bundle: true,
 					rules: [{
 						type: "ESModule",
 						globs: ["**/*.js", "**/*.mjs"]
 					}],
-					assets: isEntryWorker ? {
-						...inputConfig.assets,
+					assets: isEntryWorker || isPrerenderWorker ? {
+						...inputWorkerConfig.assets,
 						directory: getAssetsDirectory(this.environment.config.build.outDir, ctx.resolvedViteConfig)
 					} : void 0
 				};
-				if (inputConfig.configPath) {
-					const localDevVars = getLocalDevVarsForPreview(inputConfig.configPath, ctx.resolvedPluginConfig.cloudflareEnv);
+				if (inputWorkerConfig.configPath) {
+					const localDevVars = getLocalDevVarsForPreview(inputWorkerConfig.configPath, ctx.resolvedPluginConfig.cloudflareEnv);
 					if (localDevVars) this.emitFile({
 						type: "asset",
 						fileName: ".dev.vars",
@@ -26582,19 +26473,21 @@ const outputConfigPlugin = createPlugin("output-config", (ctx) => {
 					});
 				}
 			} else if (this.environment.name === "client") {
-				const inputConfig = ctx.resolvedPluginConfig.config;
-				outputConfig = {
-					...inputConfig,
-					assets: {
-						...inputConfig.assets,
-						directory: "."
-					}
-				};
 				this.emitFile({
 					type: "asset",
 					fileName: ".assetsignore",
 					source: `${["wrangler.json", ".dev.vars"].join("\n")}\n`
 				});
+				if (ctx.resolvedPluginConfig.type === "assets-only") {
+					const inputAssetsOnlyConfig = ctx.resolvedPluginConfig.config;
+					outputConfig = {
+						...inputAssetsOnlyConfig,
+						assets: {
+							...inputAssetsOnlyConfig.assets,
+							directory: "."
+						}
+					};
+				}
 			}
 			if (!outputConfig) return;
 			if (outputConfig.unsafe && Object.keys(outputConfig.unsafe).length === 0) outputConfig.unsafe = void 0;
@@ -26742,6 +26635,7 @@ const triggerHandlersPlugin = createPlugin("trigger-handlers", (ctx) => {
 
 //#endregion
 //#region src/plugins/wasm.ts
+const wasmInitRE = /\.wasm\?init$/;
 /**
 * Plugin to support the `.wasm?init` extension
 */
@@ -26751,14 +26645,17 @@ const wasmHelperPlugin = createPlugin("wasm-helper", (ctx) => {
 		applyToEnvironment(environment) {
 			return ctx.getWorkerConfig(environment.name) !== void 0;
 		},
-		load(id) {
-			if (!id.endsWith(".wasm?init")) return;
-			return `
+		load: {
+			filter: { id: wasmInitRE },
+			handler(id) {
+				if (!wasmInitRE.test(id)) return;
+				return `
 					import wasm from "${cleanUrl(id)}";
 					export default function(opts = {}) {
 						return WebAssembly.instantiate(wasm, opts);
 					}
 				`;
+			}
 		}
 	};
 });
@@ -26785,6 +26682,7 @@ function cloudflare(pluginConfig = {}) {
 			sharedDuringBuild: true,
 			config(userConfig, env$1) {
 				ctx.setResolvedPluginConfig(resolvePluginConfig(pluginConfig, userConfig, env$1));
+				if (env$1.command === "build") process.env.CLOUDFLARE_VITE_BUILD = "true";
 			},
 			async configureServer(viteDevServer) {
 				const restartServer = viteDevServer.restart.bind(viteDevServer);