@cloudflare/vite-plugin 1.39.2 → 1.40.0

package/dist/index.mjs

@@ -19,6 +19,7 @@ import { URL as URL$1, URLSearchParams as URLSearchParams$1, fileURLToPath, path
 import * as fsp from "node:fs/promises";
 import fs, { constants as constants$1 } from "node:fs/promises";
 import * as timersPromises from "node:timers/promises";
+import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { getCloudflarePreset, nonPrefixedNodeModules } from "@cloudflare/unenv-preset";
 import process$1 from "node:process";
 import v8 from "node:v8";
@@ -1504,7 +1505,7 @@ async function assertWranglerVersion() {
 * The default compatibility date to use when the user omits one.
 * This value is injected at build time and remains fixed for each release.
 */
-const DEFAULT_COMPAT_DATE = "2026-06-02";
+const DEFAULT_COMPAT_DATE = "2026-06-04";
 
 //#endregion
 //#region ../../node_modules/.pnpm/@remix-run+node-fetch-server@0.8.0/node_modules/@remix-run/node-fetch-server/dist/node-fetch-server.js
@@ -1580,11 +1581,6 @@ const VITE_PROXY_WORKER_NAME = "__vite_proxy_worker__";
 const PROXY_SHARED_SECRET = randomUUID();
 const kRequestType = Symbol("kRequestType");
 
-//#endregion
-//#region ../workers-utils/dist/chunk-OZQVB3L3.mjs
-var INHERIT_SYMBOL = Symbol.for("inherit_binding");
-var PATH_TO_DEPLOY_CONFIG = ".wrangler/deploy/config.json";
-
 //#endregion
 //#region ../workers-utils/dist/chunk-DCOBXSFB.mjs
 var __create = Object.create;
@@ -1626,7 +1622,7 @@ var __toESM = (mod$1, isNodeMode, target$1) => (target$1 = mod$1 != null ? __cre
 }) : target$1, mod$1));
 
 //#endregion
-//#region ../workers-utils/dist/chunk-GMTGAG26.mjs
+//#region ../workers-utils/dist/chunk-ULVYGN52.mjs
 var UserError = class extends Error {
 	static {
 		__name(this, "UserError");
@@ -3893,6 +3889,8 @@ function removeBOMAndValidate(buffer$1, file2) {
 	return content;
 }
 __name(removeBOMAndValidate, "removeBOMAndValidate");
+var INHERIT_SYMBOL = Symbol.for("inherit_binding");
+var PATH_TO_DEPLOY_CONFIG = ".wrangler/deploy/config.json";
 function absolute(input, root) {
 	return isAbsolute(input) ? input : resolve(root || ".", input);
 }
@@ -15919,7 +15917,7 @@ var require_snapshot_utils = /* @__PURE__ */ __commonJS$1({ "../../node_modules/
 var require_snapshot_recorder = /* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/undici@7.24.8/node_modules/undici/lib/mock/snapshot-recorder.js": ((exports, module) => {
 	const { writeFile, readFile, mkdir } = __require$2("node:fs/promises");
 	const { dirname: dirname$2, resolve: resolve$3 } = __require$2("node:path");
-	const { setTimeout: setTimeout$1, clearTimeout: clearTimeout$1 } = __require$2("node:timers");
+	const { setTimeout: setTimeout$2, clearTimeout: clearTimeout$1 } = __require$2("node:timers");
 	const { InvalidArgumentError: InvalidArgumentError$6, UndiciError: UndiciError$1 } = require_errors();
 	const { hashId, isUrlExcludedFactory, normalizeHeaders: normalizeHeaders$4, createHeaderFilters } = require_snapshot_utils();
 	/**
@@ -16297,7 +16295,7 @@ var require_snapshot_recorder = /* @__PURE__ */ __commonJS$1({ "../../node_modul
 		* Schedules a flush (debounced to avoid excessive writes)
 		*/
 		#scheduleFlush() {
-			this.#flushTimeout = setTimeout$1(() => {
+			this.#flushTimeout = setTimeout$2(() => {
 				this.saveSnapshots().catch(() => {});
 				if (this.#autoFlush) this.#flushTimeout?.refresh();
 				else this.#flushTimeout = null;
@@ -27301,7 +27299,7 @@ var defaultWranglerConfig = {
 	vectorize: [],
 	ai_search_namespaces: [],
 	ai_search: [],
-	web_search: void 0,
+	websearch: void 0,
 	agent_memory: [],
 	hyperdrive: [],
 	workflows: [],
@@ -31352,7 +31350,7 @@ var friendlyBindingNames = {
 	vectorize: "Vectorize Index",
 	ai_search_namespaces: "AI Search Namespace",
 	ai_search: "AI Search Instance",
-	web_search: "Web Search",
+	websearch: "Web Search",
 	agent_memory: "Agent Memory",
 	hyperdrive: "Hyperdrive Config",
 	r2_buckets: "R2 Bucket",
@@ -31405,7 +31403,7 @@ var bindingTypeFriendlyNames = {
 	vectorize: "Vectorize Index",
 	ai_search_namespace: "AI Search Namespace",
 	ai_search: "AI Search Instance",
-	web_search: "Web Search",
+	websearch: "Web Search",
 	agent_memory: "Agent Memory",
 	hyperdrive: "Hyperdrive Config",
 	service: "Worker",
@@ -31747,8 +31745,16 @@ function normalizeAndValidateRoute(diagnostics, topLevelEnv, rawEnv) {
 	return inheritable(diagnostics, topLevelEnv, mutateEmptyStringRouteValue(diagnostics, rawEnv), "route", isRoute, void 0);
 }
 __name(normalizeAndValidateRoute, "normalizeAndValidateRoute");
-function validateRoutes(diagnostics, topLevelEnv, rawEnv) {
-	return inheritable(diagnostics, topLevelEnv, rawEnv, "routes", all(isRouteArray, isMutuallyExclusiveWith(rawEnv, "route")), void 0);
+function validateRoutes(diagnostics, topLevelEnv, rawEnv, envName) {
+	const result = inheritable(diagnostics, topLevelEnv, rawEnv, "routes", all(isRouteArray, isMutuallyExclusiveWith(rawEnv, "route")), void 0);
+	if (topLevelEnv !== void 0 && envName !== void 0 && rawEnv.routes === void 0) {
+		const customDomainRoutes = topLevelEnv.routes?.filter((r2) => typeof r2 === "object" && r2 !== null && r2.custom_domain === true);
+		if (customDomainRoutes && customDomainRoutes.length > 0) {
+			const customDomains = customDomainRoutes.map((r2) => r2.pattern).join(", ");
+			diagnostics.warnings.push(`The "env.${envName}" environment inherits the top-level \`routes\` configuration, which includes the custom domain(s): ${customDomains}. Deploying this environment will reassign these custom domains away from the top-level Worker. Add \`"routes": []\` to "env.${envName}" to prevent inheritance, or copy the route configuration from the top level to hide this warning.`);
+		}
+	}
+	return result;
 }
 __name(validateRoutes, "validateRoutes");
 function normalizeAndValidatePlacement(diagnostics, topLevelEnv, rawEnv) {
@@ -31838,7 +31844,7 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
 	if (topLevelEnv === void 0 || rawConfig?.unsafe === void 0) experimental(diagnostics, rawEnv, "unsafe");
 	const route = normalizeAndValidateRoute(diagnostics, topLevelEnv, rawEnv);
 	const account_id = inheritableInWranglerEnvironments(diagnostics, useServiceEnvironments, topLevelEnv, mutateEmptyStringAccountIDValue(diagnostics, rawEnv), "account_id", isString$2, void 0, void 0);
-	const routes = validateRoutes(diagnostics, topLevelEnv, rawEnv);
+	const routes = validateRoutes(diagnostics, topLevelEnv, rawEnv, topLevelEnv === void 0 ? void 0 : envName);
 	const workers_dev = inheritable(diagnostics, topLevelEnv, rawEnv, "workers_dev", isBoolean, void 0);
 	const preview_urls = inheritable(diagnostics, topLevelEnv, rawEnv, "preview_urls", isBoolean, void 0);
 	const build$8 = normalizeAndValidateBuild(diagnostics, rawEnv, rawEnv.build ?? topLevelEnv?.build ?? {}, configPath);
@@ -31883,7 +31889,7 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
 		vectorize: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "vectorize", validateBindingArray(envName, validateVectorizeBinding), []),
 		ai_search_namespaces: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "ai_search_namespaces", validateBindingArray(envName, validateAISearchNamespaceBinding), []),
 		ai_search: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "ai_search", validateBindingArray(envName, validateAISearchBinding), []),
-		web_search: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "web_search", validateNamedSimpleBinding(envName), void 0),
+		websearch: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "websearch", validateNamedSimpleBinding(envName), void 0),
 		agent_memory: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "agent_memory", validateBindingArray(envName, validateAgentMemoryBinding), []),
 		hyperdrive: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "hyperdrive", validateBindingArray(envName, validateHyperdriveBinding), []),
 		services: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "services", validateBindingArray(envName, validateServiceBinding), []),
@@ -32352,7 +32358,7 @@ var validateUnsafeBinding = /* @__PURE__ */ __name((diagnostics, field, value) =
 			"ai",
 			"ai_search_namespace",
 			"ai_search",
-			"web_search",
+			"websearch",
 			"agent_memory",
 			"kv_namespace",
 			"durable_object_namespace",
@@ -32784,12 +32790,17 @@ var validateD1Binding = /* @__PURE__ */ __name((diagnostics, field, value) => {
 		isValid2 = false;
 	}
 	if (!isRemoteValid(value, field, diagnostics)) isValid2 = false;
+	if (!isOptionalProperty(value, "migrations_pattern", "string")) {
+		diagnostics.errors.push(`"${field}" bindings should, optionally, have a string "migrations_pattern" field but got ${JSON.stringify(value)}.`);
+		isValid2 = false;
+	}
 	validateAdditionalProperties(diagnostics, field, Object.keys(value), [
 		"binding",
 		"database_id",
 		"database_internal_env",
 		"database_name",
 		"migrations_dir",
+		"migrations_pattern",
 		"migrations_table",
 		"preview_database_id",
 		"remote"
@@ -33658,7 +33669,7 @@ var BINDING_LOCAL_SUPPORT = {
 	flagship: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
 	vpc_service: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
 	vpc_network: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
-	web_search: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
+	websearch: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
 	agent_memory: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator"
 };
 function getBindingLocalSupport(type) {
@@ -34616,6 +34627,53 @@ async function fetchLatestNpmVersion(name, version$2) {
 	};
 }
 __name(fetchLatestNpmVersion, "fetchLatestNpmVersion");
+var MAX_ATTEMPTS = 3;
+async function retryOnAPIFailure(action, logger, backoff = 0, attempts = MAX_ATTEMPTS, abortSignal) {
+	try {
+		return await action();
+	} catch (err) {
+		if (err instanceof APIError) {
+			if (!err.isRetryable()) throw err;
+		} else if (err instanceof DOMException && err.name === "TimeoutError");
+		else if (!(err instanceof TypeError)) throw err;
+		logger.debug(`Retrying API call after error...`);
+		logger.debug(err);
+		if (attempts <= 1) throw err;
+		await setTimeout$1(backoff, void 0, { signal: abortSignal });
+		return retryOnAPIFailure(action, logger, backoff + 1e3, attempts - 1, abortSignal);
+	}
+}
+__name(retryOnAPIFailure, "retryOnAPIFailure");
+function formatTime(duration) {
+	return `(${(duration / 1e3).toFixed(2)} sec)`;
+}
+__name(formatTime, "formatTime");
+function getHostFromRoute(route) {
+	let host;
+	if (typeof route === "string") host = getHostFromUrl(route);
+	else if (typeof route === "object") {
+		host = getHostFromUrl(route.pattern);
+		if (host === void 0 && "zone_name" in route) host = getHostFromUrl(route.zone_name);
+	}
+	return host;
+}
+__name(getHostFromRoute, "getHostFromRoute");
+function getZoneFromRoute(route) {
+	if (typeof route === "object" && "zone_name" in route && route.zone_name) return route.zone_name;
+	return getHostFromRoute(route);
+}
+__name(getZoneFromRoute, "getZoneFromRoute");
+function getHostFromUrl(urlLike) {
+	if (urlLike.startsWith("*/") || urlLike.startsWith("http://*/") || urlLike.startsWith("https://*/")) return;
+	urlLike = urlLike.replace(/\*(\.)?/g, "");
+	if (!(urlLike.startsWith("http://") || urlLike.startsWith("https://"))) urlLike = "http://" + urlLike;
+	try {
+		return new URL(urlLike).host;
+	} catch {
+		return;
+	}
+}
+__name(getHostFromUrl, "getHostFromUrl");
 
 //#endregion
 //#region ../../node_modules/.pnpm/get-port@7.1.0/node_modules/get-port/index.js
@@ -43899,16 +43957,17 @@ const nullableNonApplicable = [
 	"site",
 	"tsconfig"
 ];
-function readWorkerConfig(configPath, env$1) {
+/**
+* Apply the Vite-specific sanitization to a normalized Worker config, tracking
+* any fields that are non-applicable when running under Vite.
+*/
+function processNormalizedWorkerConfig(normalized) {
 	const nonApplicable = {
 		replacedByVite: /* @__PURE__ */ new Set(),
 		notRelevant: /* @__PURE__ */ new Set(),
 		notSupportedOnAuxiliary: /* @__PURE__ */ new Set()
 	};
-	const config = wrangler.unstable_readConfig({
-		config: configPath,
-		env: env$1
-	}, { preserveOriginalMain: true });
+	const config = normalized;
 	const raw = structuredClone(config);
 	nullableNonApplicable.forEach((prop) => {
 		if (config[prop] !== void 0) {
@@ -43928,6 +43987,24 @@ function readWorkerConfig(configPath, env$1) {
 		config
 	};
 }
+function readWorkerConfig(configPath, env$1) {
+	return processNormalizedWorkerConfig(wrangler.unstable_readConfig({
+		config: configPath,
+		env: env$1
+	}, { preserveOriginalMain: true }));
+}
+/**
+* Normalise a `RawConfig` produced in-memory (for example by
+* `convertToWranglerConfig` from `@cloudflare/config`) using the same
+* validation pipeline as on-disk Wrangler config files, then apply the
+* Vite-specific sanitization.
+*/
+function readWorkerConfigFromRaw(rawConfig) {
+	const { config, diagnostics } = normalizeAndValidateConfig(rawConfig, void 0, void 0, {}, true);
+	if (diagnostics.hasWarnings()) console.warn(diagnostics.renderWarnings());
+	if (diagnostics.hasErrors()) throw new Error(diagnostics.renderErrors());
+	return processNormalizedWorkerConfig(config);
+}
 function getWarningForWorkersConfigs(configs) {
 	if (!("auxiliaryWorkers" in configs) || configs.auxiliaryWorkers.length === 0) {
 		const nonApplicableLines = getWorkerNonApplicableWarnLines(configs.entryWorker, `  - `);
@@ -44081,6 +44158,11 @@ const allowedWranglerConfigExtensions = [
 
 //#endregion
 //#region src/plugin-config.ts
+function normalizeNewConfig(option) {
+	if (option === void 0 || option === false) return;
+	if (option === true) return { types: { generate: true } };
+	return { types: { generate: option.types?.generate ?? true } };
+}
 function filterEntryWorkerConfig(config) {
 	const { topLevelName: _topLevelName, name: _name,...filteredConfig } = config;
 	return filteredConfig;
@@ -44098,7 +44180,8 @@ function resolveWorkerConfig(options) {
 	let workerConfig;
 	let raw;
 	let nonApplicable;
-	if (options.configPath) ({raw, config: workerConfig, nonApplicable} = readWorkerConfigFromFile(options.configPath, options.env, { visitedConfigPaths: options.visitedConfigPaths }));
+	if (options.rawConfigOverride) ({raw, config: workerConfig, nonApplicable} = readWorkerConfigFromRaw(options.rawConfigOverride));
+	else if (options.configPath) ({raw, config: workerConfig, nonApplicable} = readWorkerConfigFromFile(options.configPath, options.env, { visitedConfigPaths: options.visitedConfigPaths }));
 	else {
 		workerConfig = { ...wrangler.unstable_defaultWranglerConfig };
 		raw = structuredClone(workerConfig);
@@ -44126,7 +44209,8 @@ function resolveWorkerConfig(options) {
 		env: options.env
 	});
 }
-function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
+async function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
+	const resolvedNewConfig = normalizeNewConfig(pluginConfig.experimental?.newConfig);
 	const shared = {
 		persistState: pluginConfig.persistState ?? true,
 		inspectorPort: pluginConfig.inspectorPort,
@@ -44134,7 +44218,10 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 			autoStart: pluginConfig.tunnel?.autoStart ?? false,
 			name: pluginConfig.tunnel?.name
 		},
-		experimental: { headersAndRedirectsDevModeSupport: pluginConfig.experimental?.headersAndRedirectsDevModeSupport }
+		experimental: {
+			headersAndRedirectsDevModeSupport: pluginConfig.experimental?.headersAndRedirectsDevModeSupport,
+			newConfig: resolvedNewConfig
+		}
 	};
 	const root = userConfig.root ? nodePath.resolve(userConfig.root) : process.cwd();
 	const prefixedEnv = vite.loadEnv(viteEnv.mode, root, ["CLOUDFLARE_", "WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_"]);
@@ -44149,12 +44236,28 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 	const configPaths = /* @__PURE__ */ new Set();
 	const cloudflareEnv = prefixedEnv.CLOUDFLARE_ENV;
 	const validateAndAddEnvironmentName = createEnvironmentNameValidator();
+	let configPath;
+	let rawConfigOverride;
+	if (resolvedNewConfig) {
+		if (pluginConfig.configPath) throw new Error("`configPath` cannot be used together with `experimental.newConfig`. Configure the entry Worker via `cloudflare.config.ts` instead.");
+		if (pluginConfig.auxiliaryWorkers?.length) throw new Error("`auxiliaryWorkers` are not yet supported when `experimental.newConfig` is enabled.");
+		const result = await loadNewConfig({
+			root,
+			mode: viteEnv.mode,
+			generateTypes: resolvedNewConfig.types.generate
+		});
+		configPath = result.configPath;
+		rawConfigOverride = result.rawConfig;
+		configPaths.add(result.configPath);
+		for (const dep of result.dependencies) configPaths.add(dep);
+	} else configPath = getValidatedWranglerConfigPath(root, pluginConfig.configPath ?? prefixedEnv.CLOUDFLARE_VITE_WRANGLER_CONFIG_PATH);
 	const entryWorkerResolvedConfig = resolveWorkerConfig({
 		root,
-		configPath: getValidatedWranglerConfigPath(root, pluginConfig.configPath ?? prefixedEnv.CLOUDFLARE_VITE_WRANGLER_CONFIG_PATH),
+		configPath: resolvedNewConfig ? void 0 : configPath,
 		env: cloudflareEnv,
 		configCustomizer: pluginConfig.config,
-		visitedConfigPaths: configPaths
+		visitedConfigPaths: configPaths,
+		rawConfigOverride
 	});
 	const environmentNameToWorkerMap = /* @__PURE__ */ new Map();
 	const environmentNameToChildEnvironmentNamesMap = /* @__PURE__ */ new Map();
@@ -44264,6 +44367,59 @@ function resolveWorker(workerConfig, devOnly) {
 		devOnly
 	};
 }
+const NEW_CONFIG_FILENAME = "cloudflare.config.ts";
+const TYPES_OUTPUT_FILENAME = "worker-configuration.d.ts";
+const EXPERIMENTAL_CONFIG_PKG = "@cloudflare/vite-plugin/experimental-config";
+/**
+* Load and convert a `cloudflare.config.ts` file via `@cloudflare/config`. Returns
+* the resulting Wrangler `RawConfig`, the absolute path of the loaded file,
+* and the set of files imported while resolving the config (for watch-mode).
+*
+* If `generateTypes` is true, also writes `worker-configuration.d.ts` next to
+* the config when the generated content differs from what's already on disk.
+*/
+async function loadNewConfig(options) {
+	const configPath = nodePath.resolve(options.root, NEW_CONFIG_FILENAME);
+	if (!fs$1.existsSync(configPath)) throw new Error(`\`experimental.newConfig\` is enabled but no \`${NEW_CONFIG_FILENAME}\` was found at ${configPath}.`);
+	const { loadConfig, ConfigSchema, convertToWranglerConfig, generateTypes: generateTypesFn, resolveWorkerDefinition } = await import("./dist-MawCthRW.mjs");
+	const { config: rawExport, dependencies } = await loadConfig(configPath);
+	const resolved = await resolveWorkerDefinition(rawExport, { mode: options.mode });
+	const parsed = ConfigSchema.safeParse(resolved);
+	if (!parsed.success) throw new Error(`Invalid \`${NEW_CONFIG_FILENAME}\`:\n${parsed.error.message}`);
+	const rawConfig = convertToWranglerConfig(parsed.data);
+	if (options.generateTypes) writeWorkerConfigurationDts({
+		root: options.root,
+		configPath,
+		generateTypes: generateTypesFn
+	});
+	return {
+		rawConfig,
+		configPath,
+		dependencies
+	};
+}
+/**
+* Write `worker-configuration.d.ts` to the project root using
+* `@cloudflare/config`'s `generateTypes`, targeting the vite-plugin's
+* `experimental-config` subpath (so users don't need a direct dependency on
+* `@cloudflare/config`).
+*
+* Reads the existing file first and only writes if the content differs, to
+* avoid touching mtimes unnecessarily.
+*/
+function writeWorkerConfigurationDts(options) {
+	const outputPath = nodePath.resolve(options.root, TYPES_OUTPUT_FILENAME);
+	const relativeConfigPath = "./" + nodePath.relative(options.root, options.configPath);
+	const content = options.generateTypes({
+		configPath: relativeConfigPath,
+		packageName: EXPERIMENTAL_CONFIG_PKG
+	});
+	let existing;
+	try {
+		existing = fs$1.readFileSync(outputPath, "utf8");
+	} catch {}
+	if (existing !== content) fs$1.writeFileSync(outputPath, content);
+}
 
 //#endregion
 //#region ../../node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.0/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
@@ -57097,8 +57253,8 @@ function cloudflare(pluginConfig = {}) {
 		{
 			name: "vite-plugin-cloudflare",
 			sharedDuringBuild: true,
-			config(userConfig, env$1) {
-				ctx.setResolvedPluginConfig(resolvePluginConfig(pluginConfig, userConfig, env$1));
+			async config(userConfig, env$1) {
+				ctx.setResolvedPluginConfig(await resolvePluginConfig(pluginConfig, userConfig, env$1));
 				if (env$1.command === "build") process.env.CLOUDFLARE_VITE_BUILD = "true";
 			},
 			async configureServer(viteDevServer) {