@cloudflare/vite-plugin 1.27.0 → 1.29.0

package/dist/index.d.mts

@@ -40,6 +40,10 @@ declare const nonApplicableWorkerConfigs: {
    * application they lose their purpose/meaning)
    */
   readonly notRelevant: readonly ["base_dir", "build", "find_additional_modules", "no_bundle", "preserve_file_names", "rules", "site", "tsconfig"];
+  /**
+   * Configs that are only supported on the entry worker and will be ignored on auxiliary workers
+   */
+  readonly notSupportedOnAuxiliary: readonly ["assets"];
 };
 //#endregion
 //#region src/plugin-config.d.ts

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/utils.ts","../src/workers-configs.ts","../src/plugin-config.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;;;;;;ACgDK,KDOO,OCPP,CAAA,CAAA,CAAA,GDOoB,OCPpB,CDO4B,CCP5B,EAAA,SAA8B,CAAA;;;;AAA9B,KAjBO,YAAA,GAAe,IAiBtB,CAjB2B,eAiBG,EAAU,MAjBU,mBAiBV,CAA0B;KAAlE,8BAAA,UAAwC;KAExC,mBAAA,GACF,oCACA;KAEE,iCAAA,SACE;AC/BP,KDiCK,8BAAA,GACJ,8BClCuB,CAAA,aAAA,CAAA,CAAA,MAAA,CAAA;AAA8B;AAE5B;AAI0B;AAS1C,cDwBG,0BCtBJ,EAAA;EAGJ;AAEyB;AAMU;EAQnC,SAAA,cAAA,EAAsB;IAChB,SAAA,KAAA,EAAA;MAAR,SAAA,eAAA,EAAA,eAAA;MAES,SAAA,QAAA,EAAA,2DAAA;IACG,CAAA;IAED,SAAA,MAAA,EAAA;MACa,SAAA,eAAA,EAAA,QAAA;MAEX,SAAA,QAAA,EAAA,oDAAA;IAAR,CAAA;IAAO,SAAA,MAAA,EAAA;MAEE,SAAa,eAAA,EAAA,cAAA;MACV,SAAA,QAAA,EAAA,yDAAA;IACJ,CAAA;EAGA,CAAA;EALsB;;AAQtC;;EACe,SAAA,WAAA,EAAA,SAAA,CAAA,UAAA,EAAA,OAAA,EAAA,yBAAA,EAAA,WAAA,EAAA,qBAAA,EAAA,OAAA,EAAA,MAAA,EAAA,UAAA,CAAA;CACA;;;AF1BH,KE/BA,YAAA,GF+BqB,OAAR,GAAA;;;UE7Bf,gBAAA;EDKE,eAAY,CAAA,EAAA;IAAQ,IAAA,CAAA,EAAA,MAAA;IAAuB,iBAAA,CAAA,EAAA,MAAA,EAAA;EAA5B,CAAA;;AAezB,UChBQ,iBAAA,SAA0B,gBDkBS,CAAA;EAExC,UAAA,CAAA,EAAA,MAAA;EAIA,MAAA,CAAA,ECtBK,sBDsBL,CAAA,IAAiC,CAAA;AACD;AAQrC,UC5BU,yBAAA,SAAkC,gBD4DlC,CAAA;;;UCxDA,2BAAA,SAAoC;EAflC,UAAA,CAAA,EAAA,MAAY;EAEd,MAAA,EAeD,sBAfiB,CAAA,KAAA,CAAA;AAAA;AAI0B,KAc/C,qBAAA,GACF,yBAVyC,GAWzC,2BAXyD;AAAA,UAalD,YAAA,CATA;EAKL;EAIK,iCAIS,CAAA,EAAA,OAAA;EAGd;EAKA,eAAA,CAAA,EARc,qBAQQ;;KALtB,yBAAA,GAA4B,IAM9B,CALF,wBAKE,EAAA,cAAA,GAAA,MAAA,CAAA;KADE,sBAGO,CAAA,uBAAA,OAAA,CAAA,GAFT,OAES,CAFD,YAEC,CAAA,GAAA,CAAA,CAAA,GAAA,IAAA,EAAA,cAAA,SAAA,IAAA,GAAA,CAAA,MAAA,EACG,YADH,CAAA,GAAA,CACG,MAAA,EAED,YAFC,EAED;EACa,iBAAA,EAAA,yBAAA;AAEX,CAAA,CAAR,EAAA,GAAA,OAAA,CAAQ,YAAR,CAAA,GAAA,IAAA,CAAA;AAAO,UAEE,YAAA,SAAqB,iBAFvB,CAAA;EAEE,gBAAa,CAAA,EACV,qBADU,EAAA;EACV,YAAA,CAAA,EACJ,YADI;EACJ,aAAA,CAAA,EAAA,MAAA,GAAA,KAAA;EAGA,cAAA,CAAA,EAAA,OAAA;EALsB,YAAA,CAAA,EAKtB,YALsB;;AAQrB,UAAA,wBAAA,SAAiC,YAAR,CAAA;EACnB,YAAA,EAAR,OAAQ,CAAA,YAAA,CAAA,cAAA,CAAA,CAAA;EAAR,IAAA,EACR,OADQ,CACA,YADA,CAAA,MAAA,CAAA,CAAA;EACA,kBAAA,EACM,OADN,CACc,YADd,CAAA,oBAAA,CAAA,CAAA;;;;;AF1Bf;;;;ACxBA;;AAAuD,iBEevC,UAAA,CFfuC,YAAA,CAAA,EEed,YFfc,CAAA,EEeM,IAAA,CAAK,MFfX,EAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/utils.ts","../src/workers-configs.ts","../src/plugin-config.ts","../src/index.ts"],"sourcesContent":[],"mappings":"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"}

package/dist/index.mjs

@@ -14332,7 +14332,8 @@ const nonApplicableWorkerConfigs = {
 		"rules",
 		"site",
 		"tsconfig"
-	]
+	],
+	notSupportedOnAuxiliary: ["assets"]
 };
 /**
 * The non applicable configs that can be and default to `undefined`
@@ -14350,7 +14351,8 @@ const nullableNonApplicable = [
 function readWorkerConfig(configPath, env$1) {
 	const nonApplicable = {
 		replacedByVite: /* @__PURE__ */ new Set(),
-		notRelevant: /* @__PURE__ */ new Set()
+		notRelevant: /* @__PURE__ */ new Set(),
+		notSupportedOnAuxiliary: /* @__PURE__ */ new Set()
 	};
 	const config = wrangler.unstable_readConfig({
 		config: configPath,
@@ -14386,7 +14388,7 @@ function getWarningForWorkersConfigs(configs) {
 	}
 	const lines = [];
 	const processWorkerConfig = (workerConfig, isEntryWorker = false) => {
-		const nonApplicableLines = getWorkerNonApplicableWarnLines(workerConfig, `    - `);
+		const nonApplicableLines = getWorkerNonApplicableWarnLines(workerConfig, `    - `, { isAuxiliary: !isEntryWorker });
 		if (nonApplicableLines.length > 0) {
 			lines.push(`  - (${isEntryWorker ? "entry" : "auxiliary"}) worker${workerConfig.config.name ? ` "${workerConfig.config.name}"` : ""}${workerConfig.config.configPath ? ` (config at \`${nodePath.relative("", workerConfig.config.configPath)}\`)` : ""}`);
 			nonApplicableLines.forEach((line) => lines.push(line));
@@ -14401,11 +14403,12 @@ function getWarningForWorkersConfigs(configs) {
 		""
 	].join("\n");
 }
-function getWorkerNonApplicableWarnLines(workerConfig, linePrefix) {
+function getWorkerNonApplicableWarnLines(workerConfig, linePrefix, options) {
 	const lines = [];
-	const { replacedByVite, notRelevant } = workerConfig.nonApplicable;
+	const { replacedByVite, notRelevant, notSupportedOnAuxiliary } = workerConfig.nonApplicable;
 	for (const config of replacedByVite) lines.push(`${linePrefix}\`${config}\` which is replaced by Vite's \`${nonApplicableWorkerConfigs.replacedByVite[config].viteReplacement}\` (docs: ${nonApplicableWorkerConfigs.replacedByVite[config].viteDocs})`);
 	if (notRelevant.size > 0) lines.push(`${linePrefix}${[...notRelevant].map((config) => `\`${config}\``).join(", ")} which ${notRelevant.size > 1 ? "are" : "is"} not relevant in the context of a Vite project`);
+	if (options?.isAuxiliary && notSupportedOnAuxiliary.size > 0) lines.push(`${linePrefix}${[...notSupportedOnAuxiliary].map((config) => `\`${config}\``).join(", ")} which ${notSupportedOnAuxiliary.size > 1 ? "are" : "is"} not supported for auxiliary workers`);
 	return lines;
 }
 function isReplacedByVite(configName) {
@@ -14550,7 +14553,8 @@ function resolveWorkerConfig(options) {
 		raw = structuredClone(workerConfig);
 		nonApplicable = {
 			replacedByVite: /* @__PURE__ */ new Set(),
-			notRelevant: /* @__PURE__ */ new Set()
+			notRelevant: /* @__PURE__ */ new Set(),
+			notSupportedOnAuxiliary: /* @__PURE__ */ new Set()
 		};
 	}
 	workerConfig = "entryWorkerConfig" in options ? customizeWorkerConfig({
@@ -14651,6 +14655,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 			entryWorkerConfig: entryWorkerResolvedConfig.config,
 			visitedConfigPaths: configPaths
 		});
+		if (workerResolvedConfig.config.assets) workerResolvedConfig.nonApplicable.notSupportedOnAuxiliary.add("assets");
 		auxiliaryWorkersResolvedConfigs.push(workerResolvedConfig);
 		const workerEnvironmentName = auxiliaryWorker.viteEnvironment?.name ?? workerNameToEnvironmentName(workerResolvedConfig.config.topLevelName);
 		validateAndAddEnvironmentName(workerEnvironmentName);
@@ -15792,6 +15797,34 @@ function createModuleReference(type, id) {
 	return `__CLOUDFLARE_MODULE__${type}__${id}__CLOUDFLARE_MODULE__`;
 }
 
+//#endregion
+//#region src/plugins/cdn-cgi.ts
+/**
+* Plugin to forward `/cdn-cgi/` routes to Miniflare in development
+* We handle specified routes rather than using a catch all so that users can add their own routes using Vite's proxy functionality
+*/
+const cdnCgiPlugin = createPlugin("cdn-cgi", (ctx) => {
+	return {
+		enforce: "pre",
+		async configureServer(viteDevServer) {
+			const entryWorkerConfig = ctx.entryWorkerConfig;
+			if (!entryWorkerConfig) return;
+			const entryWorkerName = entryWorkerConfig.name;
+			const requestHandler = createRequestHandler((request$1) => {
+				request$1.headers.set(CoreHeaders.ROUTE_OVERRIDE, entryWorkerName);
+				return ctx.miniflare.dispatchFetch(request$1, { redirect: "manual" });
+			});
+			viteDevServer.middlewares.use(async (req, res, next) => {
+				const url = req.originalUrl ?? "";
+				const isLocalExplorer = url === "/cdn-cgi/explorer" || url.startsWith("/cdn-cgi/explorer/") || url.startsWith("/cdn-cgi/explorer?");
+				const isTriggerHandler = url.startsWith("/cdn-cgi/handler/");
+				if (isLocalExplorer || isTriggerHandler) await requestHandler(req, res, next);
+				else next();
+			});
+		}
+	};
+});
+
 //#endregion
 //#region ../workers-shared/utils/configuration/constructConfiguration.ts
 function constructRedirects({ redirects, redirectsFile, logger }) {
@@ -21577,8 +21610,13 @@ function createHotChannel(webSocketContainer) {
 	return {
 		send(payload) {
 			const webSocket = webSocketContainer.webSocket;
-			assert(webSocket, webSocketUndefinedError);
-			webSocket.send(JSON.stringify(payload));
+			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();
@@ -21624,6 +21662,10 @@ var CloudflareDevEnvironment = class extends vite.DevEnvironment {
 		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();
@@ -22254,6 +22296,229 @@ const OpenAPI = {
 	LOGGER: void 0
 };
 
+//#endregion
+//#region ../containers-shared/src/client/core/request.ts
+/* istanbul ignore file */
+const isDefined = (value) => {
+	return value !== void 0 && value !== null;
+};
+const isString = (value) => {
+	return typeof value === "string";
+};
+const isStringWithValue = (value) => {
+	return isString(value) && value !== "";
+};
+const isBlob = (value) => {
+	return typeof value === "object" && typeof value.type === "string" && typeof value.stream === "function" && typeof value.arrayBuffer === "function" && typeof value.constructor === "function" && typeof value.constructor.name === "string" && /^(Blob|File)$/.test(value.constructor.name) && /^(Blob|File)$/.test(value[Symbol.toStringTag]);
+};
+const base64 = (str) => {
+	try {
+		return btoa(str);
+	} catch (err) {
+		return Buffer.from(str).toString("base64");
+	}
+};
+const getQueryString = (params) => {
+	const qs = [];
+	const append = (key, value) => {
+		qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
+	};
+	const process$2 = (key, value) => {
+		if (isDefined(value)) if (Array.isArray(value)) value.forEach((v) => {
+			process$2(key, v);
+		});
+		else if (typeof value === "object") Object.entries(value).forEach(([k, v]) => {
+			process$2(`${key}[${k}]`, v);
+		});
+		else append(key, value);
+	};
+	Object.entries(params).forEach(([key, value]) => {
+		process$2(key, value);
+	});
+	if (qs.length > 0) return `?${qs.join("&")}`;
+	return "";
+};
+const getUrl = (config, options) => {
+	const encoder = config.ENCODE_PATH || encodeURI;
+	const path$1 = options.url.replace("{api-version}", config.VERSION).replace(/{(.*?)}/g, (substring, group) => {
+		if (options.path?.hasOwnProperty(group)) return encoder(String(options.path[group]));
+		return substring;
+	});
+	const url = `${config.BASE}${path$1}`;
+	if (options.query) return `${url}${getQueryString(options.query)}`;
+	return url;
+};
+const getFormData = (options) => {
+	if (options.formData) {
+		const formData = new FormData();
+		const process$2 = async (key, value) => {
+			if (isString(value)) formData.append(key, value);
+			else formData.append(key, JSON.stringify(value));
+		};
+		Object.entries(options.formData).filter(([_, value]) => isDefined(value)).forEach(([key, value]) => {
+			if (Array.isArray(value)) value.forEach((v) => process$2(key, v));
+			else process$2(key, value);
+		});
+		return formData;
+	}
+};
+const resolve$1 = async (options, resolver) => {
+	if (typeof resolver === "function") return resolver(options);
+	return resolver;
+};
+const getHeaders = async (config, options) => {
+	const token = await resolve$1(options, config.TOKEN);
+	const username = await resolve$1(options, config.USERNAME);
+	const password = await resolve$1(options, config.PASSWORD);
+	const additionalHeaders = await resolve$1(options, config.HEADERS);
+	const headers = Object.entries({
+		Accept: "application/json",
+		...additionalHeaders,
+		...options.headers
+	}).filter(([_, value]) => isDefined(value)).reduce((headers$1, [key, value]) => ({
+		...headers$1,
+		[key]: String(value)
+	}), {});
+	if (isStringWithValue(token)) headers["Authorization"] = `Bearer ${token}`;
+	if (isStringWithValue(username) && isStringWithValue(password)) headers["Authorization"] = `Basic ${base64(`${username}:${password}`)}`;
+	if (options.body) if (options.mediaType) headers["Content-Type"] = options.mediaType;
+	else if (isBlob(options.body)) headers["Content-Type"] = options.body.type || "application/octet-stream";
+	else if (isString(options.body)) headers["Content-Type"] = "text/plain";
+	else headers["Content-Type"] = "application/json";
+	return new Headers(headers);
+};
+const getRequestBody = (options) => {
+	if (options.body !== void 0) if (options.mediaType?.includes("/json")) return JSON.stringify(options.body);
+	else if (isString(options.body) || isBlob(options.body)) return options.body;
+	else return JSON.stringify(options.body);
+};
+const isResponseSchemaV4 = (config, _options) => {
+	return config.BASE.endsWith("/containers");
+};
+const parseResponseSchemaV4 = (url, response, responseHeader, responseBody) => {
+	const fetchResult = typeof responseBody === "object" ? responseBody : JSON.parse(responseBody);
+	const ok = response.ok && fetchResult.success;
+	let result;
+	if (ok) if (fetchResult.result !== void 0) result = fetchResult.result;
+	else result = {};
+	else result = { error: fetchResult.errors?.[0]?.message };
+	return {
+		url,
+		ok,
+		status: response.status,
+		statusText: response.statusText,
+		body: responseHeader ?? result
+	};
+};
+const sendRequest = async (config, options, url, body, formData, headers, onCancel) => {
+	const controller = new AbortController();
+	const request$1 = {
+		headers,
+		body: body ?? formData,
+		method: options.method,
+		signal: controller.signal
+	};
+	if (config.WITH_CREDENTIALS) request$1.credentials = config.CREDENTIALS;
+	onCancel(() => controller.abort());
+	return await fetch(url, request$1);
+};
+const getResponseHeader = (response, responseHeader) => {
+	if (responseHeader) {
+		const content = response.headers.get(responseHeader);
+		if (isString(content)) return content;
+	}
+};
+const getResponseBody = async (response) => {
+	if (response.status !== 204) try {
+		const contentType = response.headers.get("Content-Type");
+		if (contentType) if (["application/json", "application/problem+json"].some((type) => contentType.toLowerCase().startsWith(type))) return await response.json();
+		else return await response.text();
+	} catch (error) {
+		console.error(error);
+	}
+};
+const catchErrorCodes = (options, result) => {
+	const error = {
+		400: "Bad Request",
+		401: "Unauthorized",
+		403: "Forbidden",
+		404: "Not Found",
+		500: "Internal Server Error",
+		502: "Bad Gateway",
+		503: "Service Unavailable",
+		...options.errors
+	}[result.status];
+	if (error) throw new ApiError(options, result, error);
+	if (!result.ok) throw new ApiError(options, result, "Generic Error");
+};
+/**
+* Shared HTTP execution: builds URL, headers, body, sends the request,
+* and returns the raw response components for further processing.
+* Returns null if the request was cancelled before sending.
+*/
+const executeRequest = async (config, options, onCancel) => {
+	const url = getUrl(config, options);
+	const formData = getFormData(options);
+	const body = getRequestBody(options);
+	const headers = await getHeaders(config, options);
+	debugLogRequest(config, url, headers, formData ?? body ?? {});
+	if (onCancel.isCancelled) return null;
+	const response = await sendRequest(config, options, url, body, formData, headers, onCancel);
+	return {
+		url,
+		response,
+		responseBody: await getResponseBody(response),
+		responseHeader: getResponseHeader(response, options.responseHeader)
+	};
+};
+/**
+* Build an ApiResult from the raw response, handling V4 schema parsing.
+*/
+const buildApiResult = (config, options, req) => {
+	if (isResponseSchemaV4(config, options)) return parseResponseSchemaV4(req.url, req.response, req.responseHeader, req.responseBody);
+	return {
+		url: req.url,
+		ok: req.response.ok,
+		status: req.response.status,
+		statusText: req.response.statusText,
+		body: req.responseHeader ?? req.responseBody
+	};
+};
+/**
+* Request method
+* @param config The OpenAPI configuration object
+* @param options The request options from the service
+* @returns CancelablePromise<T>
+* @throws ApiError
+*/
+const request = (config, options) => {
+	return new CancelablePromise(async (resolve$2, reject, onCancel) => {
+		try {
+			const req = await executeRequest(config, options, onCancel);
+			if (!req) return;
+			const result = buildApiResult(config, options, req);
+			debugLogResponse(config, result);
+			catchErrorCodes(options, result);
+			resolve$2(result.body);
+		} catch (error) {
+			reject(error);
+		}
+	});
+};
+const debugLogRequest = async (config, url, headers, body) => {
+	config.LOGGER?.debug(`-- START CF API REQUEST: ${url}`);
+	const logHeaders = new Headers(headers);
+	logHeaders.delete("Authorization");
+	config.LOGGER?.debugWithSanitization("HEADERS:", JSON.stringify(logHeaders, null, 2));
+	config.LOGGER?.debugWithSanitization("BODY:", JSON.stringify(body instanceof FormData ? await new Response(body).text() : body, null, 2));
+	config.LOGGER?.debug("-- END CF API REQUEST");
+};
+const debugLogResponse = (config, response) => {
+	config.LOGGER?.debug("-- START CF API RESPONSE:", response.statusText, response.status);
+	config.LOGGER?.debugWithSanitization("RESPONSE:", response.body);
+	config.LOGGER?.debug("-- END CF API RESPONSE");
+};
+
 //#endregion
 //#region ../containers-shared/src/client/models/ApplicationRollout.ts
 let ApplicationRollout;
@@ -22480,212 +22745,6 @@ let UpdateApplicationRolloutRequest;
 	}({});
 })(UpdateApplicationRolloutRequest || (UpdateApplicationRolloutRequest = {}));
 
-//#endregion
-//#region ../containers-shared/src/client/core/request.ts
-/* istanbul ignore file */
-const isDefined = (value) => {
-	return value !== void 0 && value !== null;
-};
-const isString = (value) => {
-	return typeof value === "string";
-};
-const isStringWithValue = (value) => {
-	return isString(value) && value !== "";
-};
-const isBlob = (value) => {
-	return typeof value === "object" && typeof value.type === "string" && typeof value.stream === "function" && typeof value.arrayBuffer === "function" && typeof value.constructor === "function" && typeof value.constructor.name === "string" && /^(Blob|File)$/.test(value.constructor.name) && /^(Blob|File)$/.test(value[Symbol.toStringTag]);
-};
-const base64 = (str) => {
-	try {
-		return btoa(str);
-	} catch (err) {
-		return Buffer.from(str).toString("base64");
-	}
-};
-const getQueryString = (params) => {
-	const qs = [];
-	const append = (key, value) => {
-		qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
-	};
-	const process$2 = (key, value) => {
-		if (isDefined(value)) if (Array.isArray(value)) value.forEach((v) => {
-			process$2(key, v);
-		});
-		else if (typeof value === "object") Object.entries(value).forEach(([k, v]) => {
-			process$2(`${key}[${k}]`, v);
-		});
-		else append(key, value);
-	};
-	Object.entries(params).forEach(([key, value]) => {
-		process$2(key, value);
-	});
-	if (qs.length > 0) return `?${qs.join("&")}`;
-	return "";
-};
-const getUrl = (config, options) => {
-	const encoder = config.ENCODE_PATH || encodeURI;
-	const path$1 = options.url.replace("{api-version}", config.VERSION).replace(/{(.*?)}/g, (substring, group) => {
-		if (options.path?.hasOwnProperty(group)) return encoder(String(options.path[group]));
-		return substring;
-	});
-	const url = `${config.BASE}${path$1}`;
-	if (options.query) return `${url}${getQueryString(options.query)}`;
-	return url;
-};
-const getFormData = (options) => {
-	if (options.formData) {
-		const formData = new FormData();
-		const process$2 = async (key, value) => {
-			if (isString(value)) formData.append(key, value);
-			else formData.append(key, JSON.stringify(value));
-		};
-		Object.entries(options.formData).filter(([_, value]) => isDefined(value)).forEach(([key, value]) => {
-			if (Array.isArray(value)) value.forEach((v) => process$2(key, v));
-			else process$2(key, value);
-		});
-		return formData;
-	}
-};
-const resolve$1 = async (options, resolver) => {
-	if (typeof resolver === "function") return resolver(options);
-	return resolver;
-};
-const getHeaders = async (config, options) => {
-	const token = await resolve$1(options, config.TOKEN);
-	const username = await resolve$1(options, config.USERNAME);
-	const password = await resolve$1(options, config.PASSWORD);
-	const additionalHeaders = await resolve$1(options, config.HEADERS);
-	const headers = Object.entries({
-		Accept: "application/json",
-		...additionalHeaders,
-		...options.headers
-	}).filter(([_, value]) => isDefined(value)).reduce((headers$1, [key, value]) => ({
-		...headers$1,
-		[key]: String(value)
-	}), {});
-	if (isStringWithValue(token)) headers["Authorization"] = `Bearer ${token}`;
-	if (isStringWithValue(username) && isStringWithValue(password)) headers["Authorization"] = `Basic ${base64(`${username}:${password}`)}`;
-	if (options.body) if (options.mediaType) headers["Content-Type"] = options.mediaType;
-	else if (isBlob(options.body)) headers["Content-Type"] = options.body.type || "application/octet-stream";
-	else if (isString(options.body)) headers["Content-Type"] = "text/plain";
-	else headers["Content-Type"] = "application/json";
-	return new Headers(headers);
-};
-const getRequestBody = (options) => {
-	if (options.body !== void 0) if (options.mediaType?.includes("/json")) return JSON.stringify(options.body);
-	else if (isString(options.body) || isBlob(options.body)) return options.body;
-	else return JSON.stringify(options.body);
-};
-const isResponseSchemaV4 = (config, _options) => {
-	return config.BASE.endsWith("/containers");
-};
-const parseResponseSchemaV4 = (url, response, responseHeader, responseBody) => {
-	const fetchResult = typeof responseBody === "object" ? responseBody : JSON.parse(responseBody);
-	const ok = response.ok && fetchResult.success;
-	let result;
-	if (ok) if (fetchResult.result !== void 0) result = fetchResult.result;
-	else result = {};
-	else result = { error: fetchResult.errors?.[0]?.message };
-	return {
-		url,
-		ok,
-		status: response.status,
-		statusText: response.statusText,
-		body: responseHeader ?? result
-	};
-};
-const sendRequest = async (config, options, url, body, formData, headers, onCancel) => {
-	const controller = new AbortController();
-	const request$1 = {
-		headers,
-		body: body ?? formData,
-		method: options.method,
-		signal: controller.signal
-	};
-	if (config.WITH_CREDENTIALS) request$1.credentials = config.CREDENTIALS;
-	onCancel(() => controller.abort());
-	return await fetch(url, request$1);
-};
-const getResponseHeader = (response, responseHeader) => {
-	if (responseHeader) {
-		const content = response.headers.get(responseHeader);
-		if (isString(content)) return content;
-	}
-};
-const getResponseBody = async (response) => {
-	if (response.status !== 204) try {
-		const contentType = response.headers.get("Content-Type");
-		if (contentType) if (["application/json", "application/problem+json"].some((type) => contentType.toLowerCase().startsWith(type))) return await response.json();
-		else return await response.text();
-	} catch (error) {
-		console.error(error);
-	}
-};
-const catchErrorCodes = (options, result) => {
-	const error = {
-		400: "Bad Request",
-		401: "Unauthorized",
-		403: "Forbidden",
-		404: "Not Found",
-		500: "Internal Server Error",
-		502: "Bad Gateway",
-		503: "Service Unavailable",
-		...options.errors
-	}[result.status];
-	if (error) throw new ApiError(options, result, error);
-	if (!result.ok) throw new ApiError(options, result, "Generic Error");
-};
-/**
-* Request method
-* @param config The OpenAPI configuration object
-* @param options The request options from the service
-* @returns CancelablePromise<T>
-* @throws ApiError
-*/
-const request = (config, options) => {
-	return new CancelablePromise(async (resolve$2, reject, onCancel) => {
-		try {
-			const url = getUrl(config, options);
-			const formData = getFormData(options);
-			const body = getRequestBody(options);
-			const headers = await getHeaders(config, options);
-			debugLogRequest(config, url, headers, formData ?? body ?? {});
-			if (!onCancel.isCancelled) {
-				const response = await sendRequest(config, options, url, body, formData, headers, onCancel);
-				const responseBody = await getResponseBody(response);
-				const responseHeader = getResponseHeader(response, options.responseHeader);
-				let result;
-				if (isResponseSchemaV4(config, options)) result = parseResponseSchemaV4(url, response, responseHeader, responseBody);
-				else result = {
-					url,
-					ok: response.ok,
-					status: response.status,
-					statusText: response.statusText,
-					body: responseHeader ?? responseBody
-				};
-				debugLogResponse(config, result);
-				catchErrorCodes(options, result);
-				resolve$2(result.body);
-			}
-		} catch (error) {
-			reject(error);
-		}
-	});
-};
-const debugLogRequest = async (config, url, headers, body) => {
-	config.LOGGER?.debug(`-- START CF API REQUEST: ${url}`);
-	const logHeaders = new Headers(headers);
-	logHeaders.delete("Authorization");
-	config.LOGGER?.debugWithSanitization("HEADERS:", JSON.stringify(logHeaders, null, 2));
-	config.LOGGER?.debugWithSanitization("BODY:", JSON.stringify(body instanceof FormData ? await new Response(body).text() : body, null, 2));
-	config.LOGGER?.debug("-- END CF API REQUEST");
-};
-const debugLogResponse = (config, response) => {
-	config.LOGGER?.debug("-- START CF API RESPONSE:", response.statusText, response.status);
-	config.LOGGER?.debugWithSanitization("RESPONSE:", response.body);
-	config.LOGGER?.debug("-- END CF API RESPONSE");
-};
-
 //#endregion
 //#region ../containers-shared/src/client/services/ImageRegistriesService.ts
 /* istanbul ignore file */
@@ -23172,7 +23231,7 @@ async function cleanupDuplicateImageTags(dockerPath, imageTag) {
 
 //#endregion
 //#region ../containers-shared/src/images.ts
-const DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE = "cloudflare/proxy-everything:3f5e832@sha256:816255f5b6ebdc2cdcddb578d803121e7ee9cfe178442da07725d75a66cdcf37";
+const DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE = "cloudflare/proxy-everything:233db0f@sha256:f159d9e1b0f28bc01bd106f38d62479c018d050e3f95b365c5f9b5f83f60df82";
 function getEgressInterceptorImage() {
 	return process.env.MINIFLARE_CONTAINER_EGRESS_IMAGE ?? DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE;
 }
@@ -26260,8 +26319,12 @@ function handleWebSocket(httpServer, miniflare, entryWorkerName) {
 	const nodeWebSocket = new WebSocketServer({ noServer: true });
 	httpServer.on("upgrade", async (request$1, socket, head) => {
 		socket.on("error", () => socket.destroy());
-		const url = new URL(request$1.url ?? "", UNKNOWN_HOST);
-		if (request$1.headers["sec-websocket-protocol"]?.startsWith("vite")) return;
+		const rawHost = request$1.headers.host ?? UNKNOWN_HOST;
+		const base = /^https?:\/\//i.test(rawHost) ? rawHost : `http://${rawHost}`;
+		const url = new URL(request$1.url ?? "", base);
+		const isViteRequest = request$1.headers["sec-websocket-protocol"]?.startsWith("vite");
+		const isSandboxRequest = hasSandboxOrigin(url.origin);
+		if (isViteRequest && !isSandboxRequest) return;
 		const headers = createHeaders(request$1);
 		if (entryWorkerName) headers.set(CoreHeaders.ROUTE_OVERRIDE, entryWorkerName);
 		const workerWebSocket = (await miniflare.dispatchFetch(url, {
@@ -26278,6 +26341,20 @@ function handleWebSocket(httpServer, miniflare, entryWorkerName) {
 		});
 	});
 }
+/**
+* Matches the origin of a Sandbox SDK preview URL.
+* See: https://developers.cloudflare.com/sandbox/concepts/preview-urls/
+*
+* Pattern: https?://<port(4+ digits)>-<id(no dots)>-<token>.localhost
+*
+* IMPORTANT: The token segment is [a-z0-9_]+ (no hyphens) to prevent ReDoS — two adjacent
+* [^.]+ groups separated by - cause quadratic backtracking on hyphen-heavy input. Tokens are
+* documented as letters/digits/underscores only.
+*/
+const SANDBOX_ORIGIN_REGEXP = /^https?:\/\/\d{4,}-[^.]+-[a-z0-9_]+\.localhost(:\d+)?$/i;
+function hasSandboxOrigin(origin) {
+	return SANDBOX_ORIGIN_REGEXP.test(origin);
+}
 
 //#endregion
 //#region src/plugins/dev.ts
@@ -26690,27 +26767,6 @@ function addBindingsShortcut(server, ctx) {
 	server.bindCLIShortcuts({ customShortcuts: [printBindingsShortcut] });
 }
 
-//#endregion
-//#region src/plugins/trigger-handlers.ts
-/**
-* Plugin to forward `/cdn-cgi/handler/*` routes to trigger handlers in development
-*/
-const triggerHandlersPlugin = createPlugin("trigger-handlers", (ctx) => {
-	return {
-		enforce: "pre",
-		async configureServer(viteDevServer) {
-			const entryWorkerConfig = ctx.entryWorkerConfig;
-			if (!entryWorkerConfig) return;
-			const entryWorkerName = entryWorkerConfig.name;
-			const requestHandler = createRequestHandler((request$1) => {
-				request$1.headers.set(CoreHeaders.ROUTE_OVERRIDE, entryWorkerName);
-				return ctx.miniflare.dispatchFetch(request$1, { redirect: "manual" });
-			});
-			viteDevServer.middlewares.use("/cdn-cgi/handler/", requestHandler);
-		}
-	};
-});
-
 //#endregion
 //#region src/plugins/wasm.ts
 const wasmInitRE = /\.wasm\?init$/;
@@ -26782,7 +26838,7 @@ function cloudflare(pluginConfig = {}) {
 		previewPlugin(ctx),
 		shortcutsPlugin(ctx),
 		debugPlugin(ctx),
-		triggerHandlersPlugin(ctx),
+		cdnCgiPlugin(ctx),
 		virtualModulesPlugin(ctx),
 		virtualClientFallbackPlugin(ctx),
 		outputConfigPlugin(ctx),