@cloudflare/vite-plugin 1.20.0 → 1.20.2

package/dist/index.mjs

@@ -12,10 +12,10 @@ import { version } from "vite";
 import * as fs$1 from "node:fs";
 import fs, { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
 import { URL as URL$1, fileURLToPath, pathToFileURL } from "node:url";
-import process$1 from "node:process";
+import process2 from "node:process";
 import os from "node:os";
 import { defu } from "defu";
-import { getCloudflarePreset } from "@cloudflare/unenv-preset";
+import { getCloudflarePreset, nonPrefixedNodeModules } from "@cloudflare/unenv-preset";
 import v8 from "node:v8";
 import { defineEnv } from "unenv";
 import * as fsp from "node:fs/promises";
@@ -1557,6 +1557,7 @@ function toMiniflareRequest(request$1) {
 		signal: request$1.signal
 	});
 }
+const isRolldown = "rolldownVersion" in vite;
 
 //#endregion
 //#region src/export-types.ts
@@ -4428,7 +4429,7 @@ function checkType(type) {
 __name(checkType, "checkType");
 var matchType = /* @__PURE__ */ __name((type, stat) => type === void 0 || stat[typeMappings[type]](), "matchType");
 var toPath = /* @__PURE__ */ __name((urlOrPath) => urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath, "toPath");
-function locatePathSync(paths, { cwd = process$1.cwd(), type = "file", allowSymlinks = true } = {}) {
+function locatePathSync(paths, { cwd = process2.cwd(), type = "file", allowSymlinks = true } = {}) {
 	checkType(type);
 	cwd = toPath(cwd);
 	const statFunction = allowSymlinks ? fs.statSync : fs.lstatSync;
@@ -6838,6 +6839,14 @@ function validateContainerApp(envName, topLevelName, configPath) {
 				if (!isRequiredProperty(key, "public_key", "string")) diagnostics.errors.push(`${fieldPath}.public_key must be a string`);
 				if (!key.public_key.toLowerCase().startsWith("ssh-ed25519")) diagnostics.errors.push(`${fieldPath}.public_key is a unsupported key type. Please provide a ED25519 public key.`);
 			}
+			if (validateOptionalProperty(diagnostics, field, "constraints", containerAppOptional.constraints, "object") && containerAppOptional.constraints) {
+				const constraints = containerAppOptional.constraints;
+				if ("tier" in constraints) {
+					diagnostics.warnings.push(`"constraints.tier" has been deprecated in favor of "constraints.tiers". Please update your configuration to use "constraints.tiers" instead.`);
+					if ("tiers" in constraints) diagnostics.errors.push(`${field}.constraints.tier and ${field}.constraints.tiers cannot both be set`);
+				}
+				validateOptionalTypedArray(diagnostics, `${field}.constraints.tiers`, constraints.tiers, "number");
+			}
 			if (typeof containerAppOptional.instance_type === "string") {
 				validateOptionalProperty(diagnostics, field, "instance_type", containerAppOptional.instance_type, "string", ALLOWED_INSTANCE_TYPES);
 				if (containerAppOptional.instance_type === "dev") diagnostics.warnings.push(`The "dev" instance_type has been renamed to "lite" and will be removed in a subsequent version. Please update your configuration to use "lite" instead.`);
@@ -13282,10 +13291,10 @@ const doubleSlashRegEx = /[/\\]{2}/;
 * @param {boolean} isTarget
 */
 function emitInvalidSegmentDeprecation(target$1, request$1, match, packageJsonUrl, internal, base, isTarget) {
-	if (process$1.noDeprecation) return;
+	if (process2.noDeprecation) return;
 	const pjsonPath = fileURLToPath(packageJsonUrl);
 	const double = doubleSlashRegEx.exec(isTarget ? target$1 : request$1) !== null;
-	process$1.emitWarning(`Use of deprecated ${double ? "double slash" : "leading or trailing slash matching"} resolving "${target$1}" for module request "${request$1}" ${request$1 === match ? "" : `matched to "${match}" `}in the "${internal ? "imports" : "exports"}" field module resolution of the package at ${pjsonPath}${base ? ` imported from ${fileURLToPath(base)}` : ""}.`, "DeprecationWarning", "DEP0166");
+	process2.emitWarning(`Use of deprecated ${double ? "double slash" : "leading or trailing slash matching"} resolving "${target$1}" for module request "${request$1}" ${request$1 === match ? "" : `matched to "${match}" `}in the "${internal ? "imports" : "exports"}" field module resolution of the package at ${pjsonPath}${base ? ` imported from ${fileURLToPath(base)}` : ""}.`, "DeprecationWarning", "DEP0166");
 }
 /**
 * @param {URL} url
@@ -13295,13 +13304,13 @@ function emitInvalidSegmentDeprecation(target$1, request$1, match, packageJsonUr
 * @returns {void}
 */
 function emitLegacyIndexDeprecation(url, packageJsonUrl, base, main) {
-	if (process$1.noDeprecation) return;
+	if (process2.noDeprecation) return;
 	if (defaultGetFormatWithoutErrors(url, { parentURL: base.href }) !== "module") return;
 	const urlPath = fileURLToPath(url.href);
 	const packagePath = fileURLToPath(new URL$1(".", packageJsonUrl));
 	const basePath = fileURLToPath(base);
-	if (!main) process$1.emitWarning(`No "main" or "exports" field defined in the package.json for ${packagePath} resolving the main entry point "${urlPath.slice(packagePath.length)}", imported from ${basePath}.\nDefault "index" lookups for the main are deprecated for ES modules.`, "DeprecationWarning", "DEP0151");
-	else if (path4.resolve(packagePath, main) !== urlPath) process$1.emitWarning(`Package ${packagePath} has a "main" field set to "${main}", excluding the full filename and extension to the resolved file at "${urlPath.slice(packagePath.length)}", imported from ${basePath}.\n Automatic extension resolution of the "main" field is deprecated for ES modules.`, "DeprecationWarning", "DEP0151");
+	if (!main) process2.emitWarning(`No "main" or "exports" field defined in the package.json for ${packagePath} resolving the main entry point "${urlPath.slice(packagePath.length)}", imported from ${basePath}.\nDefault "index" lookups for the main are deprecated for ES modules.`, "DeprecationWarning", "DEP0151");
+	else if (path4.resolve(packagePath, main) !== urlPath) process2.emitWarning(`Package ${packagePath} has a "main" field set to "${main}", excluding the full filename and extension to the resolved file at "${urlPath.slice(packagePath.length)}", imported from ${basePath}.\n Automatic extension resolution of the "main" field is deprecated for ES modules.`, "DeprecationWarning", "DEP0151");
 }
 /**
 * @param {string} path
@@ -13601,11 +13610,11 @@ function isConditionalExportsMainSugar(exports$1, packageJsonUrl, base) {
 * @param {URL} base
 */
 function emitTrailingSlashPatternDeprecation(match, pjsonUrl, base) {
-	if (process$1.noDeprecation) return;
+	if (process2.noDeprecation) return;
 	const pjsonPath = fileURLToPath(pjsonUrl);
 	if (emittedPackageWarnings.has(pjsonPath + "|" + match)) return;
 	emittedPackageWarnings.add(pjsonPath + "|" + match);
-	process$1.emitWarning(`Use of deprecated trailing slash pattern mapping "${match}" in the "exports" field module resolution of the package at ${pjsonPath}${base ? ` imported from ${fileURLToPath(base)}` : ""}. Mapping specifiers ending in "/" is no longer supported.`, "DeprecationWarning", "DEP0155");
+	process2.emitWarning(`Use of deprecated trailing slash pattern mapping "${match}" in the "exports" field module resolution of the package at ${pjsonPath}${base ? ` imported from ${fileURLToPath(base)}` : ""}. Mapping specifiers ending in "/" is no longer supported.`, "DeprecationWarning", "DEP0155");
 }
 /**
 * @param {URL} packageJsonUrl
@@ -14035,11 +14044,6 @@ function hasNodeJsCompat(workerConfig) {
 function hasNodeJsAls(workerConfig) {
 	return workerConfig !== void 0 && getNodeCompat(workerConfig.compatibility_date, workerConfig.compatibility_flags ?? []).mode === "als";
 }
-/**
-* All the Node.js modules including their `node:...` aliases.
-*/
-const nodeJsBuiltins = new Set([...builtinModules, ...builtinModules.map((m) => `node:${m}`)]);
-const NODEJS_MODULES_RE = /* @__PURE__ */ new RegExp(`^(node:)?(${builtinModules.join("|")})$`);
 function isNodeAlsModule(modulePath) {
 	return /^(?:node:)?async_hooks$/.test(modulePath);
 }
@@ -21420,6 +21424,22 @@ const defaultConditions = [
 	"browser"
 ];
 const target = "es2024";
+const rollupOptions = {
+	input: { [MAIN_ENTRY_NAME]: VIRTUAL_WORKER_ENTRY },
+	preserveEntrySignatures: "strict"
+};
+const resolveExtensions = [
+	".mjs",
+	".js",
+	".mts",
+	".ts",
+	".jsx",
+	".tsx",
+	".json",
+	".cjs",
+	".cts",
+	".ctx"
+];
 function createCloudflareEnvironmentOptions({ workerConfig, userConfig, mode, environmentName, isEntryWorker, hasNodeJsCompat: hasNodeJsCompat$1 }) {
 	const define$1 = getProcessEnvReplacements(hasNodeJsCompat$1, mode);
 	return {
@@ -21442,35 +21462,34 @@ function createCloudflareEnvironmentOptions({ workerConfig, userConfig, mode, en
 			outDir: getOutputDirectory(userConfig, environmentName),
 			copyPublicDir: false,
 			ssr: true,
-			rollupOptions: {
-				input: { [MAIN_ENTRY_NAME]: VIRTUAL_WORKER_ENTRY },
-				preserveEntrySignatures: "strict",
-				..."rolldownVersion" in vite ? { platform: "neutral" } : {}
-			}
+			...isRolldown ? { rolldownOptions: {
+				...rollupOptions,
+				platform: "neutral",
+				resolve: { extensions: resolveExtensions }
+			} } : { rollupOptions }
 		},
 		optimizeDeps: {
 			noDiscovery: false,
 			ignoreOutdatedRequests: true,
 			entries: vite.normalizePath(workerConfig.main),
 			exclude: [...cloudflareBuiltInModules],
-			esbuildOptions: {
+			...isRolldown ? { rolldownOptions: {
+				platform: "neutral",
+				resolve: {
+					conditionNames: [...defaultConditions, "development"],
+					extensions: resolveExtensions
+				},
+				transform: {
+					target,
+					define: define$1
+				}
+			} } : { esbuildOptions: {
 				platform: "neutral",
-				target,
 				conditions: [...defaultConditions, "development"],
-				resolveExtensions: [
-					".mjs",
-					".js",
-					".mts",
-					".ts",
-					".jsx",
-					".tsx",
-					".json",
-					".cjs",
-					".cts",
-					".ctx"
-				],
+				resolveExtensions,
+				target,
 				define: define$1
-			}
+			} }
 		},
 		keepProcessEnv: true
 	};
@@ -22099,17 +22118,17 @@ const getQueryString = (params) => {
 	const append = (key, value) => {
 		qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
 	};
-	const process$2 = (key, value) => {
+	const process$1 = (key, value) => {
 		if (isDefined(value)) if (Array.isArray(value)) value.forEach((v) => {
-			process$2(key, v);
+			process$1(key, v);
 		});
 		else if (typeof value === "object") Object.entries(value).forEach(([k, v]) => {
-			process$2(`${key}[${k}]`, v);
+			process$1(`${key}[${k}]`, v);
 		});
 		else append(key, value);
 	};
 	Object.entries(params).forEach(([key, value]) => {
-		process$2(key, value);
+		process$1(key, value);
 	});
 	if (qs.length > 0) return `?${qs.join("&")}`;
 	return "";
@@ -22127,13 +22146,13 @@ const getUrl = (config, options) => {
 const getFormData = (options) => {
 	if (options.formData) {
 		const formData = new FormData();
-		const process$2 = async (key, value) => {
+		const process$1 = async (key, value) => {
 			if (isString(value)) formData.append(key, value);
 			else formData.append(key, JSON.stringify(value));
 		};
 		Object.entries(options.formData).filter(([_, value]) => isDefined(value)).forEach(([key, value]) => {
-			if (Array.isArray(value)) value.forEach((v) => process$2(key, v));
-			else process$2(key, value);
+			if (Array.isArray(value)) value.forEach((v) => process$1(key, v));
+			else process$1(key, value);
 		});
 		return formData;
 	}
@@ -23458,7 +23477,16 @@ const nodeJsCompatPlugin = createPlugin("nodejs-compat", (ctx) => {
 			const nodeJsCompat = ctx.getNodeJsCompat(name);
 			if (nodeJsCompat) return {
 				resolve: { builtins: [...nodeJsCompat.externals] },
-				optimizeDeps: { exclude: [...nodeJsBuiltins] }
+				optimizeDeps: { exclude: [
+					...nonPrefixedNodeModules,
+					...nonPrefixedNodeModules.map((module$2) => `node:${module$2}`),
+					...[
+						"node:sea",
+						"node:sqlite",
+						"node:test",
+						"node:test/reporters"
+					]
+				] }
 			};
 		},
 		applyToEnvironment(environment) {
@@ -23509,15 +23537,35 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 	exitCallback$1 = () => {
 		for (const nodeJsCompatWarnings of nodeJsCompatWarningsMap.values()) nodeJsCompatWarnings.renderWarnings();
 	};
+	function resolveId(environmentName, source, importer) {
+		const workerConfig = ctx.getWorkerConfig(environmentName);
+		const nodeJsCompat = ctx.getNodeJsCompat(environmentName);
+		if (workerConfig && !nodeJsCompat) {
+			if (hasNodeJsAls(workerConfig) && isNodeAlsModule(source)) return;
+			const nodeJsCompatWarnings = nodeJsCompatWarningsMap.get(workerConfig);
+			if (source.startsWith("node:") || nonPrefixedNodeModules.includes(source)) {
+				nodeJsCompatWarnings?.registerImport(source, importer);
+				return {
+					id: source,
+					external: true
+				};
+			}
+		}
+	}
 	return {
 		enforce: "pre",
 		configEnvironment(environmentName) {
 			const workerConfig = ctx.getWorkerConfig(environmentName);
 			const nodeJsCompat = ctx.getNodeJsCompat(environmentName);
-			if (workerConfig && !nodeJsCompat) return { optimizeDeps: { esbuildOptions: { plugins: [{
+			if (workerConfig && !nodeJsCompat) return { optimizeDeps: { ...isRolldown ? { rolldownOptions: { plugins: [{
+				name: "vite-plugin-cloudflare:nodejs-compat-warnings-resolver",
+				resolveId(source, importer) {
+					return resolveId(environmentName, source, importer);
+				}
+			}] } } : { esbuildOptions: { plugins: [{
 				name: "vite-plugin-cloudflare:nodejs-compat-warnings-resolver",
 				setup(build) {
-					build.onResolve({ filter: NODEJS_MODULES_RE }, ({ path, importer }) => {
+					build.onResolve({ filter: /* @__PURE__ */ new RegExp(`^(${nonPrefixedNodeModules.join("|")}|node:.+)$`) }, ({ path, importer }) => {
 						if (hasNodeJsAls(workerConfig) && isNodeAlsModule(path)) return;
 						nodeJsCompatWarningsMap.get(workerConfig)?.registerImport(path, importer);
 						return {
@@ -23526,7 +23574,7 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 						};
 					});
 				}
-			}] } } };
+			}] } } } };
 		},
 		configResolved(resolvedViteConfig) {
 			for (const environmentName of Object.keys(resolvedViteConfig.environments)) {
@@ -23535,20 +23583,11 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 				if (workerConfig && !nodeJsCompat) nodeJsCompatWarningsMap.set(workerConfig, new NodeJsCompatWarnings(environmentName, resolvedViteConfig));
 			}
 		},
+		applyToEnvironment(environment) {
+			return ctx.getWorkerConfig(environment.name) !== void 0 && !ctx.getNodeJsCompat(environment.name);
+		},
 		async resolveId(source, importer) {
-			const workerConfig = ctx.getWorkerConfig(this.environment.name);
-			const nodeJsCompat = ctx.getNodeJsCompat(this.environment.name);
-			if (workerConfig && !nodeJsCompat) {
-				if (hasNodeJsAls(workerConfig) && isNodeAlsModule(source)) return;
-				const nodeJsCompatWarnings = nodeJsCompatWarningsMap.get(workerConfig);
-				if (nodeJsBuiltins.has(source)) {
-					nodeJsCompatWarnings?.registerImport(source, importer);
-					return {
-						id: source,
-						external: true
-					};
-				}
-			}
+			return resolveId(this.environment.name, source, importer);
 		}
 	};
 });