@cloudflare/vite-plugin 1.20.1 → 1.20.2

package/dist/index.mjs

@@ -15,7 +15,7 @@ import { URL as URL$1, fileURLToPath, pathToFileURL } from "node:url";
 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
@@ -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.`);
@@ -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,13 +21424,24 @@ 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 isRolldown = "rolldownVersion" in vite;
 	const define$1 = getProcessEnvReplacements(hasNodeJsCompat$1, mode);
-	const rollupOptions = {
-		input: { [MAIN_ENTRY_NAME]: VIRTUAL_WORKER_ENTRY },
-		preserveEntrySignatures: "strict"
-	};
 	return {
 		resolve: {
 			noExternal: true,
@@ -21449,7 +21464,8 @@ function createCloudflareEnvironmentOptions({ workerConfig, userConfig, mode, en
 			ssr: true,
 			...isRolldown ? { rolldownOptions: {
 				...rollupOptions,
-				platform: "neutral"
+				platform: "neutral",
+				resolve: { extensions: resolveExtensions }
 			} } : { rollupOptions }
 		},
 		optimizeDeps: {
@@ -21461,18 +21477,7 @@ function createCloudflareEnvironmentOptions({ workerConfig, userConfig, mode, en
 				platform: "neutral",
 				resolve: {
 					conditionNames: [...defaultConditions, "development"],
-					extensions: [
-						".mjs",
-						".js",
-						".mts",
-						".ts",
-						".jsx",
-						".tsx",
-						".json",
-						".cjs",
-						".cts",
-						".ctx"
-					]
+					extensions: resolveExtensions
 				},
 				transform: {
 					target,
@@ -21480,20 +21485,9 @@ function createCloudflareEnvironmentOptions({ workerConfig, userConfig, mode, en
 				}
 			} } : { esbuildOptions: {
 				platform: "neutral",
-				target,
 				conditions: [...defaultConditions, "development"],
-				resolveExtensions: [
-					".mjs",
-					".js",
-					".mts",
-					".ts",
-					".jsx",
-					".tsx",
-					".json",
-					".cjs",
-					".cts",
-					".ctx"
-				],
+				resolveExtensions,
+				target,
 				define: define$1
 			} }
 		},
@@ -23483,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) {
@@ -23540,7 +23543,7 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 		if (workerConfig && !nodeJsCompat) {
 			if (hasNodeJsAls(workerConfig) && isNodeAlsModule(source)) return;
 			const nodeJsCompatWarnings = nodeJsCompatWarningsMap.get(workerConfig);
-			if (nodeJsBuiltins.has(source)) {
+			if (source.startsWith("node:") || nonPrefixedNodeModules.includes(source)) {
 				nodeJsCompatWarnings?.registerImport(source, importer);
 				return {
 					id: source,
@@ -23554,7 +23557,7 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 		configEnvironment(environmentName) {
 			const workerConfig = ctx.getWorkerConfig(environmentName);
 			const nodeJsCompat = ctx.getNodeJsCompat(environmentName);
-			if (workerConfig && !nodeJsCompat) return { optimizeDeps: { ..."rolldownVersion" in vite ? { rolldownOptions: { 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);
@@ -23562,7 +23565,7 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 			}] } } : { 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 {
@@ -23580,6 +23583,9 @@ 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) {
 			return resolveId(this.environment.name, source, importer);
 		}