Strip empty string env vars so they accidentally override real values

Author: ericallam

packages/cli-v3/src/dev/workerRuntime.ts

@@ -232,10 +232,20 @@ class DevWorkerRuntime implements WorkerRuntime {
     const dotEnvVars = resolveDotEnvVars();
     const OTEL_IMPORT_HOOK_INCLUDES = getInstrumentedPackageNames(this.options.config).join(",");
 
+    const stripEmptyValues = (obj: Record<string, string | undefined>) => {
+      return Object.fromEntries(
+        Object.entries(obj).filter(([, value]) =>
+          typeof value === "string" ? !!value.trim() : !!value
+        )
+      );
+    };
+
     return {
-      ...processEnv,
-      ...(environmentVariablesResponse.success ? environmentVariablesResponse.data.variables : {}),
-      ...dotEnvVars,
+      ...stripEmptyValues(processEnv),
+      ...stripEmptyValues(
+        environmentVariablesResponse.success ? environmentVariablesResponse.data.variables : {}
+      ),
+      ...stripEmptyValues(dotEnvVars),
       TRIGGER_API_URL: this.options.client.apiURL,
       TRIGGER_SECRET_KEY: this.options.client.accessToken!,
       OTEL_EXPORTER_OTLP_COMPRESSION: "none",

packages/cli-v3/src/utilities/dotEnv.ts

@@ -2,14 +2,14 @@ import dotenv from "dotenv";
 import { resolve } from "node:path";
 import { env } from "std-env";
 
+const ENVVAR_FILES = [".env", ".env.development", ".env.local", ".env.development.local"];
+
 export function resolveDotEnvVars(cwd?: string) {
   const result: { [key: string]: string } = {};
 
   dotenv.config({
     processEnv: result,
-    path: [".env", ".env.local", ".env.development.local"].map((p) =>
-      resolve(cwd ?? process.cwd(), p)
-    ),
+    path: ENVVAR_FILES.map((p) => resolve(cwd ?? process.cwd(), p)),
   });
 
   env.TRIGGER_API_URL && (result.TRIGGER_API_URL = env.TRIGGER_API_URL);
@@ -23,8 +23,6 @@ export function resolveDotEnvVars(cwd?: string) {
 
 export function loadDotEnvVars(cwd?: string) {
   dotenv.config({
-    path: [".env", ".env.local", ".env.development.local"].map((p) =>
-      resolve(cwd ?? process.cwd(), p)
-    ),
+    path: ENVVAR_FILES.map((p) => resolve(cwd ?? process.cwd(), p)),
   });
 }