@cloudflare/vite-plugin 1.40.2 → 1.41.0

package/dist/index.mjs

@@ -3,7 +3,7 @@ import assert from "node:assert";
 import { CoreHeaders, CorePaths, Log, LogLevel, Miniflare, Request as Request$1, Response as Response$1, buildPublicUrl, coupleWebSocket, getDefaultDevRegistryPath, getNodeCompat, getWorkerRegistry, kUnsafeEphemeralUniqueKey, parseModuleFallbackRequest } from "miniflare";
 import * as wrangler from "wrangler";
 import * as nodePath from "node:path";
-import path3, { dirname, isAbsolute, join, relative, resolve } from "node:path";
+import path, { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import * as util$1 from "node:util";
 import { format, inspect, promisify } from "node:util";
 import * as vite from "vite";
@@ -1505,7 +1505,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-11";
+const DEFAULT_COMPAT_DATE = "2026-06-16";
 
 //#endregion
 //#region ../../node_modules/.pnpm/@remix-run+node-fetch-server@0.8.0/node_modules/@remix-run/node-fetch-server/dist/node-fetch-server.js
@@ -3957,7 +3957,7 @@ function resolveWranglerConfigPath({ config, script }, options) {
 		deployConfigPath: void 0,
 		redirected: false
 	};
-	return findWranglerConfig$1(script !== void 0 ? path3.dirname(script) : process.cwd(), options);
+	return findWranglerConfig$1(script !== void 0 ? path.dirname(script) : process.cwd(), options);
 }
 __name(resolveWranglerConfigPath, "resolveWranglerConfigPath");
 function findWranglerConfig$1(referencePath = process.cwd(), { useRedirectIfAvailable = false } = {}) {
@@ -3988,15 +3988,15 @@ function findRedirectedWranglerConfig(cwd, userConfigPath) {
 	const deployConfigFile = readFileSync$1(deployConfigPath);
 	try {
 		const deployConfig = parseJSONC(deployConfigFile, deployConfigPath);
-		redirectedConfigPath = deployConfig.configPath && path3.resolve(path3.dirname(deployConfigPath), deployConfig.configPath);
+		redirectedConfigPath = deployConfig.configPath && path.resolve(path.dirname(deployConfigPath), deployConfig.configPath);
 	} catch (e) {
-		throw new UserError(`Failed to parse the deploy configuration file at ${path3.relative(".", deployConfigPath)}`, {
+		throw new UserError(`Failed to parse the deploy configuration file at ${path.relative(".", deployConfigPath)}`, {
 			cause: e,
 			telemetryMessage: false
 		});
 	}
 	if (!redirectedConfigPath) throw new UserError(esm_default`
-			A deploy configuration file was found at "${path3.relative(".", deployConfigPath)}".
+			A deploy configuration file was found at "${path.relative(".", deployConfigPath)}".
 			But this is not valid - the required "configPath" property was not found.
 			Instead this file contains:
 			\`\`\`
@@ -4004,13 +4004,13 @@ function findRedirectedWranglerConfig(cwd, userConfigPath) {
 			\`\`\`
 		`, { telemetryMessage: false });
 	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.
+				There is a deploy configuration at "${path.relative(".", deployConfigPath)}".
+				But the redirected configuration path it points to, "${path.relative(".", redirectedConfigPath)}", does not exist.
 			`, { telemetryMessage: false });
 	if (userConfigPath) {
-		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)}".
+		if (path.join(path.dirname(userConfigPath), PATH_TO_DEPLOY_CONFIG) !== deployConfigPath) throw new UserError(esm_default`
+					Found both a user configuration file at "${path.relative(".", userConfigPath)}"
+					and a deploy configuration file at "${path.relative(".", deployConfigPath)}".
 					But these do not share the same base path so it is not clear which should be used.
 				`, { telemetryMessage: false });
 	}
@@ -5226,10 +5226,10 @@ var require_util$5 = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/un
 			if (!isHttpOrHttpsPrefixed(url.origin || url.protocol)) throw new InvalidArgumentError$36("Invalid URL protocol: the URL must start with `http:` or `https:`.");
 			const port = url.port != null ? url.port : url.protocol === "https:" ? 443 : 80;
 			let origin = url.origin != null ? url.origin : `${url.protocol || ""}//${url.hostname || ""}:${port}`;
-			let path = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`;
+			let path$1 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`;
 			if (origin[origin.length - 1] === "/") origin = origin.slice(0, origin.length - 1);
-			if (path && path[0] !== "/") path = `/${path}`;
-			return new URL(`${origin}${path}`);
+			if (path$1 && path$1[0] !== "/") path$1 = `/${path$1}`;
+			return new URL(`${origin}${path$1}`);
 		}
 		if (!isHttpOrHttpsPrefixed(url.origin || url.protocol)) throw new InvalidArgumentError$36("Invalid URL protocol: the URL must start with `http:` or `https:`.");
 		return url;
@@ -6104,8 +6104,8 @@ var require_diagnostics = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pn
 			debugLog("connection to %s%s using %s%s errored - %s", host, port ? `:${port}` : "", protocol, version$2, error.message);
 		});
 		diagnosticsChannel$1.subscribe("undici:client:sendHeaders", (evt) => {
-			const { request: { method, path, origin } } = evt;
-			debugLog("sending request to %s %s%s", method, origin, path);
+			const { request: { method, path: path$1, origin } } = evt;
+			debugLog("sending request to %s %s%s", method, origin, path$1);
 		});
 	}
 	let isTrackingRequestEvents = false;
@@ -6117,16 +6117,16 @@ var require_diagnostics = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pn
 		}
 		isTrackingRequestEvents = true;
 		diagnosticsChannel$1.subscribe("undici:request:headers", (evt) => {
-			const { request: { method, path, origin }, response: { statusCode } } = evt;
-			debugLog("received response to %s %s%s - HTTP %d", method, origin, path, statusCode);
+			const { request: { method, path: path$1, origin }, response: { statusCode } } = evt;
+			debugLog("received response to %s %s%s - HTTP %d", method, origin, path$1, statusCode);
 		});
 		diagnosticsChannel$1.subscribe("undici:request:trailers", (evt) => {
-			const { request: { method, path, origin } } = evt;
-			debugLog("trailers received from %s %s%s", method, origin, path);
+			const { request: { method, path: path$1, origin } } = evt;
+			debugLog("trailers received from %s %s%s", method, origin, path$1);
 		});
 		diagnosticsChannel$1.subscribe("undici:request:error", (evt) => {
-			const { request: { method, path, origin }, error } = evt;
-			debugLog("request to %s %s%s errored - %s", method, origin, path, error.message);
+			const { request: { method, path: path$1, origin }, error } = evt;
+			debugLog("request to %s %s%s errored - %s", method, origin, path$1, error.message);
 		});
 	}
 	let isTrackingWebSocketEvents = false;
@@ -6179,10 +6179,10 @@ var require_request$1 = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm
 	const invalidPathRegex = /[^\u0021-\u00ff]/;
 	const kHandler = Symbol("handler");
 	var Request$6 = class {
-		constructor(origin, { path, method, body, headers, query, idempotent, blocking, upgrade: upgrade$1, headersTimeout, bodyTimeout, reset, expectContinue, servername, throwOnError, maxRedirections, typeOfService }, handler) {
-			if (typeof path !== "string") throw new InvalidArgumentError$35("path must be a string");
-			else if (path[0] !== "/" && !(path.startsWith("http://") || path.startsWith("https://")) && method !== "CONNECT") throw new InvalidArgumentError$35("path must be an absolute URL or start with a slash");
-			else if (invalidPathRegex.test(path)) throw new InvalidArgumentError$35("invalid request path");
+		constructor(origin, { path: path$1, method, body, headers, query, idempotent, blocking, upgrade: upgrade$1, headersTimeout, bodyTimeout, reset, expectContinue, servername, throwOnError, maxRedirections, typeOfService }, handler) {
+			if (typeof path$1 !== "string") throw new InvalidArgumentError$35("path must be a string");
+			else if (path$1[0] !== "/" && !(path$1.startsWith("http://") || path$1.startsWith("https://")) && method !== "CONNECT") throw new InvalidArgumentError$35("path must be an absolute URL or start with a slash");
+			else if (invalidPathRegex.test(path$1)) throw new InvalidArgumentError$35("invalid request path");
 			if (typeof method !== "string") throw new InvalidArgumentError$35("method must be a string");
 			else if (normalizedMethodRecords$1[method] === void 0 && !isValidHTTPToken$2(method)) throw new InvalidArgumentError$35("invalid request method");
 			if (upgrade$1 && typeof upgrade$1 !== "string") throw new InvalidArgumentError$35("upgrade must be a string");
@@ -6223,7 +6223,7 @@ var require_request$1 = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm
 			this.completed = false;
 			this.aborted = false;
 			this.upgrade = upgrade$1 || null;
-			this.path = query ? serializePathWithQuery$3(path, query) : path;
+			this.path = query ? serializePathWithQuery$3(path$1, query) : path$1;
 			this.origin = origin;
 			this.protocol = getProtocolFromUrlString(origin);
 			this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent;
@@ -10706,7 +10706,7 @@ var require_client_h1 = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm
 	* @returns
 	*/
 	function writeH1(client, request$2) {
-		const { method, path, host, upgrade: upgrade$1, blocking, reset } = request$2;
+		const { method, path: path$1, host, upgrade: upgrade$1, blocking, reset } = request$2;
 		let { body, headers, contentLength } = request$2;
 		const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH" || method === "QUERY" || method === "PROPFIND" || method === "PROPPATCH";
 		if (util$23.isFormDataLike(body)) {
@@ -10751,7 +10751,7 @@ var require_client_h1 = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm
 		if (client[kMaxRequests$1] && socket[kCounter$1]++ >= client[kMaxRequests$1]) socket[kReset$1] = true;
 		if (blocking) socket[kBlocking] = true;
 		if (socket.setTypeOfService) socket.setTypeOfService(request$2.typeOfService);
-		let header = `${method} ${path} HTTP/1.1\r\n`;
+		let header = `${method} ${path$1} HTTP/1.1\r\n`;
 		if (typeof host === "string") header += `host: ${host}\r\n`;
 		else header += client[kHostHeader$1];
 		if (upgrade$1) header += `connection: upgrade\r\nupgrade: ${upgrade$1}\r\n`;
@@ -11287,7 +11287,7 @@ var require_client_h2 = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm
 	function writeH2(client, request$2) {
 		const requestTimeout = request$2.bodyTimeout ?? client[kBodyTimeout$1];
 		const session = client[kHTTP2Session];
-		const { method, path, host, upgrade: upgrade$1, expectContinue, signal, protocol, headers: reqHeaders } = request$2;
+		const { method, path: path$1, host, upgrade: upgrade$1, expectContinue, signal, protocol, headers: reqHeaders } = request$2;
 		let { body } = request$2;
 		if (upgrade$1 != null && upgrade$1 !== "websocket") {
 			util$22.errorRequest(client, request$2, new InvalidArgumentError$30(`Custom upgrade "${upgrade$1}" not supported over HTTP/2`));
@@ -11340,7 +11340,7 @@ var require_client_h2 = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm
 				}
 				headers[HTTP2_HEADER_METHOD] = "CONNECT";
 				headers[HTTP2_HEADER_PROTOCOL] = "websocket";
-				headers[HTTP2_HEADER_PATH] = path;
+				headers[HTTP2_HEADER_PATH] = path$1;
 				if (protocol === "ws:" || protocol === "wss:") headers[HTTP2_HEADER_SCHEME] = protocol === "ws:" ? "http" : "https";
 				else headers[HTTP2_HEADER_SCHEME] = protocol === "http:" ? "http" : "https";
 				stream$2 = session.request(headers, {
@@ -11382,7 +11382,7 @@ var require_client_h2 = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm
 			stream$2.setTimeout(requestTimeout);
 			return true;
 		}
-		headers[HTTP2_HEADER_PATH] = path;
+		headers[HTTP2_HEADER_PATH] = path$1;
 		headers[HTTP2_HEADER_SCHEME] = protocol === "http:" ? "http" : "https";
 		const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH";
 		if (body && typeof body.read === "function") body.read(0);
@@ -13208,8 +13208,8 @@ var require_proxy_agent = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pn
 				}
 				if (onHeaders) onHeaders.call(this, statusCode, data$1, resume$1);
 			};
-			const { origin, path = "/", headers = {} } = opts;
-			opts.path = origin + path;
+			const { origin, path: path$1 = "/", headers = {} } = opts;
+			opts.path = origin + path$1;
 			if (!("host" in headers) && !("Host" in headers)) {
 				const { host } = new URL(origin);
 				headers.host = host;
@@ -14993,16 +14993,16 @@ var require_mock_utils = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnp
 		}
 		return normalizedQp;
 	}
-	function safeUrl(path) {
-		if (typeof path !== "string") return path;
-		const pathSegments = path.split("?", 3);
-		if (pathSegments.length !== 2) return path;
+	function safeUrl(path$1) {
+		if (typeof path$1 !== "string") return path$1;
+		const pathSegments = path$1.split("?", 3);
+		if (pathSegments.length !== 2) return path$1;
 		const qp = new URLSearchParams(pathSegments.pop());
 		qp.sort();
 		return [...pathSegments, qp.toString()].join("?");
 	}
-	function matchKey(mockDispatch$1, { path, method, body, headers }) {
-		const pathMatch = matchValue$1(mockDispatch$1.path, path);
+	function matchKey(mockDispatch$1, { path: path$1, method, body, headers }) {
+		const pathMatch = matchValue$1(mockDispatch$1.path, path$1);
 		const methodMatch = matchValue$1(mockDispatch$1.method, method);
 		const bodyMatch = typeof mockDispatch$1.body !== "undefined" ? matchValue$1(mockDispatch$1.body, body) : true;
 		const headersMatch = matchHeaders(mockDispatch$1, headers);
@@ -15020,8 +15020,8 @@ var require_mock_utils = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnp
 		const basePath = key.query ? serializePathWithQuery$2(key.path, key.query) : key.path;
 		const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath;
 		const resolvedPathWithoutTrailingSlash = removeTrailingSlash(resolvedPath);
-		let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path, ignoreTrailingSlash }) => {
-			return ignoreTrailingSlash ? matchValue$1(removeTrailingSlash(safeUrl(path)), resolvedPathWithoutTrailingSlash) : matchValue$1(safeUrl(path), resolvedPath);
+		let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path$1, ignoreTrailingSlash }) => {
+			return ignoreTrailingSlash ? matchValue$1(removeTrailingSlash(safeUrl(path$1)), resolvedPathWithoutTrailingSlash) : matchValue$1(safeUrl(path$1), resolvedPath);
 		});
 		if (matchedMockDispatches.length === 0) throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`);
 		matchedMockDispatches = matchedMockDispatches.filter(({ method }) => matchValue$1(method, key.method));
@@ -15064,15 +15064,15 @@ var require_mock_utils = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnp
 	/**
 	* @param {string} path Path to remove trailing slash from
 	*/
-	function removeTrailingSlash(path) {
-		while (path.endsWith("/")) path = path.slice(0, -1);
-		if (path.length === 0) path = "/";
-		return path;
+	function removeTrailingSlash(path$1) {
+		while (path$1.endsWith("/")) path$1 = path$1.slice(0, -1);
+		if (path$1.length === 0) path$1 = "/";
+		return path$1;
 	}
 	function buildKey$1(opts) {
-		const { path, method, body, headers, query } = opts;
+		const { path: path$1, method, body, headers, query } = opts;
 		return {
-			path,
+			path: path$1,
 			method,
 			body,
 			headers,
@@ -15639,10 +15639,10 @@ var require_pending_interceptors_formatter = /* @__PURE__ */ __commonJS$1({ "../
 			});
 		}
 		format(pendingInterceptors) {
-			const withPrettyHeaders = pendingInterceptors.map(({ method, path, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
+			const withPrettyHeaders = pendingInterceptors.map(({ method, path: path$1, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
 				Method: method,
 				Origin: origin,
-				Path: path,
+				Path: path$1,
 				"Status code": statusCode,
 				Persistent: persist ? PERSISTENT : NOT_PERSISTENT,
 				Invocations: timesInvoked,
@@ -15700,8 +15700,8 @@ var require_mock_agent = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnp
 			const acceptNonStandardSearchParameters = this[kMockAgentAcceptsNonStandardSearchParameters];
 			const dispatchOpts = { ...opts };
 			if (acceptNonStandardSearchParameters && dispatchOpts.path) {
-				const [path, searchParams] = dispatchOpts.path.split("?");
-				dispatchOpts.path = `${path}?${normalizeSearchParams(searchParams, acceptNonStandardSearchParameters)}`;
+				const [path$1, searchParams] = dispatchOpts.path.split("?");
+				dispatchOpts.path = `${path$1}?${normalizeSearchParams(searchParams, acceptNonStandardSearchParameters)}`;
 			}
 			return this[kAgent].dispatch(dispatchOpts, handler);
 		}
@@ -16178,10 +16178,10 @@ var require_snapshot_recorder = /* @__PURE__ */ __commonJS$1({ "../../node_modul
 		* @return {Promise<void>} - Resolves when snapshots are loaded
 		*/
 		async loadSnapshots(filePath) {
-			const path = filePath || this.#snapshotPath;
-			if (!path) throw new InvalidArgumentError$6("Snapshot path is required");
+			const path$1 = filePath || this.#snapshotPath;
+			if (!path$1) throw new InvalidArgumentError$6("Snapshot path is required");
 			try {
-				const data$1 = await readFile(resolve$3(path), "utf8");
+				const data$1 = await readFile(resolve$3(path$1), "utf8");
 				const parsed = JSON.parse(data$1);
 				if (Array.isArray(parsed)) {
 					this.#snapshots.clear();
@@ -16189,7 +16189,7 @@ var require_snapshot_recorder = /* @__PURE__ */ __commonJS$1({ "../../node_modul
 				} else this.#snapshots = new Map(Object.entries(parsed));
 			} catch (error) {
 				if (error.code === "ENOENT") this.#snapshots.clear();
-				else throw new UndiciError$1(`Failed to load snapshots from ${path}`, { cause: error });
+				else throw new UndiciError$1(`Failed to load snapshots from ${path$1}`, { cause: error });
 			}
 		}
 		/**
@@ -16199,9 +16199,9 @@ var require_snapshot_recorder = /* @__PURE__ */ __commonJS$1({ "../../node_modul
 		* @returns {Promise<void>} - Resolves when snapshots are saved
 		*/
 		async saveSnapshots(filePath) {
-			const path = filePath || this.#snapshotPath;
-			if (!path) throw new InvalidArgumentError$6("Snapshot path is required");
-			const resolvedPath = resolve$3(path);
+			const path$1 = filePath || this.#snapshotPath;
+			if (!path$1) throw new InvalidArgumentError$6("Snapshot path is required");
+			const resolvedPath = resolve$3(path$1);
 			await mkdir(dirname$2(resolvedPath), { recursive: true });
 			const data$1 = Array.from(this.#snapshots.entries()).map(([hash, snapshot]) => ({
 				hash,
@@ -16768,11 +16768,11 @@ var require_redirect_handler = /* @__PURE__ */ __commonJS$1({ "../../node_module
 				return;
 			}
 			const { origin, pathname, search } = util$10.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin)));
-			const path = search ? `${pathname}${search}` : pathname;
-			const redirectUrlString = `${origin}${path}`;
+			const path$1 = search ? `${pathname}${search}` : pathname;
+			const redirectUrlString = `${origin}${path$1}`;
 			for (const historyUrl of this.history) if (historyUrl.toString() === redirectUrlString) throw new InvalidArgumentError$3(`Redirect loop detected. Cannot redirect to ${origin}. This typically happens when using a Client or Pool with cross-origin redirects. Use an Agent for cross-origin redirects.`);
 			this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin);
-			this.opts.path = path;
+			this.opts.path = path$1;
 			this.opts.origin = origin;
 			this.opts.query = null;
 		}
@@ -21730,10 +21730,10 @@ var require_fetch = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/und
 			const url = requestCurrentURL(request$2);
 			/** @type {import('../../..').Agent} */
 			const agent = fetchParams.controller.dispatcher;
-			const path = url.pathname + url.search;
+			const path$1 = url.pathname + url.search;
 			const hasTrailingQuestionMark = url.search.length === 0 && url.href[url.href.length - url.hash.length - 1] === "?";
 			return new Promise((resolve$4, reject) => agent.dispatch({
-				path: hasTrailingQuestionMark ? `${path}?` : path,
+				path: hasTrailingQuestionMark ? `${path$1}?` : path$1,
 				origin: url.origin,
 				method: request$2.method,
 				body: agent.isMockActive ? request$2.body && (request$2.body.source || request$2.body.stream) : body,
@@ -22515,9 +22515,9 @@ var require_util$2 = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/un
 	* path-value        = <any CHAR except CTLs or ";">
 	* @param {string} path
 	*/
-	function validateCookiePath(path) {
-		for (let i$1 = 0; i$1 < path.length; ++i$1) {
-			const code = path.charCodeAt(i$1);
+	function validateCookiePath(path$1) {
+		for (let i$1 = 0; i$1 < path$1.length; ++i$1) {
+			const code = path$1.charCodeAt(i$1);
 			if (code < 32 || code === 127 || code === 59) throw new Error("Invalid cookie path");
 		}
 	}
@@ -25625,9 +25625,9 @@ var require_undici = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/un
 			if (opts != null && typeof opts !== "object") throw new InvalidArgumentError("invalid opts");
 			if (opts && opts.path != null) {
 				if (typeof opts.path !== "string") throw new InvalidArgumentError("invalid opts.path");
-				let path = opts.path;
-				if (!opts.path.startsWith("/")) path = `/${path}`;
-				url = new URL(util$3.parseOrigin(url).origin + path);
+				let path$1 = opts.path;
+				if (!opts.path.startsWith("/")) path$1 = `/${path$1}`;
+				url = new URL(util$3.parseOrigin(url).origin + path$1);
 			} else {
 				if (!opts) opts = typeof url === "object" ? url : {};
 				url = util$3.parseURL(url);
@@ -30933,7 +30933,7 @@ function getGlobalConfigPath({ appName = "wrangler", leadingDot = true, useLegac
 	const dirName = `${leadingDot ? "." : ""}${appName}`;
 	const configDir = mod_esm_default(dirName).config();
 	if (useLegacyHomeDir) {
-		const legacyConfigDir = path3.join(os.homedir(), dirName);
+		const legacyConfigDir = path.join(os.homedir(), dirName);
 		if (isDirectory(legacyConfigDir)) return legacyConfigDir;
 	}
 	return configDir;
@@ -31038,7 +31038,7 @@ var getBuildPlatformFromEnv = getEnvironmentVariableFactory({ variableName: "WRA
 var getRegistryPath = getEnvironmentVariableFactory({
 	variableName: "WRANGLER_REGISTRY_PATH",
 	defaultValue() {
-		return path3.join(getGlobalWranglerConfigPath(), "registry");
+		return path.join(getGlobalWranglerConfigPath(), "registry");
 	}
 });
 var getD1ExtraLocationChoices = getEnvironmentVariableFactory({ variableName: "WRANGLER_D1_EXTRA_LOCATION_CHOICES" });
@@ -31454,7 +31454,7 @@ function isPagesConfig(rawConfig) {
 }
 __name(isPagesConfig, "isPagesConfig");
 function normalizeAndValidateConfig(rawConfig, configPath, userConfigPath, args, preserveOriginalMain = false) {
-	const diagnostics = new Diagnostics(`Processing ${configPath ? path3.relative(process.cwd(), configPath) : "wrangler"} configuration:`);
+	const diagnostics = new Diagnostics(`Processing ${configPath ? path.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");
@@ -31558,34 +31558,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) => path3.relative(process.cwd(), path3.join(path3.dirname(configPath), `${dir}`))) : path3.relative(process.cwd(), path3.join(path3.dirname(configPath), `${watch_dir}`)) : watch_dir,
+		watch_dir: command && configPath ? Array.isArray(watch_dir) ? watch_dir.map((dir) => path.relative(process.cwd(), path.join(path.dirname(configPath), `${dir}`))) : path.relative(process.cwd(), path.join(path.dirname(configPath), `${watch_dir}`)) : watch_dir,
 		cwd
 	};
 }
 __name(normalizeAndValidateBuild, "normalizeAndValidateBuild");
 function normalizeAndValidateMainField(configPath, rawMain) {
-	const configDir = path3.dirname(configPath ?? "wrangler.toml");
+	const configDir = path.dirname(configPath ?? "wrangler.toml");
 	if (rawMain !== void 0) if (typeof rawMain === "string") {
-		const directory = path3.resolve(configDir);
-		return path3.resolve(directory, rawMain);
+		const directory = path.resolve(configDir);
+		return path.resolve(directory, rawMain);
 	} else return rawMain;
 	else return;
 }
 __name(normalizeAndValidateMainField, "normalizeAndValidateMainField");
 function normalizeAndValidateBaseDirField(configPath, rawDir) {
-	const configDir = path3.dirname(configPath ?? "wrangler.toml");
+	const configDir = path.dirname(configPath ?? "wrangler.toml");
 	if (rawDir !== void 0) if (typeof rawDir === "string") {
-		const directory = path3.resolve(configDir);
-		return path3.resolve(directory, rawDir);
+		const directory = path.resolve(configDir);
+		return path.resolve(directory, rawDir);
 	} else return rawDir;
 	else return;
 }
 __name(normalizeAndValidateBaseDirField, "normalizeAndValidateBaseDirField");
 function normalizeAndValidatePagesBuildOutputDir(configPath, rawPagesDir) {
-	const configDir = path3.dirname(configPath ?? "wrangler.toml");
+	const configDir = path.dirname(configPath ?? "wrangler.toml");
 	if (rawPagesDir !== void 0) if (typeof rawPagesDir === "string") {
-		const directory = path3.resolve(configDir);
-		return path3.resolve(directory, rawPagesDir);
+		const directory = path.resolve(configDir);
+		return path.resolve(directory, rawPagesDir);
 	} else return rawPagesDir;
 	else return;
 }
@@ -31638,7 +31638,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 = "${path3.join(String(rawConfig.site["entry-point"]) || "workers-site", path3.extname(String(rawConfig.site["entry-point"]) || "workers-site") ? "" : "index.js")}"
+main = "${path.join(String(rawConfig.site["entry-point"]) || "workers-site", path.extname(String(rawConfig.site["entry-point"]) || "workers-site") ? "" : "index.js")}"
 \`\`\``, false, void 0, "warning");
 		let siteEntryPoint = rawConfig.site["entry-point"];
 		if (!mainEntryPoint && !siteEntryPoint) {
@@ -31651,7 +31651,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 = path3.relative(process.cwd(), path3.join(path3.dirname(configPath), siteEntryPoint));
+		if (configPath && siteEntryPoint) siteEntryPoint = path.relative(process.cwd(), path.join(path.dirname(configPath), siteEntryPoint));
 		return {
 			bucket,
 			"entry-point": siteEntryPoint,
@@ -31683,7 +31683,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 ? path3.relative(process.cwd(), path3.join(path3.dirname(configPath), filePath)) : filePath;
+		if (configPath) mapping[name] = configPath ? path.relative(process.cwd(), path.join(path.dirname(configPath), filePath)) : filePath;
 	}
 	return mapping;
 }
@@ -31941,7 +31941,7 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
 __name(normalizeAndValidateEnvironment, "normalizeAndValidateEnvironment");
 function validateAndNormalizeTsconfig(diagnostics, topLevelEnv, rawEnv, configPath) {
 	const tsconfig = inheritable(diagnostics, topLevelEnv, rawEnv, "tsconfig", isString$2, void 0);
-	return configPath && tsconfig ? path3.relative(process.cwd(), path3.join(path3.dirname(configPath), tsconfig)) : tsconfig;
+	return configPath && tsconfig ? path.relative(process.cwd(), path.join(path.dirname(configPath), tsconfig)) : tsconfig;
 }
 __name(validateAndNormalizeTsconfig, "validateAndNormalizeTsconfig");
 var validateAndNormalizeRules = /* @__PURE__ */ __name((diagnostics, topLevelEnv, rawEnv, envName) => {
@@ -32441,9 +32441,9 @@ function validateContainerApp(envName, topLevelName, configPath) {
 			let resolvedBuildContextPath = void 0;
 			try {
 				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);
+					const baseDir = configPath ? path.dirname(configPath) : process.cwd();
+					resolvedImage = path.resolve(baseDir, resolvedImage);
+					resolvedBuildContextPath = containerAppOptional.image_build_context ? path.resolve(baseDir, containerAppOptional.image_build_context) : path.dirname(resolvedImage);
 				}
 			} catch (err) {
 				if (err instanceof Error && err.message) diagnostics.errors.push(err.message);
@@ -33615,8 +33615,8 @@ function isRemoteValid(targetObject, fieldPath, diagnostics) {
 }
 __name(isRemoteValid, "isRemoteValid");
 function isDockerfile(imagePath, configPath) {
-	const baseDir = configPath ? path3.dirname(configPath) : process.cwd();
-	const maybeDockerfile = path3.resolve(baseDir, imagePath);
+	const baseDir = configPath ? path.dirname(configPath) : process.cwd();
+	const maybeDockerfile = path.resolve(baseDir, imagePath);
 	if (fs2.existsSync(maybeDockerfile)) {
 		if (isDirectory(maybeDockerfile)) throw new UserError(`${imagePath} is a directory, you should specify a path to the Dockerfile`, { telemetryMessage: false });
 		return true;
@@ -33768,7 +33768,7 @@ __name(validateDurableObjectBinding2, "validateDurableObjectBinding");
 var import_signal_exit = __toESM(require_signal_exit());
 function getWranglerHiddenDirPath(projectRoot) {
 	projectRoot ??= process.cwd();
-	return path3.join(projectRoot, ".wrangler");
+	return path.join(projectRoot, ".wrangler");
 }
 __name(getWranglerHiddenDirPath, "getWranglerHiddenDirPath");
 var STALE_WRANGLER_TMP_DIR_MS = 1440 * 60 * 1e3;
@@ -33785,7 +33785,7 @@ function sweepStaleWranglerTmpDirs(tmpRoot) {
 	const cutoff = Date.now() - STALE_WRANGLER_TMP_DIR_MS;
 	for (const entry of entries) {
 		if (!entry.isDirectory()) continue;
-		const entryPath = path3.join(tmpRoot, entry.name);
+		const entryPath = path.join(tmpRoot, entry.name);
 		try {
 			if (fs2.statSync(entryPath).mtimeMs < cutoff) removeDirSync(entryPath);
 		} catch {}
@@ -33793,10 +33793,10 @@ function sweepStaleWranglerTmpDirs(tmpRoot) {
 }
 __name(sweepStaleWranglerTmpDirs, "sweepStaleWranglerTmpDirs");
 function getWranglerTmpDir(projectRoot, prefix, cleanup = true) {
-	const tmpRoot = path3.join(getWranglerHiddenDirPath(projectRoot), "tmp");
+	const tmpRoot = path.join(getWranglerHiddenDirPath(projectRoot), "tmp");
 	fs2.mkdirSync(tmpRoot, { recursive: true });
 	sweepStaleWranglerTmpDirs(tmpRoot);
-	const tmpPrefix = path3.join(tmpRoot, `${prefix}-`);
+	const tmpPrefix = path.join(tmpRoot, `${prefix}-`);
 	const tmpDir = fs2.realpathSync(fs2.mkdtempSync(tmpPrefix));
 	const cleanupDir = /* @__PURE__ */ __name(() => {
 		if (cleanup) try {
@@ -36926,8 +36926,8 @@ const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
 	return url.replace(postfixRE, "");
 }
-function withTrailingSlash(path) {
-	return path.endsWith("/") ? path : `${path}/`;
+function withTrailingSlash(path$1) {
+	return path$1.endsWith("/") ? path$1 : `${path$1}/`;
 }
 function createRequestHandler(handler) {
 	return async (req, res, next) => {
@@ -37164,8 +37164,11 @@ var PluginContext = class {
 	getWorkerConfig(environmentName) {
 		return this.#getWorker(environmentName)?.config;
 	}
+	getWorkerNewConfig(environmentName) {
+		return this.#getWorker(environmentName)?.parsedNewConfig;
+	}
 	get allWorkerConfigs() {
-		if (this.resolvedPluginConfig.type === "preview") return this.resolvedPluginConfig.workers;
+		if (this.resolvedPluginConfig.type === "preview") return this.resolvedPluginConfig.workers.map((worker) => worker.config);
 		return Array.from(this.resolvedPluginConfig.environmentNameToWorkerMap.values()).map((worker) => worker.config);
 	}
 	get entryWorkerConfig() {
@@ -37296,6 +37299,138 @@ const defuArrayFn = createDefu((object, key, currentValue) => {
 	}
 });
 
+//#endregion
+//#region src/build-output.ts
+/**
+* Initial draft version of the Build Output API.
+*
+* Will move to `v1` when the spec stabilises.
+*/
+const BUILD_OUTPUT_VERSION = "v0";
+/**
+* Project-relative root.
+*/
+const BUILD_OUTPUT_ROOT = ".cloudflare/output";
+/**
+* Filename of the per-Worker config.
+*/
+const WORKER_CONFIG_FILENAME = "worker.config.json";
+/**
+* Absolute path to the Build Output API root for the current project.
+*/
+function getBuildOutputDir(root) {
+	return nodePath.resolve(root, BUILD_OUTPUT_ROOT);
+}
+/**
+* Clean the build output directory
+*
+* Called once at the start of each build
+*/
+function cleanBuildOutputDir(root) {
+	removeDirSync(getBuildOutputDir(root));
+}
+/**
+* Absolute path to the workers output directory
+*/
+function getWorkersDir(root) {
+	return nodePath.join(getBuildOutputDir(root), BUILD_OUTPUT_VERSION, "workers");
+}
+/**
+* Absolute path to `worker.config.json` for a given Worker.
+*/
+function getWorkerConfigPath(root, workerName) {
+	return nodePath.join(getWorkersDir(root), workerName, WORKER_CONFIG_FILENAME);
+}
+/**
+* Absolute path to the bundle directory for a given Worker.
+*/
+function getWorkerBundleDir(root, workerName) {
+	return nodePath.join(getWorkersDir(root), workerName, "bundle");
+}
+/**
+* Absolute path to the assets directory for a given Worker.
+*/
+function getWorkerAssetsDir(root, workerName) {
+	return nodePath.join(getWorkersDir(root), workerName, "assets");
+}
+/**
+* Map a bundle filename to its declared module type.
+*/
+function detectModuleType(filename) {
+	switch (nodePath.extname(filename).toLowerCase()) {
+		case ".js":
+		case ".mjs": return "esm";
+		case ".wasm": return "wasm";
+		case ".bin": return "data";
+		case ".txt":
+		case ".html":
+		case ".sql": return "text";
+		case ".json": return "json";
+		case ".map": return "sourcemap";
+		default: return "data";
+	}
+}
+/**
+* Write the output `worker.config.json` for a given Worker to the Build
+* Output API tree.
+*
+* - Workers mode: `manifest` is provided (bundle/ present on disk).
+* - Assets-only mode: `manifest` is omitted (no bundle/ directory).
+*/
+function writeOutputWorkerConfig(root, parsedConfig, manifest) {
+	const { entrypoint: _entrypoint,...rest } = parsedConfig;
+	const outputConfig = {
+		...rest,
+		manifest
+	};
+	const workerOutputDir = nodePath.join(getWorkersDir(root), outputConfig.name);
+	fs$1.mkdirSync(workerOutputDir, { recursive: true });
+	const configPath = getWorkerConfigPath(root, outputConfig.name);
+	fs$1.writeFileSync(configPath, JSON.stringify(outputConfig));
+}
+
+//#endregion
+//#region src/build-output-preview.ts
+/**
+* Read the Build Output API at `<root>/.cloudflare/output/v0/workers/`
+* and reconstruct a `BuildOutputPreviewWorker` for each Worker
+*/
+async function readBuildOutputWorkers(root) {
+	const workersDir = getWorkersDir(root);
+	if (!fs$1.existsSync(workersDir)) throw new Error(`No Build Output API tree found at ${workersDir}.`);
+	const workerNames = fs$1.readdirSync(workersDir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+	if (workerNames.length === 0) throw new Error(`Build Output API tree at ${workersDir} contains no Worker directories.`);
+	const { OutputWorkerSchema, convertToWranglerConfig } = await import("./dist-Cr__Sz5N.mjs");
+	return workerNames.map((workerName) => {
+		const configPath = getWorkerConfigPath(root, workerName);
+		assert(fs$1.existsSync(configPath), `Build Output API: missing \`${WORKER_CONFIG_FILENAME}\` for Worker "${workerName}" at ${configPath}.`);
+		const { manifest,...inputShape } = OutputWorkerSchema.parse(JSON.parse(fs$1.readFileSync(configPath, "utf-8")));
+		const { config, diagnostics } = normalizeAndValidateConfig(convertToWranglerConfig(inputShape), void 0, void 0, {}, true);
+		if (diagnostics.hasWarnings()) console.warn(diagnostics.renderWarnings());
+		if (diagnostics.hasErrors()) throw new Error(diagnostics.renderErrors());
+		const bundleDir = getWorkerBundleDir(root, workerName);
+		const assetsDir = getWorkerAssetsDir(root, workerName);
+		if (fs$1.existsSync(assetsDir)) config.assets = {
+			...config.assets ?? {},
+			directory: assetsDir
+		};
+		let bundle;
+		if (manifest) {
+			config.main = manifest.mainModule;
+			bundle = {
+				rootPath: bundleDir,
+				mainModule: manifest.mainModule,
+				modules: manifest.modules
+			};
+		}
+		return {
+			source: "build-output",
+			config,
+			bundle
+		};
+	});
+}
+
 //#endregion
 //#region src/deploy-config.ts
 function getDeployConfigPath(root) {
@@ -42429,15 +42564,15 @@ function hasTrailingSlash(input = "", respectQueryAndFragment) {
 function withTrailingSlash$1(input = "", respectQueryAndFragment) {
 	if (!respectQueryAndFragment) return input.endsWith("/") ? input : input + "/";
 	if (hasTrailingSlash(input, true)) return input || "/";
-	let path = input;
+	let path$1 = input;
 	let fragment = "";
 	const fragmentIndex = input.indexOf("#");
 	if (fragmentIndex >= 0) {
-		path = input.slice(0, fragmentIndex);
+		path$1 = input.slice(0, fragmentIndex);
 		fragment = input.slice(fragmentIndex);
-		if (!path) return fragment;
+		if (!path$1) return fragment;
 	}
-	const [s0, ...s] = path.split("?");
+	const [s0, ...s] = path$1.split("?");
 	return s0 + "/" + (s.length > 0 ? `?${s.join("?")}` : "") + fragment;
 }
 function isNonEmptyURL(url) {
@@ -42463,8 +42598,8 @@ const isAbsolute$2 = function(p$1) {
 //#endregion
 //#region ../../node_modules/.pnpm/mlly@1.7.4/node_modules/mlly/dist/index.mjs
 const BUILTIN_MODULES = new Set(builtinModules);
-function normalizeSlash(path) {
-	return path.replace(/\\/g, "/");
+function normalizeSlash(path$1) {
+	return path$1.replace(/\\/g, "/");
 }
 /**
 * @typedef ErrnoExceptionFields
@@ -42584,8 +42719,8 @@ codes.ERR_INVALID_PACKAGE_CONFIG = createError(
 	* @param {string} [base]
 	* @param {string} [message]
 	*/
-	(path, base, message) => {
-		return `Invalid package config ${path}${base ? ` while importing ${base}` : ""}${message ? `. ${message}` : ""}`;
+	(path$1, base, message) => {
+		return `Invalid package config ${path$1}${base ? ` while importing ${base}` : ""}${message ? `. ${message}` : ""}`;
 	},
 	Error
 );
@@ -42615,8 +42750,8 @@ codes.ERR_MODULE_NOT_FOUND = createError(
 	* @param {string} base
 	* @param {boolean} [exactUrl]
 	*/
-	(path, base, exactUrl = false) => {
-		return `Cannot find ${exactUrl ? "module" : "package"} '${path}' imported from ${base}`;
+	(path$1, base, exactUrl = false) => {
+		return `Cannot find ${exactUrl ? "module" : "package"} '${path$1}' imported from ${base}`;
 	},
 	Error
 );
@@ -42654,8 +42789,8 @@ codes.ERR_UNKNOWN_FILE_EXTENSION = createError(
 	* @param {string} extension
 	* @param {string} path
 	*/
-	(extension, path) => {
-		return `Unknown file extension "${extension}" for ${path}`;
+	(extension, path$1) => {
+		return `Unknown file extension "${extension}" for ${path$1}`;
 	},
 	TypeError
 );
@@ -42812,7 +42947,7 @@ function read(jsonPath, { base, specifier }) {
 	/** @type {string | undefined} */
 	let string;
 	try {
-		string = fs2.readFileSync(path3.toNamespacedPath(jsonPath), "utf8");
+		string = fs2.readFileSync(path.toNamespacedPath(jsonPath), "utf8");
 	} catch (error) {
 		const exception = error;
 		if (exception.code !== "ENOENT") throw exception;
@@ -43018,15 +43153,15 @@ function emitLegacyIndexDeprecation(url, packageJsonUrl, base, main) {
 	const packagePath = fileURLToPath(new URL$1(".", packageJsonUrl));
 	const basePath = fileURLToPath(base);
 	if (!main) process$1.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 (path3.resolve(packagePath, main) !== urlPath) process$1.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 (path.resolve(packagePath, main) !== urlPath) process$1.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
 * @returns {Stats | undefined}
 */
-function tryStatSync(path) {
+function tryStatSync(path$1) {
 	try {
-		return statSync(path);
+		return statSync(path$1);
 	} catch {}
 }
 /**
@@ -43125,7 +43260,7 @@ function finalizeResolution(resolved, base, preserveSymlinks) {
 	{
 		const real = realpathSync(filePath);
 		const { search, hash } = resolved;
-		resolved = pathToFileURL(real + (filePath.endsWith(path3.sep) ? "/" : ""));
+		resolved = pathToFileURL(real + (filePath.endsWith(path.sep) ? "/" : ""));
 		resolved.search = search;
 		resolved.hash = hash;
 	}
@@ -44183,8 +44318,14 @@ const allowedWranglerConfigExtensions = [
 //#region src/plugin-config.ts
 function normalizeNewConfig(option) {
 	if (option === void 0 || option === false) return;
-	if (option === true) return { types: { generate: true } };
-	return { types: { generate: option.types?.generate ?? true } };
+	if (option === true) return {
+		types: { generate: true },
+		cfBuildOutput: false
+	};
+	return {
+		types: { generate: option.types?.generate ?? true },
+		cfBuildOutput: option.cfBuildOutput ?? false
+	};
 }
 function filterEntryWorkerConfig(config) {
 	const { topLevelName: _topLevelName, name: _name,...filteredConfig } = config;
@@ -44250,20 +44391,30 @@ async function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 	const prefixedEnv = vite.loadEnv(viteEnv.mode, root, ["CLOUDFLARE_", "WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_"]);
 	Object.assign(process.env, prefixedEnv);
 	const remoteBindings = prefixedEnv.CLOUDFLARE_VITE_FORCE_LOCAL === "true" ? false : pluginConfig.remoteBindings ?? true;
-	if (viteEnv.isPreview) return {
-		...shared,
-		remoteBindings,
-		type: "preview",
-		workers: getWorkerConfigs(root, !!process.env.CLOUDFLARE_VITE_BUILD)
-	};
+	if (viteEnv.isPreview) {
+		const workers = resolvedNewConfig?.cfBuildOutput ? await readBuildOutputWorkers(root) : getWorkerConfigs(root, !!process.env.CLOUDFLARE_VITE_BUILD).map((config) => ({
+			source: "legacy",
+			config
+		}));
+		return {
+			...shared,
+			remoteBindings,
+			type: "preview",
+			workers
+		};
+	}
 	const configPaths = /* @__PURE__ */ new Set();
 	const cloudflareEnv = prefixedEnv.CLOUDFLARE_ENV;
 	const validateAndAddEnvironmentName = createEnvironmentNameValidator();
 	let configPath;
 	let rawConfigOverride;
+	let parsedNewConfig;
 	if (resolvedNewConfig) {
 		if (pluginConfig.configPath) throw new Error("`configPath` cannot be used together with `experimental.newConfig`. Configure the entry Worker via `cloudflare.config.ts` instead.");
 		if (pluginConfig.auxiliaryWorkers?.length) throw new Error("`auxiliaryWorkers` are not yet supported when `experimental.newConfig` is enabled.");
+		if (pluginConfig.experimental?.prerenderWorker) throw new Error("`experimental.prerenderWorker` is not yet supported when `experimental.newConfig` is enabled.");
+		if (typeof pluginConfig.config !== "undefined") throw new Error("`config` cannot be used together with `experimental.newConfig`. Configure the entry Worker via `cloudflare.config.ts` instead.");
+		if (resolvedNewConfig.cfBuildOutput && pluginConfig.viteEnvironment?.childEnvironments?.length) throw new Error("`viteEnvironment.childEnvironments` cannot be used together with `experimental.newConfig.cfBuildOutput`. Child environments are not yet supported in the Build Output API.");
 		const result = await loadNewConfig({
 			root,
 			mode: viteEnv.mode,
@@ -44271,6 +44422,7 @@ async function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 		});
 		configPath = result.configPath;
 		rawConfigOverride = result.rawConfig;
+		parsedNewConfig = result.parsedConfig;
 		configPaths.add(result.configPath);
 		for (const dep of result.dependencies) configPaths.add(dep);
 	} else configPath = getValidatedWranglerConfigPath(root, pluginConfig.configPath ?? prefixedEnv.CLOUDFLARE_VITE_WRANGLER_CONFIG_PATH);
@@ -44278,7 +44430,7 @@ async function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 		root,
 		configPath: resolvedNewConfig ? void 0 : configPath,
 		env: cloudflareEnv,
-		configCustomizer: pluginConfig.config,
+		configCustomizer: resolvedNewConfig ? void 0 : pluginConfig.config,
 		visitedConfigPaths: configPaths,
 		rawConfigOverride
 	});
@@ -44309,6 +44461,7 @@ async function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 		type: "assets-only",
 		cloudflareEnv,
 		config: entryWorkerResolvedConfig.config,
+		parsedNewConfig,
 		environmentNameToWorkerMap,
 		environmentNameToChildEnvironmentNamesMap,
 		prerenderWorkerEnvironmentName,
@@ -44320,7 +44473,7 @@ async function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 	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, pluginConfig.assetsOnly));
+	environmentNameToWorkerMap.set(entryWorkerEnvironmentName, resolveWorker(entryWorkerResolvedConfig.config, pluginConfig.assetsOnly, parsedNewConfig));
 	const entryWorkerChildEnvironments = pluginConfig.viteEnvironment?.childEnvironments;
 	if (entryWorkerChildEnvironments) {
 		for (const childName of entryWorkerChildEnvironments) validateAndAddEnvironmentName(childName);
@@ -44383,11 +44536,12 @@ function resolveDevOnly(devOnly) {
 	if (typeof devOnly === "function") return devOnly();
 	return devOnly ?? false;
 }
-function resolveWorker(workerConfig, devOnly) {
+function resolveWorker(workerConfig, devOnly, parsedNewConfig) {
 	return {
 		config: workerConfig,
 		nodeJsCompat: hasNodeJsCompat(workerConfig) ? new NodeJsCompat(workerConfig) : void 0,
-		devOnly
+		devOnly,
+		parsedNewConfig
 	};
 }
 const NEW_CONFIG_FILENAME = "cloudflare.config.ts";
@@ -44395,8 +44549,10 @@ const TYPES_OUTPUT_FILENAME = "worker-configuration.d.ts";
 const EXPERIMENTAL_CONFIG_PKG = "@cloudflare/vite-plugin/experimental-config";
 /**
 * Load and convert a `cloudflare.config.ts` file via `@cloudflare/config`. Returns
-* the resulting Wrangler `RawConfig`, the absolute path of the loaded file,
-* and the set of files imported while resolving the config (for watch-mode).
+* the resulting Wrangler `RawConfig`, the parsed new-config shape (for
+* downstream Build Output API emission), the absolute path of the loaded
+* file, and the set of files imported while resolving the config (for
+* watch-mode).
 *
 * If `generateTypes` is true, also writes `worker-configuration.d.ts` next to
 * the config when the generated content differs from what's already on disk.
@@ -44404,10 +44560,10 @@ const EXPERIMENTAL_CONFIG_PKG = "@cloudflare/vite-plugin/experimental-config";
 async function loadNewConfig(options) {
 	const configPath = nodePath.resolve(options.root, NEW_CONFIG_FILENAME);
 	if (!fs$1.existsSync(configPath)) throw new Error(`\`experimental.newConfig\` is enabled but no \`${NEW_CONFIG_FILENAME}\` was found at ${configPath}.`);
-	const { loadConfig, ConfigSchema, convertToWranglerConfig, generateTypes: generateTypesFn, resolveWorkerDefinition } = await import("./dist-MawCthRW.mjs");
+	const { loadConfig, InputWorkerSchema, convertToWranglerConfig, generateTypes: generateTypesFn, resolveWorkerDefinition } = await import("./dist-Cr__Sz5N.mjs");
 	const { config: rawExport, dependencies } = await loadConfig(configPath);
 	const resolved = await resolveWorkerDefinition(rawExport, { mode: options.mode });
-	const parsed = ConfigSchema.safeParse(resolved);
+	const parsed = InputWorkerSchema.safeParse(resolved);
 	if (!parsed.success) throw new Error(`Invalid \`${NEW_CONFIG_FILENAME}\`:\n${parsed.error.message}`);
 	const rawConfig = convertToWranglerConfig(parsed.data);
 	if (options.generateTypes) writeWorkerConfigurationDts({
@@ -44417,6 +44573,7 @@ async function loadNewConfig(options) {
 	});
 	return {
 		rawConfig,
+		parsedConfig: parsed.data,
 		configPath,
 		dependencies
 	};
@@ -45542,6 +45699,268 @@ function createModuleReference(type, id) {
 	return `__CLOUDFLARE_MODULE__${type}__${id}__CLOUDFLARE_MODULE__`;
 }
 
+//#endregion
+//#region src/cloudflare-environment.ts
+const MAIN_ENTRY_NAME = "index";
+const webSocketUndefinedError = "The WebSocket is undefined";
+function createHotChannel(webSocketContainer) {
+	const listenersMap = /* @__PURE__ */ new Map();
+	const client = { send(payload) {
+		const webSocket = webSocketContainer.webSocket;
+		assert(webSocket, webSocketUndefinedError);
+		webSocket.send(JSON.stringify(payload));
+	} };
+	function onMessage(event) {
+		const payload = JSON.parse(event.data.toString());
+		const listeners = listenersMap.get(payload.event) ?? /* @__PURE__ */ new Set();
+		for (const listener of listeners) listener(payload.data, client);
+	}
+	return {
+		send(payload) {
+			const webSocket = webSocketContainer.webSocket;
+			const message = JSON.stringify(payload);
+			if (!webSocket) {
+				webSocketContainer.messageBuffers ??= [];
+				webSocketContainer.messageBuffers.push(message);
+				return;
+			}
+			webSocket.send(message);
+		},
+		on(event, listener) {
+			const listeners = listenersMap.get(event) ?? /* @__PURE__ */ new Set();
+			listeners.add(listener);
+			listenersMap.set(event, listeners);
+		},
+		off(event, listener) {
+			listenersMap.get(event)?.delete(listener);
+		},
+		listen() {
+			const webSocket = webSocketContainer.webSocket;
+			assert(webSocket, webSocketUndefinedError);
+			webSocket.addEventListener("message", onMessage);
+		},
+		close() {
+			const webSocket = webSocketContainer.webSocket;
+			assert(webSocket, webSocketUndefinedError);
+			webSocket.removeEventListener("message", onMessage);
+		}
+	};
+}
+var CloudflareDevEnvironment = class extends vite.DevEnvironment {
+	#webSocketContainer;
+	constructor(name, config) {
+		const webSocketContainer = {};
+		super(name, config, {
+			hot: true,
+			transport: createHotChannel(webSocketContainer)
+		});
+		this.#webSocketContainer = webSocketContainer;
+	}
+	async initRunner(miniflare, workerConfig, options) {
+		const response = await miniflare.dispatchFetch(new URL(INIT_PATH, UNKNOWN_HOST), { headers: {
+			[CoreHeaders.ROUTE_OVERRIDE]: workerConfig.name,
+			[WORKER_ENTRY_PATH_HEADER]: encodeURIComponent(workerConfig.main),
+			[IS_ENTRY_WORKER_HEADER]: String(options.isEntryWorker),
+			[ENVIRONMENT_NAME_HEADER]: this.name,
+			[IS_PARENT_ENVIRONMENT_HEADER]: String(options.isParentEnvironment),
+			upgrade: "websocket"
+		} });
+		assert(response.ok, `Failed to initialize module runner, error: ${await response.text()}`);
+		const webSocket = response.webSocket;
+		assert(webSocket, "Failed to establish WebSocket");
+		webSocket.accept();
+		this.#webSocketContainer.webSocket = webSocket;
+		if (this.#webSocketContainer.messageBuffers) {
+			for (const bufferedMessage of this.#webSocketContainer.messageBuffers) webSocket.send(bufferedMessage);
+			delete this.#webSocketContainer.messageBuffers;
+		}
+	}
+	async fetchWorkerExportTypes(miniflare, workerConfig) {
+		await this.depsOptimizer?.init();
+		return await (await miniflare.dispatchFetch(new URL(GET_EXPORT_TYPES_PATH, UNKNOWN_HOST), { headers: { [CoreHeaders.ROUTE_OVERRIDE]: workerConfig.name } })).json();
+	}
+	async fetchModule(id, importer, options) {
+		if (additionalModuleRE.test(id)) return {
+			externalize: id,
+			type: "module"
+		};
+		return super.fetchModule(id, importer, options);
+	}
+};
+const cloudflareBuiltInModules = [
+	"cloudflare:email",
+	"cloudflare:node",
+	"cloudflare:sockets",
+	"cloudflare:workers",
+	"cloudflare:workflows"
+];
+const defaultConditions = [
+	"workerd",
+	"worker",
+	"module",
+	"browser"
+];
+const target = "es2024";
+const resolveExtensions = [
+	".mjs",
+	".js",
+	".mts",
+	".ts",
+	".jsx",
+	".tsx",
+	".json",
+	".cjs",
+	".cts",
+	".ctx"
+];
+function createCloudflareEnvironmentOptions({ workerConfig, userConfig, mode, environmentName, isEntryWorker, isParentEnvironment, hasNodeJsCompat: hasNodeJsCompat$1 }) {
+	const rollupOptions = isParentEnvironment ? {
+		input: { [MAIN_ENTRY_NAME]: VIRTUAL_WORKER_ENTRY },
+		preserveEntrySignatures: "strict"
+	} : {};
+	const define$1 = getProcessEnvReplacements(hasNodeJsCompat$1, mode);
+	return {
+		resolve: {
+			noExternal: true,
+			conditions: [...defaultConditions, "development|production"],
+			builtins: [...cloudflareBuiltInModules]
+		},
+		define: define$1,
+		dev: { createEnvironment(name, config) {
+			if (!config.plugins.some((plugin) => plugin.name === "vite-plugin-cloudflare:dev" && plugin.configureServer !== void 0)) return vite.createRunnableDevEnvironment(name, config);
+			return new CloudflareDevEnvironment(name, config);
+		} },
+		build: {
+			createEnvironment(name, config) {
+				return new vite.BuildEnvironment(name, config);
+			},
+			target,
+			emitAssets: true,
+			manifest: isEntryWorker,
+			outDir: getOutputDirectory(userConfig, environmentName),
+			copyPublicDir: false,
+			ssr: true,
+			...isRolldown ? { rolldownOptions: {
+				...rollupOptions,
+				platform: "neutral",
+				resolve: { extensions: resolveExtensions }
+			} } : { rollupOptions }
+		},
+		optimizeDeps: {
+			noDiscovery: false,
+			ignoreOutdatedRequests: true,
+			entries: vite.normalizePath(workerConfig.main),
+			exclude: [
+				...cloudflareBuiltInModules,
+				...nonPrefixedNodeModules,
+				...nonPrefixedNodeModules.map((module$1) => `node:${module$1}`),
+				...[
+					"node:sea",
+					"node:sqlite",
+					"node:test",
+					"node:test/reporters"
+				]
+			],
+			...isRolldown ? { rolldownOptions: {
+				platform: "neutral",
+				resolve: {
+					conditionNames: [...defaultConditions, "development"],
+					extensions: resolveExtensions
+				},
+				transform: {
+					target,
+					define: define$1
+				},
+				plugins: [vite.esmExternalRequirePlugin({
+					external: [nodeBuiltinsRE],
+					skipDuplicateCheck: true
+				})]
+			} } : { esbuildOptions: {
+				platform: "neutral",
+				conditions: [...defaultConditions, "development"],
+				resolveExtensions,
+				target,
+				define: define$1
+			} }
+		},
+		keepProcessEnv: true
+	};
+}
+/**
+* Gets `process.env` replacement values.
+* `process.env.NODE_ENV` is always replaced.
+* `process.env` is replaced with an empty object if `nodejs_compat` is not enabled
+* @param hasNodeJsCompat - whether `nodejs_compat` is enabled
+* @param mode - the Vite mode
+* @returns replacement values
+*/
+function getProcessEnvReplacements(hasNodeJsCompat$1, mode) {
+	const nodeEnv = process.env.NODE_ENV || mode;
+	const nodeEnvReplacements = {
+		"process.env.NODE_ENV": JSON.stringify(nodeEnv),
+		"global.process.env.NODE_ENV": JSON.stringify(nodeEnv),
+		"globalThis.process.env.NODE_ENV": JSON.stringify(nodeEnv)
+	};
+	return hasNodeJsCompat$1 ? nodeEnvReplacements : {
+		...nodeEnvReplacements,
+		"process.env": "{}",
+		"global.process.env": "{}",
+		"globalThis.process.env": "{}"
+	};
+}
+function initRunners(resolvedPluginConfig, viteDevServer, miniflare) {
+	const initPromises = [...resolvedPluginConfig.environmentNameToWorkerMap].flatMap(([environmentName, worker]) => {
+		debuglog("Initializing worker:", worker.config.name);
+		const isEntryWorker = environmentName === resolvedPluginConfig.entryWorkerEnvironmentName;
+		const childEnvironmentNames = resolvedPluginConfig.environmentNameToChildEnvironmentNamesMap.get(environmentName) ?? [];
+		return [viteDevServer.environments[environmentName].initRunner(miniflare, worker.config, {
+			isEntryWorker,
+			isParentEnvironment: true
+		}), ...childEnvironmentNames.map((childEnvironmentName) => {
+			debuglog("Initializing child environment:", childEnvironmentName);
+			return viteDevServer.environments[childEnvironmentName].initRunner(miniflare, worker.config, {
+				isEntryWorker: false,
+				isParentEnvironment: false
+			});
+		})];
+	});
+	return Promise.all(initPromises);
+}
+
+//#endregion
+//#region src/plugins/build-output.ts
+/**
+* Build Output API plugin. Replaces `outputConfigPlugin` when
+* `experimental.newConfig.cfBuildOutput` is set.
+*/
+const buildOutputPlugin = createPlugin("build-output", (ctx) => {
+	return { writeBundle(_options, bundle) {
+		if (ctx.isChildEnvironment(this.environment.name)) return;
+		if (ctx.resolvedPluginConfig.type === "assets-only" && this.environment.name === "client") {
+			const workerNewConfig$1 = ctx.resolvedPluginConfig.parsedNewConfig;
+			assert(workerNewConfig$1, "Expected parsedNewConfig on assets-only resolved config");
+			writeOutputWorkerConfig(ctx.resolvedViteConfig.root, workerNewConfig$1);
+			return;
+		}
+		const workerNewConfig = ctx.getWorkerNewConfig(this.environment.name);
+		if (!workerNewConfig) return;
+		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 importedAssetPaths = /* @__PURE__ */ new Set();
+		for (const entry of Object.values(bundle)) for (const asset of entry.viteMetadata?.importedAssets ?? []) importedAssetPaths.add(asset);
+		const modules = {};
+		for (const fileName of Object.keys(bundle)) {
+			if (fileName === ".vite/manifest.json") continue;
+			if (importedAssetPaths.has(fileName)) continue;
+			modules[fileName] = { type: detectModuleType(fileName) };
+		}
+		writeOutputWorkerConfig(ctx.resolvedViteConfig.root, workerNewConfig, {
+			mainModule: entryChunk.fileName,
+			modules
+		});
+	} };
+});
+
 //#endregion
 //#region ../workers-shared/utils/configuration/constructConfiguration.ts
 function constructRedirects({ redirects, redirectsFile, logger }) {
@@ -45613,9 +46032,9 @@ function constructHeaders({ headers, headersFile, logger }) {
 
 //#endregion
 //#region ../workers-shared/utils/configuration/validateURL.ts
-const extractPathname = (path = "/", includeSearch, includeHash) => {
-	if (!path.startsWith("/")) path = `/${path}`;
-	const url = new URL(`//${path}`, "relative://");
+const extractPathname = (path$1 = "/", includeSearch, includeHash) => {
+	if (!path$1.startsWith("/")) path$1 = `/${path$1}`;
+	const url = new URL(`//${path$1}`, "relative://");
 	return `${url.pathname}${includeSearch ? url.search : ""}${includeHash ? url.hash : ""}`;
 };
 const URL_REGEX = /^https:\/\/+(?<host>[^/]+)\/?(?<path>.*)/;
@@ -45674,7 +46093,7 @@ function parseHeaders(input, { maxRules = MAX_HEADER_RULES, maxLineLength = MAX_
 				lineNumber: i$1 + 1,
 				message: "No headers specified"
 			});
-			const [path, pathError] = validateUrl(line, false, true);
+			const [path$1, pathError] = validateUrl(line, false, true);
 			if (pathError) {
 				invalid.push({
 					line,
@@ -45685,7 +46104,7 @@ function parseHeaders(input, { maxRules = MAX_HEADER_RULES, maxLineLength = MAX_
 				skipUntilNextPath = true;
 				continue;
 			}
-			const wildcardError = validateNoMultipleWildcards(path);
+			const wildcardError = validateNoMultipleWildcards(path$1);
 			if (wildcardError) {
 				invalid.push({
 					line,
@@ -45697,7 +46116,7 @@ function parseHeaders(input, { maxRules = MAX_HEADER_RULES, maxLineLength = MAX_
 				continue;
 			}
 			rule = {
-				path,
+				path: path$1,
 				line,
 				headers: {},
 				unsetHeaders: []
@@ -45780,11 +46199,11 @@ function isValidRule(rule) {
 * `:splat` placeholder, would result in duplicate `:splat` parameters which is
 * unsupported.
 */
-function validateNoMultipleWildcards(path) {
-	const wildcardCount = (path.match(SPLAT_REGEX) ?? []).length;
-	const hasSplatPlaceholder = /:splat(?!\w)/.test(path);
-	if (wildcardCount > 1) return `Only one wildcard is allowed per rule. Use a named placeholder (e.g. :project) instead. Skipping ${path}.`;
-	if (wildcardCount > 0 && hasSplatPlaceholder) return `Cannot combine a wildcard * with a :splat placeholder because wildcards are converted to :splat at runtime. Skipping ${path}.`;
+function validateNoMultipleWildcards(path$1) {
+	const wildcardCount = (path$1.match(SPLAT_REGEX) ?? []).length;
+	const hasSplatPlaceholder = /:splat(?!\w)/.test(path$1);
+	if (wildcardCount > 1) return `Only one wildcard is allowed per rule. Use a named placeholder (e.g. :project) instead. Skipping ${path$1}.`;
+	if (wildcardCount > 0 && hasSplatPlaceholder) return `Cannot combine a wildcard * with a :splat placeholder because wildcards are converted to :splat at runtime. Skipping ${path$1}.`;
 }
 
 //#endregion
@@ -46001,13 +46420,13 @@ var require_ignore = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/ig
 	const throwError = (message, Ctor) => {
 		throw new Ctor(message);
 	};
-	const checkPath = (path, originalPath, doThrow) => {
-		if (!isString$1(path)) return doThrow(`path must be a string, but got \`${originalPath}\``, TypeError);
-		if (!path) return doThrow(`path must not be empty`, TypeError);
-		if (checkPath.isNotRelative(path)) return doThrow(`path should be a \`path.relative()\`d string, but got "${originalPath}"`, RangeError);
+	const checkPath = (path$1, originalPath, doThrow) => {
+		if (!isString$1(path$1)) return doThrow(`path must be a string, but got \`${originalPath}\``, TypeError);
+		if (!path$1) return doThrow(`path must not be empty`, TypeError);
+		if (checkPath.isNotRelative(path$1)) return doThrow(`path should be a \`path.relative()\`d string, but got "${originalPath}"`, RangeError);
 		return true;
 	};
-	const isNotRelative = (path) => REGEX_TEST_INVALID_PATH.test(path);
+	const isNotRelative = (path$1) => REGEX_TEST_INVALID_PATH.test(path$1);
 	checkPath.isNotRelative = isNotRelative;
 	checkPath.convert = (p$1) => p$1;
 	var Ignore = class {
@@ -46043,13 +46462,13 @@ var require_ignore = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/ig
 		addPattern(pattern) {
 			return this.add(pattern);
 		}
-		_testOne(path, checkUnignored) {
+		_testOne(path$1, checkUnignored) {
 			let ignored = false;
 			let unignored = false;
 			this._rules.forEach((rule) => {
 				const { negative } = rule;
 				if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) return;
-				if (rule.regex.test(path)) {
+				if (rule.regex.test(path$1)) {
 					ignored = !negative;
 					unignored = negative;
 				}
@@ -46060,33 +46479,33 @@ var require_ignore = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/ig
 			};
 		}
 		_test(originalPath, cache$2, checkUnignored, slices) {
-			const path = originalPath && checkPath.convert(originalPath);
-			checkPath(path, originalPath, this._allowRelativePaths ? RETURN_FALSE : throwError);
-			return this._t(path, cache$2, checkUnignored, slices);
+			const path$1 = originalPath && checkPath.convert(originalPath);
+			checkPath(path$1, originalPath, this._allowRelativePaths ? RETURN_FALSE : throwError);
+			return this._t(path$1, cache$2, checkUnignored, slices);
 		}
-		_t(path, cache$2, checkUnignored, slices) {
-			if (path in cache$2) return cache$2[path];
-			if (!slices) slices = path.split(SLASH);
+		_t(path$1, cache$2, checkUnignored, slices) {
+			if (path$1 in cache$2) return cache$2[path$1];
+			if (!slices) slices = path$1.split(SLASH);
 			slices.pop();
-			if (!slices.length) return cache$2[path] = this._testOne(path, checkUnignored);
+			if (!slices.length) return cache$2[path$1] = this._testOne(path$1, checkUnignored);
 			const parent = this._t(slices.join(SLASH) + SLASH, cache$2, checkUnignored, slices);
-			return cache$2[path] = parent.ignored ? parent : this._testOne(path, checkUnignored);
+			return cache$2[path$1] = parent.ignored ? parent : this._testOne(path$1, checkUnignored);
 		}
-		ignores(path) {
-			return this._test(path, this._ignoreCache, false).ignored;
+		ignores(path$1) {
+			return this._test(path$1, this._ignoreCache, false).ignored;
 		}
 		createFilter() {
-			return (path) => !this.ignores(path);
+			return (path$1) => !this.ignores(path$1);
 		}
 		filter(paths) {
 			return makeArray(paths).filter(this.createFilter());
 		}
-		test(path) {
-			return this._test(path, this._testCache, true);
+		test(path$1) {
+			return this._test(path$1, this._testCache, true);
 		}
 	};
 	const factory = (options) => new Ignore(options);
-	const isPathValid = (path) => checkPath(path && checkPath.convert(path), path, RETURN_FALSE);
+	const isPathValid = (path$1) => checkPath(path$1 && checkPath.convert(path$1), path$1, RETURN_FALSE);
 	factory.isPathValid = isPathValid;
 	factory.default = factory;
 	module.exports = factory;
@@ -46095,7 +46514,7 @@ var require_ignore = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/ig
 		const makePosix = (str) => /^\\\\\?\\/.test(str) || /["<>|\u0000-\u001F]+/u.test(str) ? str : str.replace(/\\/g, "/");
 		checkPath.convert = makePosix;
 		const REGIX_IS_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i;
-		checkPath.isNotRelative = (path) => REGIX_IS_WINDOWS_PATH_ABSOLUTE.test(path) || isNotRelative(path);
+		checkPath.isNotRelative = (path$1) => REGIX_IS_WINDOWS_PATH_ABSOLUTE.test(path$1) || isNotRelative(path$1);
 	}
 }) });
 
@@ -47450,11 +47869,11 @@ var Mime = class {
 		}
 		return this;
 	}
-	getType(path) {
-		if (typeof path !== "string") return null;
-		const last = path.replace(/^.*[/\\]/s, "").toLowerCase();
+	getType(path$1) {
+		if (typeof path$1 !== "string") return null;
+		const last = path$1.replace(/^.*[/\\]/s, "").toLowerCase();
 		const ext = last.replace(/^.*\./s, "").toLowerCase();
-		const hasPath = last.length < path.length;
+		const hasPath = last.length < path$1.length;
 		if (!(ext.length < last.length - 1) && hasPath) return null;
 		return __classPrivateFieldGet(this, _Mime_extensionToType, "f").get(ext) ?? null;
 	}
@@ -47788,8 +48207,8 @@ function getErrorMap() {
 //#endregion
 //#region ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 const makeIssue = (params) => {
-	const { data: data$1, path, errorMaps, issueData } = params;
-	const fullPath = [...path, ...issueData.path || []];
+	const { data: data$1, path: path$1, errorMaps, issueData } = params;
+	const fullPath = [...path$1, ...issueData.path || []];
 	const fullIssue = {
 		...issueData,
 		path: fullPath
@@ -47901,11 +48320,11 @@ var errorUtil;
 //#endregion
 //#region ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-	constructor(parent, value, path, key) {
+	constructor(parent, value, path$1, key) {
 		this._cachedPath = [];
 		this.parent = parent;
 		this.data = value;
-		this._path = path;
+		this._path = path$1;
 		this._key = key;
 	}
 	get path() {
@@ -51211,7 +51630,8 @@ function createBuildApp(resolvedPluginConfig) {
 		if (hasClientEntry) await builder.build(clientEnvironment);
 		else if (importedAssetPaths.size || getHasPublicAssets(builder.config) || resolvedPluginConfig.prerenderWorkerEnvironmentName) await fallbackBuild(builder, clientEnvironment);
 		else {
-			if (!satisfiesMinimumViteVersion("7.0.0")) removeAssetsField(entryWorkerBuildDirectory);
+			const cfBuildOutput = resolvedPluginConfig.experimental.newConfig?.cfBuildOutput === true;
+			if (!satisfiesMinimumViteVersion("7.0.0") && !cfBuildOutput) removeAssetsField(entryWorkerBuildDirectory);
 			return;
 		}
 		const clientBuildDirectory = nodePath.resolve(builder.config.root, clientEnvironment.config.build.outDir);
@@ -51266,234 +51686,6 @@ function removeAssetsField(entryWorkerBuildDirectory) {
 	fs$1.writeFileSync(entryWorkerConfigPath, JSON.stringify(workerConfig));
 }
 
-//#endregion
-//#region src/cloudflare-environment.ts
-const MAIN_ENTRY_NAME = "index";
-const webSocketUndefinedError = "The WebSocket is undefined";
-function createHotChannel(webSocketContainer) {
-	const listenersMap = /* @__PURE__ */ new Map();
-	const client = { send(payload) {
-		const webSocket = webSocketContainer.webSocket;
-		assert(webSocket, webSocketUndefinedError);
-		webSocket.send(JSON.stringify(payload));
-	} };
-	function onMessage(event) {
-		const payload = JSON.parse(event.data.toString());
-		const listeners = listenersMap.get(payload.event) ?? /* @__PURE__ */ new Set();
-		for (const listener of listeners) listener(payload.data, client);
-	}
-	return {
-		send(payload) {
-			const webSocket = webSocketContainer.webSocket;
-			const message = JSON.stringify(payload);
-			if (!webSocket) {
-				webSocketContainer.messageBuffers ??= [];
-				webSocketContainer.messageBuffers.push(message);
-				return;
-			}
-			webSocket.send(message);
-		},
-		on(event, listener) {
-			const listeners = listenersMap.get(event) ?? /* @__PURE__ */ new Set();
-			listeners.add(listener);
-			listenersMap.set(event, listeners);
-		},
-		off(event, listener) {
-			listenersMap.get(event)?.delete(listener);
-		},
-		listen() {
-			const webSocket = webSocketContainer.webSocket;
-			assert(webSocket, webSocketUndefinedError);
-			webSocket.addEventListener("message", onMessage);
-		},
-		close() {
-			const webSocket = webSocketContainer.webSocket;
-			assert(webSocket, webSocketUndefinedError);
-			webSocket.removeEventListener("message", onMessage);
-		}
-	};
-}
-var CloudflareDevEnvironment = class extends vite.DevEnvironment {
-	#webSocketContainer;
-	constructor(name, config) {
-		const webSocketContainer = {};
-		super(name, config, {
-			hot: true,
-			transport: createHotChannel(webSocketContainer)
-		});
-		this.#webSocketContainer = webSocketContainer;
-	}
-	async initRunner(miniflare, workerConfig, options) {
-		const response = await miniflare.dispatchFetch(new URL(INIT_PATH, UNKNOWN_HOST), { headers: {
-			[CoreHeaders.ROUTE_OVERRIDE]: workerConfig.name,
-			[WORKER_ENTRY_PATH_HEADER]: encodeURIComponent(workerConfig.main),
-			[IS_ENTRY_WORKER_HEADER]: String(options.isEntryWorker),
-			[ENVIRONMENT_NAME_HEADER]: this.name,
-			[IS_PARENT_ENVIRONMENT_HEADER]: String(options.isParentEnvironment),
-			upgrade: "websocket"
-		} });
-		assert(response.ok, `Failed to initialize module runner, error: ${await response.text()}`);
-		const webSocket = response.webSocket;
-		assert(webSocket, "Failed to establish WebSocket");
-		webSocket.accept();
-		this.#webSocketContainer.webSocket = webSocket;
-		if (this.#webSocketContainer.messageBuffers) {
-			for (const bufferedMessage of this.#webSocketContainer.messageBuffers) webSocket.send(bufferedMessage);
-			delete this.#webSocketContainer.messageBuffers;
-		}
-	}
-	async fetchWorkerExportTypes(miniflare, workerConfig) {
-		await this.depsOptimizer?.init();
-		return await (await miniflare.dispatchFetch(new URL(GET_EXPORT_TYPES_PATH, UNKNOWN_HOST), { headers: { [CoreHeaders.ROUTE_OVERRIDE]: workerConfig.name } })).json();
-	}
-	async fetchModule(id, importer, options) {
-		if (additionalModuleRE.test(id)) return {
-			externalize: id,
-			type: "module"
-		};
-		return super.fetchModule(id, importer, options);
-	}
-};
-const cloudflareBuiltInModules = [
-	"cloudflare:email",
-	"cloudflare:node",
-	"cloudflare:sockets",
-	"cloudflare:workers",
-	"cloudflare:workflows"
-];
-const defaultConditions = [
-	"workerd",
-	"worker",
-	"module",
-	"browser"
-];
-const target = "es2024";
-const resolveExtensions = [
-	".mjs",
-	".js",
-	".mts",
-	".ts",
-	".jsx",
-	".tsx",
-	".json",
-	".cjs",
-	".cts",
-	".ctx"
-];
-function createCloudflareEnvironmentOptions({ workerConfig, userConfig, mode, environmentName, isEntryWorker, isParentEnvironment, hasNodeJsCompat: hasNodeJsCompat$1 }) {
-	const rollupOptions = isParentEnvironment ? {
-		input: { [MAIN_ENTRY_NAME]: VIRTUAL_WORKER_ENTRY },
-		preserveEntrySignatures: "strict"
-	} : {};
-	const define$1 = getProcessEnvReplacements(hasNodeJsCompat$1, mode);
-	return {
-		resolve: {
-			noExternal: true,
-			conditions: [...defaultConditions, "development|production"],
-			builtins: [...cloudflareBuiltInModules]
-		},
-		define: define$1,
-		dev: { createEnvironment(name, config) {
-			if (!config.plugins.some((plugin) => plugin.name === "vite-plugin-cloudflare:dev" && plugin.configureServer !== void 0)) return vite.createRunnableDevEnvironment(name, config);
-			return new CloudflareDevEnvironment(name, config);
-		} },
-		build: {
-			createEnvironment(name, config) {
-				return new vite.BuildEnvironment(name, config);
-			},
-			target,
-			emitAssets: true,
-			manifest: isEntryWorker,
-			outDir: getOutputDirectory(userConfig, environmentName),
-			copyPublicDir: false,
-			ssr: true,
-			...isRolldown ? { rolldownOptions: {
-				...rollupOptions,
-				platform: "neutral",
-				resolve: { extensions: resolveExtensions }
-			} } : { rollupOptions }
-		},
-		optimizeDeps: {
-			noDiscovery: false,
-			ignoreOutdatedRequests: true,
-			entries: vite.normalizePath(workerConfig.main),
-			exclude: [
-				...cloudflareBuiltInModules,
-				...nonPrefixedNodeModules,
-				...nonPrefixedNodeModules.map((module$1) => `node:${module$1}`),
-				...[
-					"node:sea",
-					"node:sqlite",
-					"node:test",
-					"node:test/reporters"
-				]
-			],
-			...isRolldown ? { rolldownOptions: {
-				platform: "neutral",
-				resolve: {
-					conditionNames: [...defaultConditions, "development"],
-					extensions: resolveExtensions
-				},
-				transform: {
-					target,
-					define: define$1
-				},
-				plugins: [vite.esmExternalRequirePlugin({
-					external: [nodeBuiltinsRE],
-					skipDuplicateCheck: true
-				})]
-			} } : { esbuildOptions: {
-				platform: "neutral",
-				conditions: [...defaultConditions, "development"],
-				resolveExtensions,
-				target,
-				define: define$1
-			} }
-		},
-		keepProcessEnv: true
-	};
-}
-/**
-* Gets `process.env` replacement values.
-* `process.env.NODE_ENV` is always replaced.
-* `process.env` is replaced with an empty object if `nodejs_compat` is not enabled
-* @param hasNodeJsCompat - whether `nodejs_compat` is enabled
-* @param mode - the Vite mode
-* @returns replacement values
-*/
-function getProcessEnvReplacements(hasNodeJsCompat$1, mode) {
-	const nodeEnv = process.env.NODE_ENV || mode;
-	const nodeEnvReplacements = {
-		"process.env.NODE_ENV": JSON.stringify(nodeEnv),
-		"global.process.env.NODE_ENV": JSON.stringify(nodeEnv),
-		"globalThis.process.env.NODE_ENV": JSON.stringify(nodeEnv)
-	};
-	return hasNodeJsCompat$1 ? nodeEnvReplacements : {
-		...nodeEnvReplacements,
-		"process.env": "{}",
-		"global.process.env": "{}",
-		"globalThis.process.env": "{}"
-	};
-}
-function initRunners(resolvedPluginConfig, viteDevServer, miniflare) {
-	const initPromises = [...resolvedPluginConfig.environmentNameToWorkerMap].flatMap(([environmentName, worker]) => {
-		debuglog("Initializing worker:", worker.config.name);
-		const isEntryWorker = environmentName === resolvedPluginConfig.entryWorkerEnvironmentName;
-		const childEnvironmentNames = resolvedPluginConfig.environmentNameToChildEnvironmentNamesMap.get(environmentName) ?? [];
-		return [viteDevServer.environments[environmentName].initRunner(miniflare, worker.config, {
-			isEntryWorker,
-			isParentEnvironment: true
-		}), ...childEnvironmentNames.map((childEnvironmentName) => {
-			debuglog("Initializing child environment:", childEnvironmentName);
-			return viteDevServer.environments[childEnvironmentName].initRunner(miniflare, worker.config, {
-				isEntryWorker: false,
-				isParentEnvironment: false
-			});
-		})];
-	});
-	return Promise.all(initPromises);
-}
-
 //#endregion
 //#region src/dev-vars.ts
 /**
@@ -51597,7 +51789,12 @@ const configPlugin = createPlugin("config", (ctx) => {
 		},
 		configResolved(resolvedViteConfig) {
 			ctx.setResolvedViteConfig(resolvedViteConfig);
-			if (ctx.resolvedPluginConfig.type !== "preview") validateWorkerEnvironmentOptions(ctx.resolvedPluginConfig, ctx.resolvedViteConfig);
+			if (ctx.resolvedPluginConfig.type === "preview") return;
+			validateWorkerEnvironmentOptions(ctx.resolvedPluginConfig, ctx.resolvedViteConfig);
+			if (ctx.resolvedPluginConfig.experimental.newConfig?.cfBuildOutput) {
+				forceBuildOutputDirs(ctx.resolvedPluginConfig, ctx.resolvedViteConfig);
+				if (ctx.resolvedViteConfig.command === "build") cleanBuildOutputDir(ctx.resolvedViteConfig.root);
+			}
 		},
 		buildStart() {
 			ctx.setHasShownWorkerConfigWarnings(false);
@@ -51627,26 +51824,33 @@ const configPlugin = createPlugin("config", (ctx) => {
 				const { entryWorkerEnvironmentName } = ctx.resolvedPluginConfig;
 				const entryWorkerEnvironment = builder.environments[entryWorkerEnvironmentName];
 				assert(entryWorkerEnvironment, `No "${entryWorkerEnvironmentName}" environment`);
+				const cfBuildOutput = ctx.resolvedPluginConfig.experimental.newConfig?.cfBuildOutput === true;
 				if (entryWorkerEnvironment.isBuilt) {
-					if (!builder.environments.client?.isBuilt) removeAssetsField(nodePath.resolve(builder.config.root, entryWorkerEnvironment.config.build.outDir));
+					if (!builder.environments.client?.isBuilt && !cfBuildOutput) removeAssetsField(nodePath.resolve(builder.config.root, entryWorkerEnvironment.config.build.outDir));
 				} else {
 					const clientEnvironment = builder.environments.client;
 					assert(clientEnvironment, "No \"client\" environment");
 					if (!clientEnvironment.isBuilt) throw new Error("If `assetsOnly` is set to `true`, the client environment must be built");
-					const entryWorkerConfig = ctx.getWorkerConfig(entryWorkerEnvironmentName);
-					assert(entryWorkerConfig, `No config found for "${entryWorkerEnvironmentName}" environment`);
-					const outputConfig = {
-						...entryWorkerConfig,
-						main: void 0,
-						assets: {
-							...entryWorkerConfig.assets,
-							directory: ".",
-							binding: void 0
-						}
-					};
-					if (outputConfig.unsafe && Object.keys(outputConfig.unsafe).length === 0) outputConfig.unsafe = void 0;
-					fs$1.writeFileSync(nodePath.resolve(builder.config.root, clientEnvironment.config.build.outDir, "wrangler.json"), JSON.stringify(outputConfig));
-					writeDeployConfig(ctx.resolvedPluginConfig, ctx.resolvedViteConfig, true);
+					if (cfBuildOutput) {
+						const entryWorkerNewConfig = ctx.getWorkerNewConfig(entryWorkerEnvironmentName);
+						assert(entryWorkerNewConfig, `No config found for "${entryWorkerEnvironmentName}" environment`);
+						writeOutputWorkerConfig(builder.config.root, entryWorkerNewConfig);
+					} else {
+						const entryWorkerConfig = ctx.getWorkerConfig(entryWorkerEnvironmentName);
+						assert(entryWorkerConfig, `No config found for "${entryWorkerEnvironmentName}" environment`);
+						const outputConfig = {
+							...entryWorkerConfig,
+							main: void 0,
+							assets: {
+								...entryWorkerConfig.assets,
+								directory: ".",
+								binding: void 0
+							}
+						};
+						if (outputConfig.unsafe && Object.keys(outputConfig.unsafe).length === 0) outputConfig.unsafe = void 0;
+						fs$1.writeFileSync(nodePath.resolve(builder.config.root, clientEnvironment.config.build.outDir, "wrangler.json"), JSON.stringify(outputConfig));
+						writeDeployConfig(ctx.resolvedPluginConfig, ctx.resolvedViteConfig, true);
+					}
 				}
 			}
 		}
@@ -51686,6 +51890,37 @@ function getEnvironmentsConfig(ctx, userConfig, mode) {
 		}
 	};
 }
+/**
+* When the Build Output API is enabled,
+* force every Worker environment's and the client environment's `build.outDir`
+* to the spec-mandated location.
+*
+* Runs after Vite's merge in `configResolved`, so it overrides any
+* user-supplied `build.outDir`
+*/
+function forceBuildOutputDirs(resolvedPluginConfig, resolvedViteConfig) {
+	if (!resolvedPluginConfig.experimental.newConfig?.cfBuildOutput) return;
+	const { root } = resolvedViteConfig;
+	let clientWorkerName;
+	if (resolvedPluginConfig.type === "workers") {
+		for (const [environmentName, worker] of resolvedPluginConfig.environmentNameToWorkerMap) {
+			const environment = resolvedViteConfig.environments[environmentName];
+			if (!environment) continue;
+			assert(worker.parsedNewConfig, "Expected parsedNewConfig to be defined");
+			environment.build.outDir = getWorkerBundleDir(root, worker.parsedNewConfig.name);
+		}
+		const entryName = resolvedPluginConfig.entryWorkerEnvironmentName;
+		const entryWorker = resolvedPluginConfig.environmentNameToWorkerMap.get(entryName);
+		assert(entryWorker, `Expected entry worker for environment "${entryName}"`);
+		assert(entryWorker.parsedNewConfig, "Expected parsedNewConfig to be defined");
+		clientWorkerName = entryWorker.parsedNewConfig.name;
+	} else {
+		assert(resolvedPluginConfig.parsedNewConfig, "Expected parsedNewConfig to be defined");
+		clientWorkerName = resolvedPluginConfig.parsedNewConfig.name;
+	}
+	const clientEnvironment = resolvedViteConfig.environments.client;
+	if (clientEnvironment) clientEnvironment.build.outDir = getWorkerAssetsDir(root, clientWorkerName);
+}
 function getAllowedHosts(tunnelHostnames, userAllowedHosts) {
 	if (tunnelHostnames.length === 0 || userAllowedHosts === true) return userAllowedHosts;
 	return Array.from(new Set([...userAllowedHosts ?? [], ...tunnelHostnames]));
@@ -51786,8 +52021,8 @@ const debugPlugin = createPlugin("debug", (ctx) => {
 			if (!!process.env.VSCODE_INSPECTOR_OPTIONS) return;
 			if (ctx.resolvedPluginConfig.workers.length >= 1 && ctx.resolvedPluginConfig.inspectorPort !== false) addDebugToVitePrintUrls(vitePreviewServer);
 			const workerNames = ctx.resolvedPluginConfig.workers.map((worker) => {
-				assert(worker.name, "Expected the Worker to have a name");
-				return worker.name;
+				assert(worker.config.name, "Expected the Worker to have a name");
+				return worker.config.name;
 			});
 			vitePreviewServer.middlewares.use(DEBUG_PATH, async (_, res, next) => {
 				const resolvedInspectorPort = await ctx.getResolvedInspectorPort();
@@ -51959,11 +52194,11 @@ const getQueryString = (params) => {
 };
 const getUrl = (config, options) => {
 	const encoder$1 = config.ENCODE_PATH || encodeURI;
-	const path = options.url.replace("{api-version}", config.VERSION).replace(/{(.*?)}/g, (substring, group) => {
+	const path$1 = options.url.replace("{api-version}", config.VERSION).replace(/{(.*?)}/g, (substring, group) => {
 		if (options.path?.hasOwnProperty(group)) return encoder$1(String(options.path[group]));
 		return substring;
 	});
-	const url = `${config.BASE}${path}`;
+	const url = `${config.BASE}${path$1}`;
 	if (options.query) return `${url}${getQueryString(options.query)}`;
 	return url;
 };
@@ -53015,7 +53250,7 @@ function getContainerOptions(options) {
 	return containersConfig.map((container) => {
 		if (isDockerfile(container.image, configPath)) return {
 			dockerfile: container.image,
-			image_build_context: container.image_build_context ?? path3.dirname(container.image),
+			image_build_context: container.image_build_context ?? path.dirname(container.image),
 			image_vars: container.image_vars,
 			class_name: container.class_name,
 			image_tag: getDevContainerImageName(container.class_name, containerBuildId)
@@ -53031,26 +53266,26 @@ function getContainerOptions(options) {
 //#endregion
 //#region ../../node_modules/.pnpm/fdir@6.5.0_picomatch@4.0.4/node_modules/fdir/dist/index.mjs
 var __require = /* @__PURE__ */ createRequire$1(import.meta.url);
-function cleanPath(path) {
-	let normalized = normalize(path);
+function cleanPath(path$1) {
+	let normalized = normalize(path$1);
 	if (normalized.length > 1 && normalized[normalized.length - 1] === sep) normalized = normalized.substring(0, normalized.length - 1);
 	return normalized;
 }
 const SLASHES_REGEX = /[\\/]/g;
-function convertSlashes(path, separator) {
-	return path.replace(SLASHES_REGEX, separator);
+function convertSlashes(path$1, separator) {
+	return path$1.replace(SLASHES_REGEX, separator);
 }
 const WINDOWS_ROOT_DIR_REGEX = /^[a-z]:[\\/]$/i;
-function isRootDirectory(path) {
-	return path === "/" || WINDOWS_ROOT_DIR_REGEX.test(path);
+function isRootDirectory(path$1) {
+	return path$1 === "/" || WINDOWS_ROOT_DIR_REGEX.test(path$1);
 }
-function normalizePath$1(path, options) {
+function normalizePath$1(path$1, options) {
 	const { resolvePaths, normalizePath: normalizePath$1$1, pathSeparator } = options;
-	const pathNeedsCleaning = process.platform === "win32" && path.includes("/") || path.startsWith(".");
-	if (resolvePaths) path = resolve$1(path);
-	if (normalizePath$1$1 || pathNeedsCleaning) path = cleanPath(path);
-	if (path === ".") return "";
-	return convertSlashes(path[path.length - 1] !== pathSeparator ? path + pathSeparator : path, pathSeparator);
+	const pathNeedsCleaning = process.platform === "win32" && path$1.includes("/") || path$1.startsWith(".");
+	if (resolvePaths) path$1 = resolve$1(path$1);
+	if (normalizePath$1$1 || pathNeedsCleaning) path$1 = cleanPath(path$1);
+	if (path$1 === ".") return "";
+	return convertSlashes(path$1[path$1.length - 1] !== pathSeparator ? path$1 + pathSeparator : path$1, pathSeparator);
 }
 function joinPathWithBasePath(filename, directoryPath) {
 	return directoryPath + filename;
@@ -53086,8 +53321,8 @@ const pushDirectory = (directoryPath, paths) => {
 	paths.push(directoryPath || ".");
 };
 const pushDirectoryFilter = (directoryPath, paths, filters) => {
-	const path = directoryPath || ".";
-	if (filters.every((filter) => filter(path, true))) paths.push(path);
+	const path$1 = directoryPath || ".";
+	if (filters.every((filter) => filter(path$1, true))) paths.push(path$1);
 };
 const empty$2 = () => {};
 function build$6(root, options) {
@@ -53136,26 +53371,26 @@ const empty = () => {};
 function build$3(options) {
 	return options.group ? groupFiles : empty;
 }
-const resolveSymlinksAsync = function(path, state, callback$1) {
+const resolveSymlinksAsync = function(path$1, state, callback$1) {
 	const { queue, fs: fs$2, options: { suppressErrors } } = state;
 	queue.enqueue();
-	fs$2.realpath(path, (error, resolvedPath) => {
+	fs$2.realpath(path$1, (error, resolvedPath) => {
 		if (error) return queue.dequeue(suppressErrors ? null : error, state);
 		fs$2.stat(resolvedPath, (error$1, stat$1) => {
 			if (error$1) return queue.dequeue(suppressErrors ? null : error$1, state);
-			if (stat$1.isDirectory() && isRecursive(path, resolvedPath, state)) return queue.dequeue(null, state);
+			if (stat$1.isDirectory() && isRecursive(path$1, resolvedPath, state)) return queue.dequeue(null, state);
 			callback$1(stat$1, resolvedPath);
 			queue.dequeue(null, state);
 		});
 	});
 };
-const resolveSymlinks = function(path, state, callback$1) {
+const resolveSymlinks = function(path$1, state, callback$1) {
 	const { queue, fs: fs$2, options: { suppressErrors } } = state;
 	queue.enqueue();
 	try {
-		const resolvedPath = fs$2.realpathSync(path);
+		const resolvedPath = fs$2.realpathSync(path$1);
 		const stat$1 = fs$2.statSync(resolvedPath);
-		if (stat$1.isDirectory() && isRecursive(path, resolvedPath, state)) return;
+		if (stat$1.isDirectory() && isRecursive(path$1, resolvedPath, state)) return;
 		callback$1(stat$1, resolvedPath);
 	} catch (e) {
 		if (!suppressErrors) throw e;
@@ -53165,16 +53400,16 @@ function build$2(options, isSynchronous) {
 	if (!options.resolveSymlinks || options.excludeSymlinks) return null;
 	return isSynchronous ? resolveSymlinks : resolveSymlinksAsync;
 }
-function isRecursive(path, resolved, state) {
+function isRecursive(path$1, resolved, state) {
 	if (state.options.useRealPaths) return isRecursiveUsingRealPaths(resolved, state);
-	let parent = dirname$1(path);
+	let parent = dirname$1(path$1);
 	let depth$1 = 1;
 	while (parent !== state.root && depth$1 < 2) {
 		const resolvedPath = state.symlinks.get(parent);
 		if (!!resolvedPath && (resolvedPath === resolved || resolvedPath.startsWith(resolved) || resolved.startsWith(resolvedPath))) depth$1++;
 		else parent = dirname$1(parent);
 	}
-	state.symlinks.set(path, resolved);
+	state.symlinks.set(path$1, resolved);
 	return depth$1 > 1;
 }
 function isRecursiveUsingRealPaths(resolved, state) {
@@ -53355,19 +53590,19 @@ var Walker = class {
 				const filename = this.joinPath(entry.name, directoryPath);
 				this.pushFile(filename, files, this.state.counts, filters);
 			} else if (entry.isDirectory()) {
-				let path = joinDirectoryPath(entry.name, directoryPath, this.state.options.pathSeparator);
-				if (exclude && exclude(entry.name, path)) continue;
-				this.pushDirectory(path, paths, filters);
-				this.walkDirectory(this.state, path, path, depth$1 - 1, this.walk);
+				let path$1 = joinDirectoryPath(entry.name, directoryPath, this.state.options.pathSeparator);
+				if (exclude && exclude(entry.name, path$1)) continue;
+				this.pushDirectory(path$1, paths, filters);
+				this.walkDirectory(this.state, path$1, path$1, depth$1 - 1, this.walk);
 			} else if (this.resolveSymlink && entry.isSymbolicLink()) {
-				let path = joinPathWithBasePath(entry.name, directoryPath);
-				this.resolveSymlink(path, this.state, (stat$1, resolvedPath) => {
+				let path$1 = joinPathWithBasePath(entry.name, directoryPath);
+				this.resolveSymlink(path$1, this.state, (stat$1, resolvedPath) => {
 					if (stat$1.isDirectory()) {
 						resolvedPath = normalizePath$1(resolvedPath, this.state.options);
-						if (exclude && exclude(entry.name, useRealPaths ? resolvedPath : path + pathSeparator)) return;
-						this.walkDirectory(this.state, resolvedPath, useRealPaths ? resolvedPath : path + pathSeparator, depth$1 - 1, this.walk);
+						if (exclude && exclude(entry.name, useRealPaths ? resolvedPath : path$1 + pathSeparator)) return;
+						this.walkDirectory(this.state, resolvedPath, useRealPaths ? resolvedPath : path$1 + pathSeparator, depth$1 - 1, this.walk);
 					} else {
-						resolvedPath = useRealPaths ? resolvedPath : path;
+						resolvedPath = useRealPaths ? resolvedPath : path$1;
 						const filename = basename(resolvedPath);
 						const directoryPath$1 = normalizePath$1(dirname$1(resolvedPath), this.state.options);
 						resolvedPath = this.joinPath(filename, directoryPath$1);
@@ -53532,7 +53767,7 @@ var Builder = class {
 			isMatch = globFn(patterns, ...options);
 			this.globCache[patterns.join("\0")] = isMatch;
 		}
-		this.options.filters.push((path) => isMatch(path));
+		this.options.filters.push((path$1) => isMatch(path$1));
 		return this;
 	}
 };
@@ -53746,8 +53981,8 @@ var require_utils = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/pic
 		if (state.negated === true) output = `(?:^(?!${output}).*$)`;
 		return output;
 	};
-	exports.basename = (path, { windows } = {}) => {
-		const segs = path.split(windows ? /[\\/]/ : "/");
+	exports.basename = (path$1, { windows } = {}) => {
+		const segs = path$1.split(windows ? /[\\/]/ : "/");
 		const last = segs[segs.length - 1];
 		if (last === "") return segs[segs.length - 2];
 		return last;
@@ -55487,15 +55722,15 @@ function buildRelative(cwd, root) {
 	};
 }
 const splitPatternOptions = { parts: true };
-function splitPattern(path) {
+function splitPattern(path$1) {
 	var _result$parts;
-	const result = import_picomatch.default.scan(path, splitPatternOptions);
-	return ((_result$parts = result.parts) === null || _result$parts === void 0 ? void 0 : _result$parts.length) ? result.parts : [path];
+	const result = import_picomatch.default.scan(path$1, splitPatternOptions);
+	return ((_result$parts = result.parts) === null || _result$parts === void 0 ? void 0 : _result$parts.length) ? result.parts : [path$1];
 }
 const POSIX_UNESCAPED_GLOB_SYMBOLS = /(?<!\\)([()[\]{}*?|]|^!|[!+@](?=\()|\\(?![()[\]{}!*+?@|]))/g;
 const WIN32_UNESCAPED_GLOB_SYMBOLS = /(?<!\\)([()[\]{}]|^!|[!+@](?=\())/g;
-const escapePosixPath = (path) => path.replace(POSIX_UNESCAPED_GLOB_SYMBOLS, "\\$&");
-const escapeWin32Path = (path) => path.replace(WIN32_UNESCAPED_GLOB_SYMBOLS, "\\$&");
+const escapePosixPath = (path$1) => path$1.replace(POSIX_UNESCAPED_GLOB_SYMBOLS, "\\$&");
+const escapeWin32Path = (path$1) => path$1.replace(WIN32_UNESCAPED_GLOB_SYMBOLS, "\\$&");
 /**
 * Escapes a path's special characters depending on the platform.
 * @see {@link https://superchupu.dev/tinyglobby/documentation#escapePath}
@@ -55619,13 +55854,13 @@ function buildCrawler(options, patterns) {
 	if (options.deep !== void 0) maxDepth = Math.round(options.deep - props.depthOffset);
 	const crawler = new Builder({
 		filters: [debug$7 ? (p$1, isDirectory$1) => {
-			const path = format$2(p$1, isDirectory$1);
-			const matches = matcher(path) && !ignore$1(path);
-			if (matches) log(`matched ${path}`);
+			const path$1 = format$2(p$1, isDirectory$1);
+			const matches = matcher(path$1) && !ignore$1(path$1);
+			if (matches) log(`matched ${path$1}`);
 			return matches;
 		} : (p$1, isDirectory$1) => {
-			const path = format$2(p$1, isDirectory$1);
-			return matcher(path) && !ignore$1(path);
+			const path$1 = format$2(p$1, isDirectory$1);
+			return matcher(path$1) && !ignore$1(path$1);
 		}],
 		exclude: debug$7 ? (_, p$1) => {
 			const skipped = excludePredicate(_, p$1);
@@ -55976,11 +56211,54 @@ function getPreviewModules(main, modulesRules) {
 		})))]
 	};
 }
+/**
+* Translate a Build Output API module type to a Miniflare module type.
+*/
+function toMiniflareModuleType(type) {
+	switch (type) {
+		case "esm": return "ESModule";
+		case "cjs": return "CommonJS";
+		case "wasm": return "CompiledWasm";
+		case "text": return "Text";
+		case "data": return "Data";
+		case "json": return "Data";
+		case "python": return "PythonModule";
+		case "pythonRequirement": return null;
+		case "sourcemap": return null;
+	}
+}
+/**
+* Get Miniflare's module list directly from the `modules` manifest.
+*
+* Miniflare uses the first module in the list as the entry, so the
+* `mainModule` is hoisted to index 0 regardless of the manifest's
+* order.
+*/
+function getModulesFromManifest(bundle) {
+	const { mainModule } = bundle;
+	const mainEntry = bundle.modules[mainModule];
+	assert(mainEntry !== void 0, `Build Output API: \`mainModule\` "${mainModule}" is missing from \`modules\`.`);
+	const ordered = [[mainModule, mainEntry]];
+	for (const [modulePath, value] of Object.entries(bundle.modules)) if (modulePath !== mainModule) ordered.push([modulePath, value]);
+	const modules = ordered.map(([modulePath, { type }]) => {
+		const miniflareType = toMiniflareModuleType(type);
+		if (miniflareType === null) return null;
+		return {
+			type: miniflareType,
+			path: modulePath
+		};
+	}).filter((m) => m !== null);
+	return {
+		rootPath: bundle.rootPath,
+		modules
+	};
+}
 async function getPreviewMiniflareOptions(ctx, vitePreviewServer) {
 	const inputInspectorPort = await getInputInspectorPort(ctx, vitePreviewServer);
 	const { resolvedPluginConfig, resolvedViteConfig } = ctx;
 	const containerTagToOptionsMap = /* @__PURE__ */ new Map();
-	const workers = (await Promise.all(resolvedPluginConfig.workers.map(async (workerConfig) => {
+	const workers = (await Promise.all(resolvedPluginConfig.workers.map(async (previewWorker) => {
+		const workerConfig = previewWorker.config;
 		const bindings = wrangler.unstable_convertConfigBindingsToStartWorkerBindings(workerConfig);
 		const preExistingRemoteProxySessionData = workerConfig.configPath ? remoteProxySessionsDataMap.get(workerConfig.configPath) : void 0;
 		const remoteProxySessionData = !resolvedPluginConfig.remoteBindings ? null : await wrangler.maybeStartOrUpdateRemoteProxySession({
@@ -56011,7 +56289,7 @@ async function getPreviewMiniflareOptions(ctx, vitePreviewServer) {
 			...workerOptions,
 			name: workerOptions.name ?? workerConfig.name,
 			unsafeInspectorProxy: inputInspectorPort !== false,
-			...miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : {
+			...previewWorker.source === "build-output" && previewWorker.bundle ? getModulesFromManifest(previewWorker.bundle) : miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : {
 				modules: true,
 				script: ""
 			}
@@ -56699,13 +56977,13 @@ const wslDefaultBrowser = async () => {
 	const { stdout } = await executePowerShell(String.raw`(Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice").ProgId`, { powerShellPath: psPath });
 	return stdout.trim();
 };
-const convertWslPathToWindows = async (path) => {
-	if (/^[a-z]+:\/\//i.test(path)) return path;
+const convertWslPathToWindows = async (path$1) => {
+	if (/^[a-z]+:\/\//i.test(path$1)) return path$1;
 	try {
-		const { stdout } = await execFile$1("wslpath", ["-aw", path], { encoding: "utf8" });
+		const { stdout } = await execFile$1("wslpath", ["-aw", path$1], { encoding: "utf8" });
 		return stdout.trim();
 	} catch {
-		return path;
+		return path$1;
 	}
 };
 
@@ -56891,8 +57169,8 @@ var is_in_ssh_default = isInSsh;
 //#endregion
 //#region ../../node_modules/.pnpm/open@11.0.0/node_modules/open/index.js
 const fallbackAttemptSymbol = Symbol("fallbackAttempt");
-const __dirname = import.meta.url ? path3.dirname(fileURLToPath(import.meta.url)) : "";
-const localXdgOpenPath = path3.join(__dirname, "xdg-open");
+const __dirname = import.meta.url ? path.dirname(fileURLToPath(import.meta.url)) : "";
+const localXdgOpenPath = path.join(__dirname, "xdg-open");
 const { platform, arch: arch$1 } = process$1;
 const tryEachApp = async (apps$1, opener) => {
 	if (apps$1.length === 0) return;
@@ -57276,6 +57554,8 @@ await assertWranglerVersion();
 */
 function cloudflare(pluginConfig = {}) {
 	const ctx = new PluginContext(sharedContext);
+	const newConfig = pluginConfig.experimental?.newConfig;
+	const outputPlugin = typeof newConfig === "object" && newConfig?.cfBuildOutput === true ? buildOutputPlugin(ctx) : outputConfigPlugin(ctx);
 	return [
 		{
 			name: "vite-plugin-cloudflare",
@@ -57308,7 +57588,7 @@ function cloudflare(pluginConfig = {}) {
 		triggerHandlersPlugin(ctx),
 		virtualModulesPlugin(ctx),
 		virtualClientFallbackPlugin(ctx),
-		outputConfigPlugin(ctx),
+		outputPlugin,
 		wasmHelperPlugin(ctx),
 		additionalModulesPlugin(ctx),
 		nodeJsAlsPlugin(ctx),