Improve the name of the resolvEnvVars function and move setting NODE_ENV into the dev supervisor

Author: ericallam

packages/cli-v3/src/commands/deploy.ts

@@ -36,7 +36,7 @@ import { login } from "./login.js";
 import { updateTriggerPackages } from "./update.js";
 import { setGithubActionsOutputAndEnvVars } from "../utilities/githubActions.js";
 import { isDirectory } from "../utilities/fileSystem.js";
-import { resolveEnvVars } from "../utilities/envVars.js";
+import { resolveLocalEnvVars } from "../utilities/localEnvVars.js";
 
 const DeployCommandOptions = CommonCommandOptions.extend({
   dryRun: z.boolean().default(false),
@@ -208,7 +208,7 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     }
   }
 
-  const envVars = resolveEnvVars(options.envFile);
+  const envVars = resolveLocalEnvVars(options.envFile);
 
   if (envVars.TRIGGER_PROJECT_REF) {
     logger.debug("Using project ref from env", { ref: envVars.TRIGGER_PROJECT_REF });

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

@@ -6,7 +6,7 @@ import { watchConfig } from "../config.js";
 import { DevSessionInstance, startDevSession } from "../dev/devSession.js";
 import { createLockFile } from "../dev/lock.js";
 import { chalkError } from "../utilities/cliOutput.js";
-import { resolveEnvVars } from "../utilities/envVars.js";
+import { resolveLocalEnvVars } from "../utilities/localEnvVars.js";
 import { printDevBanner, printStandloneInitialBanner } from "../utilities/initialBanner.js";
 import { logger } from "../utilities/logger.js";
 import { runtimeChecks } from "../utilities/runtimeCheck.js";
@@ -128,7 +128,7 @@ async function startDev(options: StartDevOptions) {
 
     printDevBanner(displayedUpdateMessage);
 
-    const envVars = resolveEnvVars(options.envFile);
+    const envVars = resolveLocalEnvVars(options.envFile);
 
     if (envVars.TRIGGER_PROJECT_REF) {
       logger.debug("Using project ref from env", { ref: envVars.TRIGGER_PROJECT_REF });

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

@@ -10,7 +10,6 @@ import {
 import { ResolvedConfig } from "@trigger.dev/core/v3/build";
 import { CliApiClient } from "../apiClient.js";
 import { DevCommandOptions } from "../commands/dev.js";
-import { resolveDotEnvVars } from "../utilities/dotEnv.js";
 import { eventBus } from "../utilities/eventBus.js";
 import { logger } from "../utilities/logger.js";
 import { sanitizeEnvVars } from "../utilities/sanitizeEnvVars.js";
@@ -25,7 +24,7 @@ import {
   WorkerServerToClientEvents,
 } from "@trigger.dev/core/v3/workers";
 import pLimit from "p-limit";
-import { resolveEnvVars } from "../utilities/envVars.js";
+import { resolveLocalEnvVars } from "../utilities/localEnvVars.js";
 
 export type WorkerRuntimeOptions = {
   name: string | undefined;
@@ -378,10 +377,11 @@ class DevSupervisor implements WorkerRuntime {
     );
 
     return {
-      ...resolveEnvVars(
+      ...resolveLocalEnvVars(
         this.options.args.envFile,
         environmentVariablesResponse.success ? environmentVariablesResponse.data.variables : {}
       ),
+      NODE_ENV: "development",
       TRIGGER_API_URL: this.options.client.apiURL,
       TRIGGER_SECRET_KEY: this.options.client.accessToken!,
       OTEL_EXPORTER_OTLP_COMPRESSION: "none",

packages/cli-v3/src/utilities/envVars.ts renamed to packages/cli-v3/src/utilities/localEnvVars.ts

@@ -1,7 +1,10 @@
 import { resolveDotEnvVars } from "./dotEnv.js";
 import { sanitizeEnvVars } from "./sanitizeEnvVars.js";
 
-export function resolveEnvVars(envFile?: string, additionalVariables?: Record<string, string>) {
+export function resolveLocalEnvVars(
+  envFile?: string,
+  additionalVariables?: Record<string, string>
+) {
   const processEnv = gatherProcessEnv();
   const dotEnvVars = resolveDotEnvVars(undefined, envFile);
 
@@ -15,7 +18,6 @@ export function resolveEnvVars(envFile?: string, additionalVariables?: Record<st
 function gatherProcessEnv() {
   const $env = {
     ...process.env,
-    NODE_ENV: "development",
   };
 
   // Filter out undefined values