@cloudflare/vite-plugin 1.13.11 → 1.13.12

package/dist/index.js

@@ -1606,8 +1606,7 @@ var require_ignore = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/igno
 		}],
 		[/\\\/\\\*\\\*(?=\\\/|$)/g, (_, index, str) => index + 6 < str.length ? "(?:\\/[^\\/]+)*" : "\\/.+"],
 		[/(^|[^\\]+)(\\\*)+(?=.+)/g, (_, p1, p2) => {
-			const unescaped = p2.replace(/\\\*/g, "[^\\/]*");
-			return p1 + unescaped;
+			return p1 + p2.replace(/\\\*/g, "[^\\/]*");
 		}],
 		[/\\\\\\(?=[$.|*+(){^])/g, () => ESCAPE],
 		[/\\\\/g, () => ESCAPE],
@@ -3659,12 +3658,11 @@ var ZodType = class {
 			data: data$1,
 			parsedType: getParsedType(data$1)
 		};
-		const result = this._parseSync({
+		return handleResult(ctx, this._parseSync({
 			data: data$1,
 			path: ctx.path,
 			parent: ctx
-		});
-		return handleResult(ctx, result);
+		}));
 	}
 	async parseAsync(data$1, params) {
 		const result = await this.safeParseAsync(data$1, params);
@@ -3689,8 +3687,7 @@ var ZodType = class {
 			path: ctx.path,
 			parent: ctx
 		});
-		const result = await (isAsync(maybeAsyncResult) ? maybeAsyncResult : Promise.resolve(maybeAsyncResult));
-		return handleResult(ctx, result);
+		return handleResult(ctx, await (isAsync(maybeAsyncResult) ? maybeAsyncResult : Promise.resolve(maybeAsyncResult)));
 	}
 	refine(check, message) {
 		const getIssueProperties = (val) => {
@@ -4241,9 +4238,7 @@ function floatSafeRemainder(val, step) {
 	const valDecCount = (val.toString().split(".")[1] || "").length;
 	const stepDecCount = (step.toString().split(".")[1] || "").length;
 	const decCount = valDecCount > stepDecCount ? valDecCount : stepDecCount;
-	const valInt = parseInt(val.toFixed(decCount).replace(".", ""));
-	const stepInt = parseInt(step.toFixed(decCount).replace(".", ""));
-	return valInt % stepInt / Math.pow(10, decCount);
+	return parseInt(val.toFixed(decCount).replace(".", "")) % parseInt(step.toFixed(decCount).replace(".", "")) / Math.pow(10, decCount);
 }
 var ZodNumber = class ZodNumber extends ZodType {
 	constructor() {
@@ -4642,8 +4637,7 @@ var ZodDate = class ZodDate extends ZodType {
 			return INVALID;
 		}
 		if (isNaN(input.data.getTime())) {
-			const ctx$1 = this._getOrReturnCtx(input);
-			addIssueToContext(ctx$1, { code: ZodIssueCode.invalid_date });
+			addIssueToContext(this._getOrReturnCtx(input), { code: ZodIssueCode.invalid_date });
 			return INVALID;
 		}
 		const status = new ParseStatus();
@@ -4995,10 +4989,9 @@ var ZodObject = class ZodObject extends ZodType {
 	_getCached() {
 		if (this._cached !== null) return this._cached;
 		const shape = this._def.shape();
-		const keys = util$1.objectKeys(shape);
 		return this._cached = {
 			shape,
-			keys
+			keys: util$1.objectKeys(shape)
 		};
 	}
 	_parse(input) {
@@ -5996,8 +5989,7 @@ var ZodPromise = class extends ZodType {
 			});
 			return INVALID;
 		}
-		const promisified = ctx.parsedType === ZodParsedType.promise ? ctx.data : Promise.resolve(ctx.data);
-		return OK(promisified.then((data$1) => {
+		return OK((ctx.parsedType === ZodParsedType.promise ? ctx.data : Promise.resolve(ctx.data)).then((data$1) => {
 			return this._def.type.parseAsync(data$1, {
 				path: ctx.path,
 				errorMap: ctx.common.contextualErrorMap
@@ -6819,8 +6811,7 @@ function createBuildApp(resolvedPluginConfig) {
 		const entryWorkerEnvironment = builder.environments[entryWorkerEnvironmentName];
 		assert(entryWorkerEnvironment, `No "${entryWorkerEnvironmentName}" environment`);
 		const entryWorkerBuildDirectory = path$2.resolve(builder.config.root, entryWorkerEnvironment.config.build.outDir);
-		const entryWorkerManifest = loadViteManifest(entryWorkerBuildDirectory);
-		const importedAssetPaths = getImportedAssetPaths(entryWorkerManifest);
+		const importedAssetPaths = getImportedAssetPaths(loadViteManifest(entryWorkerBuildDirectory));
 		if (hasClientEntry) await builder.build(clientEnvironment);
 		else if (importedAssetPaths.size || getHasPublicAssets(builder.config)) await fallbackBuild(builder, clientEnvironment);
 		else {
@@ -6897,8 +6888,7 @@ function createRequestHandler(handler) {
 	return async (req, res, next) => {
 		try {
 			if (req.originalUrl) req.url = req.originalUrl;
-			const request$1 = createRequest(req, res);
-			let response = await handler(toMiniflareRequest(request$1), req);
+			let response = await handler(toMiniflareRequest(createRequest(req, res)), req);
 			if (req.httpVersionMajor === 2) {
 				response = new Response$1(response.body, response);
 				response.headers.delete("transfer-encoding");
@@ -7522,10 +7512,9 @@ function getLocator(source) {
 			else i$1 = m + 1;
 		}
 		const line = i$1 - 1;
-		const column = index - lineOffsets[line];
 		return {
 			line,
-			column
+			column: index - lineOffsets[line]
 		};
 	};
 }
@@ -8796,8 +8785,7 @@ function getWorkerConfigs(root) {
 	const deployConfigPath = getDeployConfigPath(root);
 	const deployConfig = JSON.parse(fs$1.readFileSync(deployConfigPath, "utf-8"));
 	return [{ configPath: deployConfig.configPath }, ...deployConfig.auxiliaryWorkers].map(({ configPath }) => {
-		const resolvedConfigPath = path$2.resolve(path$2.dirname(deployConfigPath), configPath);
-		return unstable_readConfig({ config: resolvedConfigPath });
+		return unstable_readConfig({ config: path$2.resolve(path$2.dirname(deployConfigPath), configPath) });
 	});
 }
 function getRelativePathToWorkerConfig(deployConfigDirectory, root, outputDirectory) {
@@ -14356,8 +14344,7 @@ function getFileProtocolModuleFormat(url, _context, ignoreErrors) {
 	const format$1 = extensionFormatMap[value];
 	if (format$1) return format$1;
 	if (ignoreErrors) return;
-	const filepath = fileURLToPath(url);
-	throw new ERR_UNKNOWN_FILE_EXTENSION(value, filepath);
+	throw new ERR_UNKNOWN_FILE_EXTENSION(value, fileURLToPath(url));
 }
 function getHttpProtocolModuleFormat() {}
 /**
@@ -14551,8 +14538,7 @@ function exportsNotFound(subpath, packageJsonUrl, base) {
 * @returns {never}
 */
 function throwInvalidSubpath(request$1, match, packageJsonUrl, internal, base) {
-	const reason = `request is not a valid match in pattern "${match}" for the "${internal ? "imports" : "exports"}" resolution of ${fileURLToPath(packageJsonUrl)}`;
-	throw new ERR_INVALID_MODULE_SPECIFIER(request$1, reason, base && fileURLToPath(base));
+	throw new ERR_INVALID_MODULE_SPECIFIER(request$1, `request is not a valid match in pattern "${match}" for the "${internal ? "imports" : "exports"}" resolution of ${fileURLToPath(packageJsonUrl)}`, base && fileURLToPath(base));
 }
 /**
 * @param {string} subpath
@@ -14587,18 +14573,14 @@ function resolvePackageTargetString(target$1, subpath, match, packageJsonUrl, ba
 				new URL$1(target$1);
 				isURL = true;
 			} catch {}
-			if (!isURL) {
-				const exportTarget = pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target$1, () => subpath) : target$1 + subpath;
-				return packageResolve(exportTarget, packageJsonUrl, conditions);
-			}
+			if (!isURL) return packageResolve(pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target$1, () => subpath) : target$1 + subpath, packageJsonUrl, conditions);
 		}
 		throw invalidPackageTarget(match, target$1, packageJsonUrl, internal, base);
 	}
 	if (invalidSegmentRegEx.exec(target$1.slice(2)) !== null) if (deprecatedInvalidSegmentRegEx.exec(target$1.slice(2)) === null) {
 		if (!isPathMap) {
 			const request$1 = pattern ? match.replace("*", () => subpath) : match + subpath;
-			const resolvedTarget = pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target$1, () => subpath) : target$1;
-			emitInvalidSegmentDeprecation(resolvedTarget, request$1, match, packageJsonUrl, internal, base, true);
+			emitInvalidSegmentDeprecation(pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target$1, () => subpath) : target$1, request$1, match, packageJsonUrl, internal, base, true);
 		}
 	} else throw invalidPackageTarget(match, target$1, packageJsonUrl, internal, base);
 	const resolved = new URL$1(target$1, packageJsonUrl);
@@ -14609,10 +14591,7 @@ function resolvePackageTargetString(target$1, subpath, match, packageJsonUrl, ba
 	if (invalidSegmentRegEx.exec(subpath) !== null) {
 		const request$1 = pattern ? match.replace("*", () => subpath) : match + subpath;
 		if (deprecatedInvalidSegmentRegEx.exec(subpath) === null) {
-			if (!isPathMap) {
-				const resolvedTarget = pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target$1, () => subpath) : target$1;
-				emitInvalidSegmentDeprecation(resolvedTarget, request$1, match, packageJsonUrl, internal, base, false);
-			}
+			if (!isPathMap) emitInvalidSegmentDeprecation(pattern ? RegExpPrototypeSymbolReplace.call(patternRegEx, target$1, () => subpath) : target$1, request$1, match, packageJsonUrl, internal, base, false);
 		} else throwInvalidSubpath(request$1, match, packageJsonUrl, internal, base);
 	}
 	if (pattern) return new URL$1(RegExpPrototypeSymbolReplace.call(patternRegEx, resolved.href, () => subpath));
@@ -14841,10 +14820,9 @@ function parsePackageName(specifier, base) {
 	const packageName = separatorIndex === -1 ? specifier : specifier.slice(0, separatorIndex);
 	if (invalidPackageNameRegEx.exec(packageName) !== null) validPackageName = false;
 	if (!validPackageName) throw new ERR_INVALID_MODULE_SPECIFIER(specifier, "is not a valid package name", fileURLToPath(base));
-	const packageSubpath = "." + (separatorIndex === -1 ? "" : specifier.slice(separatorIndex));
 	return {
 		packageName,
-		packageSubpath,
+		packageSubpath: "." + (separatorIndex === -1 ? "" : specifier.slice(separatorIndex)),
 		isScoped
 	};
 }
@@ -15225,9 +15203,7 @@ var NodeJsCompat = class {
 	* Gets the necessary global polyfills to inject into the entry-point of the user's code.
 	*/
 	injectGlobalCode() {
-		const injectedCode = Array.from(this.#virtualModulePathToSpecifier.keys()).map((moduleId) => `import "${moduleId}";`).join("\n");
-		const polyfillCode = this.#env.polyfill.map((polyfillPath) => `import "${polyfillPath}";`).join("\n");
-		return `${injectedCode}${polyfillCode}`;
+		return `${Array.from(this.#virtualModulePathToSpecifier.keys()).map((moduleId) => `import "${moduleId}";`).join("\n")}${this.#env.polyfill.map((polyfillPath) => `import "${polyfillPath}";`).join("\n")}`;
 	}
 	/**
 	* Resolves the `source` to a Node.js compat alias if possible.
@@ -15536,8 +15512,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 	};
 	const configPaths = /* @__PURE__ */ new Set();
 	const cloudflareEnv = prefixedEnv.CLOUDFLARE_ENV;
-	const entryWorkerConfigPath = getValidatedWranglerConfigPath(root, pluginConfig.configPath);
-	const entryWorkerResolvedConfig = getWorkerConfig(entryWorkerConfigPath, cloudflareEnv, {
+	const entryWorkerResolvedConfig = getWorkerConfig(getValidatedWranglerConfigPath(root, pluginConfig.configPath), cloudflareEnv, {
 		visitedConfigPaths: configPaths,
 		isEntryWorker: true
 	});
@@ -15556,8 +15531,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 	const workers = { [entryWorkerEnvironmentName]: entryWorkerConfig };
 	const auxiliaryWorkersResolvedConfigs = [];
 	for (const auxiliaryWorker of pluginConfig.auxiliaryWorkers ?? []) {
-		const workerConfigPath = getValidatedWranglerConfigPath(root, auxiliaryWorker.configPath, true);
-		const workerResolvedConfig = getWorkerConfig(workerConfigPath, cloudflareEnv, { visitedConfigPaths: configPaths });
+		const workerResolvedConfig = getWorkerConfig(getValidatedWranglerConfigPath(root, auxiliaryWorker.configPath, true), cloudflareEnv, { visitedConfigPaths: configPaths });
 		auxiliaryWorkersResolvedConfigs.push(workerResolvedConfig);
 		assert(workerResolvedConfig.type === "worker", "Unexpected error: received AssetsOnlyResult with auxiliary workers.");
 		const workerConfig = workerResolvedConfig.config;
@@ -15934,10 +15908,7 @@ function cloudflare(pluginConfig = {}) {
 				}));
 			},
 			async buildEnd() {
-				if (ctx.resolvedViteConfig.command === "serve" && containerImageTagsSeen?.size) {
-					const dockerPath = getDockerPath();
-					cleanupContainers(dockerPath, containerImageTagsSeen);
-				}
+				if (ctx.resolvedViteConfig.command === "serve" && containerImageTagsSeen?.size) cleanupContainers(getDockerPath(), containerImageTagsSeen);
 				debuglog("buildEnd:", restartingServer ? "restarted" : "disposing");
 				if (!restartingServer) {
 					debuglog("buildEnd: disposing Miniflare instance");