@cloudflare/vite-plugin 1.18.0 → 1.19.0

package/dist/index.d.mts

@@ -2,6 +2,10 @@ import { Miniflare, Request, Response } from "miniflare";
 import { Unstable_Config } from "wrangler";
 import * as vite from "vite";
 
+//#region src/utils.d.ts
+
+type Defined<T> = Exclude<T, undefined>;
+//#endregion
 //#region src/workers-configs.d.ts
 
 type WorkerConfig = Omit<Unstable_Config, keyof NonApplicableConfig>;
@@ -54,21 +58,28 @@ interface AuxiliaryWorkerFileConfig extends BaseWorkerConfig {
 }
 interface AuxiliaryWorkerInlineConfig extends BaseWorkerConfig {
   configPath?: string;
-  config: WorkerConfigCustomizer;
+  config: WorkerConfigCustomizer<false>;
 }
 type AuxiliaryWorkerConfig = AuxiliaryWorkerFileConfig | AuxiliaryWorkerInlineConfig;
 interface Experimental {
   /** Experimental support for handling the _headers and _redirects files during Vite dev mode. */
   headersAndRedirectsDevModeSupport?: boolean;
 }
-type WorkerConfigCustomizer = Partial<WorkerConfig> | ((config: WorkerConfig) => Partial<WorkerConfig> | void);
+type WorkerConfigCustomizer<TIsEntryWorker extends boolean> = Partial<WorkerConfig> | ((...args: TIsEntryWorker extends true ? [config: WorkerConfig] : [config: WorkerConfig, {
+  entryWorkerConfig: ResolvedAssetsOnlyConfig;
+}]) => Partial<WorkerConfig> | void);
 interface PluginConfig extends EntryWorkerConfig {
   auxiliaryWorkers?: AuxiliaryWorkerConfig[];
   persistState?: PersistState;
   inspectorPort?: number | false;
   remoteBindings?: boolean;
   experimental?: Experimental;
-  config?: WorkerConfigCustomizer;
+  config?: WorkerConfigCustomizer<true>;
+}
+interface ResolvedAssetsOnlyConfig extends WorkerConfig {
+  topLevelName: Defined<WorkerConfig["topLevelName"]>;
+  name: Defined<WorkerConfig["name"]>;
+  compatibility_date: Defined<WorkerConfig["compatibility_date"]>;
 }
 //#endregion
 //#region src/index.d.ts

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/workers-configs.ts","../src/plugin-config.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;;;;;KA+BY,YAAA,GAAe,KAAK,uBAAuB;ACN7B,KDuBrB,8BAAA,GCnB+B,ODmBS,0BCnBO;AAAA,KDqB/C,mBAAA,GACF,iCClByC,GDmBzC,8BCnByD;AAAA,KDqBvD,iCAAA,GCjBiC,MDkB/B,8BClBuC,CAAA,gBAAgB,CAAA;AAAA,KDoBzD,8BAAA,GACJ,8BCdE,CAAA,aAAA,CAAA,CAAA,MAAA,CAAA;AAA2B;AAER;;AAMnB,cDWU,0BCXV,EAAA;EACU;;;EAAwB,SAAA,cAAA,EAAA;IAEpB,SAAA,KAAa,EAAA;MACV,SAAA,eAAA,EAAA,eAAA;MACJ,SAAA,QAAA,EAAA,2DAAA;IAGA,CAAA;IACN,SAAA,MAAA,EAAA;MAN4B,SAAA,eAAA,EAAA,QAAA;MAAiB,SAAA,QAAA,EAAA,oDAAA;;;;MCZvC,SAAU,QAAe,EAAA,yDAA+B;;;;;;;;;;;AFZxC,KCRpB,YAAA,GDQoB,OAAA,GAAA;EAAuB,IAAA,EAAA,MAAA;CAA5B;UCNjB,gBAAA,CDMqB;EAiB1B,eAAA,CAAA,EAAA;IAEA,IAAA,CAAA,EAAA,MAAA;EAIA,CAAA;AACgC;AAQrC,UClCU,iBAAA,SAA0B,gBDkE1B,CAAA;;;UC9DA,yBAAA,SAAkC;EAVhC,UAAA,EAAA,MAAY;AAA8B;AAE5B,UAYhB,2BAAA,SAAoC,gBARM,CAAA;EAI1C,UAAA,CAAA,EAAA,MAAA;EAIA,MAAA,EAED,sBAF6B;AAAwB;AAOhC,KAFzB,qBAAA,GACF,yBAGmB,GAFnB,2BAEmB;AAAA,UAAZ,YAAA,CAKL;EACM;EAAR,iCAAA,CAAA,EAAA,OAAA;;KADE,sBAAA,GACF,OACmC,CAD3B,YAC2B,CAAA,GAAA,CAAA,CAAA,MAAA,EAAzB,YAAyB,EAAA,GAAR,OAAQ,CAAA,YAAA,CAAA,GAAA,IAAA,CAAA;AAAR,UAEb,YAAA,SAAqB,iBAFR,CAAA;EAAO,gBAAA,CAAA,EAGjB,qBAHiB,EAAA;EAEpB,YAAA,CAAA,EAED,YAFc;EACV,aAAA,CAAA,EAAA,MAAA,GAAA,KAAA;EACJ,cAAA,CAAA,EAAA,OAAA;EAGA,YAAA,CAAA,EAAA,YAAA;EACN,MAAA,CAAA,EAAA,sBAAA;;;;;AD9BV;;;;;AAeE;AAIG,iBEPW,UAAA,CFOQ,YACrB,CAAA,EERsC,YFQtC,CAAA,EER0D,IAAA,CAAK,MFS/D,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":";;;;;;ACkDK,KDIO,OCJP,CAAA,CAAA,CAAA,GDIoB,OCJD,CDIS,CCJT,EAAA,SACrB,CAAA;;;;AADE,KAnBO,YAAA,GAAe,IAmBH,CAnBQ,eAoB7B,EAAA,MApBoD,mBAqBpD,CAAA;KAJE,8BAAA,UAAwC;KAExC,mBAAA,GACF,oCACA;AC7BH,KD+BK,iCAAA,GC/BmB,MDgCjB,8BChCiB,CAAA,gBAAA,CAAA;AAA8B,KDkCjD,8BAAA,GACJ,8BCjCyB,CAAA,aAAA,CAAA,CAAA,MAAA,CAAA;AAAA;AAI0B;AAIQ;AASvD,cDqBQ,0BCpBV,EAAA;EAGO;AAAY;;EAMnB,SAAA,cAAA,EAAA;IAES,SAAA,KAAA,EAAA;MACG,SAAA,eAAA,EAAA,eAAA;MAED,SAAA,QAAA,EAAA,2DAAA;IACa,CAAA;IAEX,SAAA,MAAA,EAAA;MAAR,SAAA,eAAA,EAAA,QAAA;MAAO,SAAA,QAAA,EAAA,oDAAA;IAEE,CAAA;IACG,SAAA,MAAA,EAAA;MACJ,SAAA,eAAA,EAAA,cAAA;MAGA,SAAA,QAAA,EAAA,yDAAA;IACN,CAAA;EAN4B,CAAA;EAAiB;AASvD;;;EAEe,SAAA,WAAA,EAAA,SAAA,CAAA,UAAA,EAAA,OAAA,EAAA,yBAAA,EAAA,WAAA,EAAA,qBAAA,EAAA,OAAA,EAAA,MAAA,EAAA,UAAA,CAAA;CAAR;;;KAlDK,YAAA;;;ADQZ,UCNU,gBAAA,CDMc;EAAQ,eAAA,CAAA,EAAA;IAAuB,IAAA,CAAA,EAAA,MAAA;EAA5B,CAAA;;AAezB,UCjBQ,iBAAA,SAA0B,gBDmBS,CAAA;EAExC,UAAA,CAAA,EAAA,MAAA;AAE4B;AAGI,UCtB3B,yBAAA,SAAkC,gBDyB3C,CAAA;EAKY,UAAA,EAAA,MAAA;;UC1BH,2BAAA,SAAoC;;EAdlC,MAAA,EAgBH,sBAhBe,CAAA,KAAA,CAAA;AAA8B;AAE5B,KAiBrB,qBAAA,GACF,yBAdiD,GAejD,2BAfiD;AAAA,UAiB1C,YAAA,CAbA;EAIA;EAKL,iCAAqB,CAAA,EACvB,OAAA;AAC2B;AAER,KAKjB,sBAAA,CAAA,uBAAsB,OAAA,CAAA,GACxB,OADwB,CAChB,YADgB,CAAA,GAAA,CAAA,CAAA,GAAA,IAAA,EAGf,cAHe,SAAA,IAAA,GAAA,CAAA,MAAA,EAIZ,YAJY,CAAA,GAAA,CAChB,MAAA,EAKG,YALH,EAAR;EAES,iBAAA,EAIe,wBAJf;AACG,CAAA,CAED,EAAA,GAGN,OAHM,CAGE,YAHF,CAAA,GAAA,IAAA,CAAA;AACa,UAIV,YAAA,SAAqB,iBAJX,CAAA;EAEX,gBAAA,CAAA,EAGI,qBAHJ,EAAA;EAAR,YAAA,CAAA,EAIQ,YAJR;EAAO,aAAA,CAAA,EAAA,MAAA,GAAA,KAAA;EAEE,cAAA,CAAa,EAAA,OAAA;EACV,YAAA,CAAA,EAIJ,YAJI;EACJ,MAAA,CAAA,EAIN,sBAJM,CAAA,IAAA,CAAA;;AAIN,UAGO,wBAAA,SAAiC,YAHxC,CAAA;EAN4B,YAAA,EAUvB,OAVuB,CAUf,YAVe,CAAA,cAAA,CAAA,CAAA;EAAiB,IAAA,EAWhD,OAXgD,CAWxC,YAXwC,CAAA,MAAA,CAAA,CAAA;EAStC,kBAAA,EAGI,OAHqB,CAGb,YAHa,CAAA,oBAAA,CAAA,CAAA;;;;;AFjB1C;;;;ACvBA;;AAAuD,iBEYvC,UAAA,CFZuC,YAAA,CAAA,EEYd,YFZc,CAAA,EEYM,IAAA,CAAK,MFZX,EAAA"}

package/dist/index.mjs

@@ -8434,19 +8434,20 @@ const allowedWranglerConfigExtensions = [
 
 //#endregion
 //#region src/plugin-config.ts
-function customizeWorkerConfig(resolvedConfig, config) {
-	const configResult = typeof config === "function" ? config(resolvedConfig) : config;
-	if (configResult) return defu(configResult, resolvedConfig);
-	return resolvedConfig;
+function customizeWorkerConfig(options) {
+	const configResult = typeof options.configCustomizer === "function" ? "entryWorkerConfig" in options ? options.configCustomizer(options.workerConfig, { entryWorkerConfig: options.entryWorkerConfig }) : options.configCustomizer(options.workerConfig) : options.configCustomizer;
+	if (configResult) return defu(configResult, options.workerConfig);
+	return options.workerConfig;
 }
 /**
 * Resolves the config for a single worker, applying defaults, file config, and config().
 */
-function resolveWorkerConfig({ configPath, env, config, visitedConfigPaths, isEntryWorker, root }) {
+function resolveWorkerConfig(options) {
+	const isEntryWorker = !("entryWorkerConfig" in options);
 	let workerConfig;
 	let raw;
 	let nonApplicable;
-	if (configPath) ({raw, config: workerConfig, nonApplicable} = readWorkerConfigFromFile(configPath, env, { visitedConfigPaths }));
+	if (options.configPath) ({raw, config: workerConfig, nonApplicable} = readWorkerConfigFromFile(options.configPath, options.env, { visitedConfigPaths: options.visitedConfigPaths }));
 	else {
 		workerConfig = { ...wrangler.unstable_defaultWranglerConfig };
 		raw = structuredClone(workerConfig);
@@ -8455,15 +8456,22 @@ function resolveWorkerConfig({ configPath, env, config, visitedConfigPaths, isEn
 			notRelevant: /* @__PURE__ */ new Set()
 		};
 	}
-	workerConfig = customizeWorkerConfig(workerConfig, config);
+	workerConfig = "entryWorkerConfig" in options ? customizeWorkerConfig({
+		workerConfig,
+		configCustomizer: options.configCustomizer,
+		entryWorkerConfig: options.entryWorkerConfig
+	}) : customizeWorkerConfig({
+		workerConfig,
+		configCustomizer: options.configCustomizer
+	});
 	workerConfig.compatibility_date ??= wrangler.unstable_getDevCompatibilityDate(void 0);
-	if (isEntryWorker) workerConfig.name ??= wrangler.unstable_getWorkerNameFromProject(root);
+	if (isEntryWorker) workerConfig.name ??= wrangler.unstable_getWorkerNameFromProject(options.root);
 	workerConfig.topLevelName ??= workerConfig.name;
 	return resolveWorkerType(workerConfig, raw, nonApplicable, {
 		isEntryWorker,
-		configPath,
-		root,
-		env
+		configPath: options.configPath,
+		root: options.root,
+		env: options.env
 	});
 }
 function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
@@ -8487,9 +8495,8 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 		root,
 		configPath: getValidatedWranglerConfigPath(root, pluginConfig.configPath),
 		env: prefixedEnv.CLOUDFLARE_ENV,
-		config: pluginConfig.config,
-		visitedConfigPaths: configPaths,
-		isEntryWorker: true
+		configCustomizer: pluginConfig.config,
+		visitedConfigPaths: configPaths
 	});
 	if (entryWorkerResolvedConfig.type === "assets-only") return {
 		...shared,
@@ -8511,9 +8518,9 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 			root,
 			configPath: getValidatedWranglerConfigPath(root, auxiliaryWorker.configPath, true),
 			env: cloudflareEnv,
-			config: "config" in auxiliaryWorker ? auxiliaryWorker.config : void 0,
-			visitedConfigPaths: configPaths,
-			isEntryWorker: false
+			configCustomizer: "config" in auxiliaryWorker ? auxiliaryWorker.config : void 0,
+			entryWorkerConfig,
+			visitedConfigPaths: configPaths
 		});
 		auxiliaryWorkersResolvedConfigs.push(workerResolvedConfig);
 		const workerEnvironmentName = auxiliaryWorker.viteEnvironment?.name ?? workerNameToEnvironmentName(workerResolvedConfig.config.topLevelName);