move the workerd resolve.conditions setting to the env level (and…

… add missing defaults)
flarelabs-net · Nov 7, 2024 · 6b077cc · 6b077cc
1 parent cd6d5fa
commit 6b077cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/vite-plugin-cloudflare/src/cloudflare-environment.ts b/packages/vite-plugin-cloudflare/src/cloudflare-environment.ts
@@ -135,6 +135,8 @@ export function createCloudflareEnvironmentOptions(
 				// Note: in order for ssr pre-bundling to take effect we need to ask vite to treat all
 				//       dependencies as not external
 				noExternal: true,
+				// We want to use `workerd` package exports if available (e.g. for postgres).
+				conditions: ['workerd', 'module', 'browser', 'development|production'],
 			},
 			dev: {
 				createEnvironment(name, config) {

diff --git a/packages/vite-plugin-cloudflare/src/index.ts b/packages/vite-plugin-cloudflare/src/index.ts
@@ -33,8 +33,6 @@ export function cloudflare<T extends Record<string, WorkerOptions>>(
 			return {
 				resolve: {
 					alias: getNodeCompatAliases(),
-					// We want to use `workerd` package exports if available (e.g. for postgres).
-					conditions: ['workerd'],
 				},
 				appType: 'custom',
 				builder: {