@cloudflare/vite-plugin 1.21.0 → 1.21.2

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,KDMO,OCNP,CAAA,CAAA,CAAA,GDMoB,OCNpB,CDM4B,CCN5B,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;AAQ1C,cDyBG,0BCvBJ,EAAA;EAGJ;AAEyB;AAER;EAUjB,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;EACN;;;AAGV;EACuB,SAAA,WAAA,EAAA,SAAA,CAAA,UAAA,EAAA,OAAA,EAAA,yBAAA,EAAA,WAAA,EAAA,qBAAA,EAAA,OAAA,EAAA,MAAA,EAAA,UAAA,CAAA;CAAR;;;AFxBH,KE9BA,YAAA,GF8BqB,OAAR,GAAA;;;UE5Bf,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;AAE4B;AAGI,UCrB3B,yBAAA,SAAkC,gBDwB3C,CAAA;EAKY,UAAA,EAAA,MAAA;;UCzBH,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,yBAAA,GAA4B,IAAH,CAC7B,wBAAA,EAAA,cADoC,GAAA,MAAA,CAAA;AAAA,KAKhC,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,yBAJf;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;;;;;AFvB1C;;;;ACvBA;;AAAuD,iBEcvC,UAAA,CFduC,YAAA,CAAA,EEcd,YFdc,CAAA,EEcM,IAAA,CAAK,MFdX,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":";;;;;;;ACgDK,KDMO,OCNP,CAAA,CAAA,CAAA,GDMoB,OCNpB,CDM4B,CCN5B,EAAA,SAA8B,CAAA;;;;AAA9B,KAjBO,YAAA,GAAe,IAiBtB,CAjB2B,eAiBG,EAAU,MAjBU,mBAiBV,CAAA;KAAxC,8BAAA,UAAwC;KAExC,mBAAA,GACF,oCACA;KAEE,iCAAA,SACE;AC/BP,KDiCK,8BAAA,GACJ,8BClCuB,CAAA,aAAA,CAAA,CAAA,MAAA,CAAA;AAA8B;AAE5B;AAI0B;AAQ1C,cDyBG,0BCvBJ,EAAA;EAGJ;AAEyB;AAER;EAUjB,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;EACN;;;AAGV;EACuB,SAAA,WAAA,EAAA,SAAA,CAAA,UAAA,EAAA,OAAA,EAAA,yBAAA,EAAA,WAAA,EAAA,qBAAA,EAAA,OAAA,EAAA,MAAA,EAAA,UAAA,CAAA;CAAR;;;AFxBH,KE9BA,YAAA,GF8BqB,OAAR,GAAA;;;UE5Bf,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;AAE4B;AAGI,UCrB3B,yBAAA,SAAkC,gBDwB3C,CAAA;EAKY,UAAA,EAAA,MAAA;;UCzBH,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,yBAAA,GAA4B,IAAH,CAC7B,wBAAA,EAAA,cADoC,GAAA,MAAA,CAAA;AAAA,KAKhC,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,yBAJf;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;;;;;AFvB1C;;;;ACvBA;;AAAuD,iBEcvC,UAAA,CFduC,YAAA,CAAA,EEcd,YFdc,CAAA,EEcM,IAAA,CAAK,MFdX,EAAA"}

package/dist/index.mjs

@@ -1884,7 +1884,7 @@ const formatInvalidRoutes = (invalidRules) => {
 };
 
 //#endregion
-//#region ../workers-utils/dist/chunk-UB4QLUTD.mjs
+//#region ../workers-utils/dist/chunk-LDFBMPMW.mjs
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1928,7 +1928,7 @@ var ENVIRONMENT_TAG_PREFIX = "cf:environment=";
 var PATH_TO_DEPLOY_CONFIG = ".wrangler/deploy/config.json";
 
 //#endregion
-//#region ../workers-utils/dist/chunk-Y5D2J4RL.mjs
+//#region ../workers-utils/dist/chunk-4N6XW2IM.mjs
 function getLocalWorkerdCompatibilityDate({ projectPath = process.cwd() } = {}) {
 	try {
 		const miniflareEntry = module$1.createRequire(projectPath).resolve("miniflare");
@@ -2225,7 +2225,7 @@ function constructWranglerConfig(workerOrWorkers) {
 __name(constructWranglerConfig, "constructWranglerConfig");
 
 //#endregion
-//#region ../workers-utils/dist/chunk-6T3PMLAP.mjs
+//#region ../workers-utils/dist/chunk-AT3LIX2I.mjs
 var UserError$1 = class extends Error {
 	static {
 		__name(this, "UserError");
@@ -4654,15 +4654,18 @@ function isRedirectedRawConfig(rawConfig, configPath, userConfigPath) {
 __name(isRedirectedRawConfig, "isRedirectedRawConfig");
 function configFormat(configPath) {
 	if (configPath?.endsWith("toml")) return "toml";
-	else if (configPath?.endsWith("json") || configPath?.endsWith("jsonc")) return "jsonc";
+	if (configPath?.endsWith("jsonc")) return "jsonc";
+	if (configPath?.endsWith("json")) return "json";
 	return "none";
 }
 __name(configFormat, "configFormat");
 function configFileName(configPath) {
-	const format3 = configFormat(configPath);
-	if (format3 === "toml") return "wrangler.toml";
-	else if (format3 === "jsonc") return "wrangler.json";
-	else return "Wrangler configuration";
+	switch (configFormat(configPath)) {
+		case "toml": return "wrangler.toml";
+		case "json": return "wrangler.json";
+		case "jsonc": return "wrangler.jsonc";
+		default: return "Wrangler configuration";
+	}
 }
 __name(configFileName, "configFileName");
 function formatConfigSnippet(snippet, configPath, formatted = true) {
@@ -14503,12 +14506,17 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 	};
 	const entryWorkerConfig = entryWorkerResolvedConfig.config;
 	const entryWorkerEnvironmentName = pluginConfig.viteEnvironment?.name ?? workerNameToEnvironmentName(entryWorkerConfig.topLevelName);
+	const validateAndAddEnvironmentName = createEnvironmentNameValidator();
+	validateAndAddEnvironmentName(entryWorkerEnvironmentName);
 	let staticRouting;
 	if (Array.isArray(entryWorkerConfig.assets?.run_worker_first)) staticRouting = parseStaticRouting(entryWorkerConfig.assets.run_worker_first);
 	const environmentNameToWorkerMap = new Map([[entryWorkerEnvironmentName, resolveWorker(entryWorkerConfig)]]);
 	const environmentNameToChildEnvironmentNamesMap = /* @__PURE__ */ new Map();
 	const entryWorkerChildEnvironments = pluginConfig.viteEnvironment?.childEnvironments;
-	if (entryWorkerChildEnvironments) environmentNameToChildEnvironmentNamesMap.set(entryWorkerEnvironmentName, entryWorkerChildEnvironments);
+	if (entryWorkerChildEnvironments) {
+		for (const childName of entryWorkerChildEnvironments) validateAndAddEnvironmentName(childName);
+		environmentNameToChildEnvironmentNamesMap.set(entryWorkerEnvironmentName, entryWorkerChildEnvironments);
+	}
 	const auxiliaryWorkersResolvedConfigs = [];
 	for (const auxiliaryWorker of pluginConfig.auxiliaryWorkers ?? []) {
 		const workerResolvedConfig = resolveWorkerConfig({
@@ -14521,10 +14529,13 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 		});
 		auxiliaryWorkersResolvedConfigs.push(workerResolvedConfig);
 		const workerEnvironmentName = auxiliaryWorker.viteEnvironment?.name ?? workerNameToEnvironmentName(workerResolvedConfig.config.topLevelName);
-		if (environmentNameToWorkerMap.has(workerEnvironmentName)) throw new Error(`Duplicate Vite environment name found: ${workerEnvironmentName}`);
+		validateAndAddEnvironmentName(workerEnvironmentName);
 		environmentNameToWorkerMap.set(workerEnvironmentName, resolveWorker(workerResolvedConfig.config));
 		const auxiliaryWorkerChildEnvironments = auxiliaryWorker.viteEnvironment?.childEnvironments;
-		if (auxiliaryWorkerChildEnvironments) environmentNameToChildEnvironmentNamesMap.set(workerEnvironmentName, auxiliaryWorkerChildEnvironments);
+		if (auxiliaryWorkerChildEnvironments) {
+			for (const childName of auxiliaryWorkerChildEnvironments) validateAndAddEnvironmentName(childName);
+			environmentNameToChildEnvironmentNamesMap.set(workerEnvironmentName, auxiliaryWorkerChildEnvironments);
+		}
 	}
 	return {
 		...shared,
@@ -14545,6 +14556,14 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 function workerNameToEnvironmentName(workerName) {
 	return workerName.replaceAll("-", "_");
 }
+function createEnvironmentNameValidator() {
+	const usedNames = /* @__PURE__ */ new Set();
+	return (name) => {
+		if (name === "client") throw new Error(`"client" is a reserved Vite environment name`);
+		if (usedNames.has(name)) throw new Error(`Duplicate Vite environment name: "${name}"`);
+		usedNames.add(name);
+	};
+}
 function resolveWorker(workerConfig) {
 	return {
 		config: workerConfig,
@@ -15865,7 +15884,7 @@ function isValidRule(rule) {
 
 //#endregion
 //#region ../workers-shared/utils/configuration/parseRedirects.ts
-function parseRedirects(input, { maxStaticRules = MAX_STATIC_REDIRECT_RULES, maxDynamicRules = MAX_DYNAMIC_REDIRECT_RULES, maxLineLength = MAX_LINE_LENGTH } = {}) {
+function parseRedirects(input, { htmlHandling = void 0, maxStaticRules = MAX_STATIC_REDIRECT_RULES, maxDynamicRules = MAX_DYNAMIC_REDIRECT_RULES, maxLineLength = MAX_LINE_LENGTH } = {}) {
 	const lines = input.split("\n");
 	const rules = [];
 	const seen_paths = /* @__PURE__ */ new Set();
@@ -15933,7 +15952,10 @@ function parseRedirects(input, { maxStaticRules = MAX_STATIC_REDIRECT_RULES, max
 			});
 			continue;
 		}
-		if (/\/\*?$/.test(from) && /\/index(.html)?$/.test(to) && !urlHasHost(to)) {
+		const hasRelativePath = !urlHasHost(to);
+		const hasWildcardToIndex = /\/\*$/.test(from) && /\/index(.html)?$/.test(to);
+		const hasRootToIndex = /\/$/.test(from) && /\/index(.html)?$/.test(to);
+		if (hasRelativePath && (hasWildcardToIndex || hasRootToIndex && htmlHandling !== "none")) {
 			invalid.push({
 				line,
 				lineNumber: i$1 + 1,
@@ -21231,7 +21253,7 @@ function getAssetsConfig(resolvedPluginConfig, entryWorkerConfig, resolvedConfig
 	const redirectsFile = getRedirectsConfigPath(resolvedConfig);
 	const redirectsContents = maybeGetFile(redirectsFile);
 	const redirects = redirectsContents && RedirectsSchema.parse(constructRedirects({
-		redirects: parseRedirects(redirectsContents),
+		redirects: parseRedirects(redirectsContents, { htmlHandling: assetsConfig?.html_handling }),
 		redirectsFile,
 		logger
 	}).redirects);
@@ -26648,6 +26670,7 @@ const shortcutsPlugin = createPlugin("shortcuts", (ctx) => {
 function addBindingsShortcut(server, ctx) {
 	const workerConfigs = ctx.allWorkerConfigs;
 	if (workerConfigs.length === 0) return;
+	if (!process.stdin.isTTY) return;
 	const registryPath = getDefaultDevRegistryPath();
 	const printBindingsShortcut = {
 		key: "b",