@cloudflare/vite-plugin 1.26.1 → 1.28.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 }) {
@@ -23172,7 +23205,7 @@ async function cleanupDuplicateImageTags(dockerPath, imageTag) {
 
 //#endregion
 //#region ../containers-shared/src/images.ts
-const DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE = "cloudflare/proxy-everything:4dc6c7f@sha256:9621ef445ef120409e5d95bbd845ab2fa0f613636b59a01d998f5704f4096ae2";
+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;
 }
@@ -23261,7 +23294,7 @@ async function prepareContainerImagesForDev(args) {
 			await checkExposedPorts(dockerPath, options);
 		}
 	}
-	if (!aborted && args.compatibilityFlags?.includes("experimental")) await pullEgressInterceptorImage(dockerPath);
+	if (!aborted) await pullEgressInterceptorImage(dockerPath);
 }
 
 //#endregion
@@ -26260,8 +26293,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 +26315,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
@@ -26363,8 +26414,7 @@ const devPlugin = createPlugin("dev", (ctx) => {
 						onContainerImagePreparationStart: () => {},
 						onContainerImagePreparationEnd: () => {},
 						logger: viteDevServer.config.logger,
-						isVite: true,
-						compatibilityFlags: ctx.allWorkerConfigs.flatMap((c) => c.compatibility_flags)
+						isVite: true
 					});
 					containerImageTags = new Set(containerTagToOptionsMap.keys());
 					viteDevServer.config.logger.info(import_picocolors$2.default.dim(import_picocolors$2.default.yellow("\n⚡️ Containers successfully built. To rebuild your containers during development, restart the Vite dev server (r + enter).")));
@@ -26614,8 +26664,7 @@ const previewPlugin = createPlugin("preview", (ctx) => {
 				onContainerImagePreparationStart: () => {},
 				onContainerImagePreparationEnd: () => {},
 				logger: vitePreviewServer.config.logger,
-				isVite: true,
-				compatibilityFlags: ctx.allWorkerConfigs.flatMap((c) => c.compatibility_flags)
+				isVite: true
 			});
 			const containerImageTags = new Set(containerTagToOptionsMap.keys());
 			vitePreviewServer.config.logger.info(import_picocolors$1.default.dim(import_picocolors$1.default.yellow("\n⚡️ Containers successfully built.\n")));
@@ -26692,27 +26741,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$/;
@@ -26784,7 +26812,7 @@ function cloudflare(pluginConfig = {}) {
 		previewPlugin(ctx),
 		shortcutsPlugin(ctx),
 		debugPlugin(ctx),
-		triggerHandlersPlugin(ctx),
+		cdnCgiPlugin(ctx),
 		virtualModulesPlugin(ctx),
 		virtualClientFallbackPlugin(ctx),
 		outputConfigPlugin(ctx),