trigger.dev 3.0.0-beta.33 → 3.0.0-beta.34

package/dist/index.js

@@ -799,7 +799,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "3.0.0-beta.33";
+var version = "3.0.0-beta.34";
 var dependencies = {
   "@anatine/esbuild-decorators": "^0.2.19",
   "@clack/prompts": "^0.7.0",
@@ -816,7 +816,7 @@ var dependencies = {
   "@opentelemetry/sdk-trace-base": "^1.22.0",
   "@opentelemetry/sdk-trace-node": "^1.22.0",
   "@opentelemetry/semantic-conventions": "^1.22.0",
-  "@trigger.dev/core": "workspace:3.0.0-beta.33",
+  "@trigger.dev/core": "workspace:3.0.0-beta.34",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -948,7 +948,8 @@ import {
   InitializeDeploymentResponseBody,
   GetDeploymentResponseBody,
   GetProjectsResponseBody,
-  GetProjectResponseBody
+  GetProjectResponseBody,
+  EnvironmentVariableResponseBody
 } from "@trigger.dev/core/v3";
 var CliApiClient = class {
   constructor(apiURL, accessToken) {
@@ -1052,6 +1053,23 @@ var CliApiClient = class {
       }
     );
   }
+  async importEnvVars(projectRef, slug, params) {
+    if (!this.accessToken) {
+      throw new Error("importEnvVars: No access token");
+    }
+    return zodfetch(
+      EnvironmentVariableResponseBody,
+      `${this.apiURL}/api/v1/projects/${projectRef}/envvars/${slug}/import`,
+      {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${this.accessToken}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(params)
+      }
+    );
+  }
   async initializeDeployment(body) {
     if (!this.accessToken) {
       throw new Error("initializeDeployment: No access token");
@@ -1710,7 +1728,15 @@ async function readConfig(dir, options) {
         cwd: absoluteDir,
         tsx: false,
         force: false
-      })
+      }),
+      {
+        name: "native-node-modules",
+        setup(build3) {
+          const opts = build3.initialOptions;
+          opts.loader = opts.loader || {};
+          opts.loader[".node"] = "copy";
+        }
+      }
     ]
   });
   try {
@@ -1723,7 +1749,8 @@ async function readConfig(dir, options) {
     return {
       status: "file",
       config: await resolveConfig(absoluteDir, config),
-      path: configPath
+      path: configPath,
+      module: userConfigModule
     };
   } catch (error) {
     return {
@@ -2302,14 +2329,14 @@ var baseOpen = async (options) => {
   }
   const subprocess = childProcess.spawn(command, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode > 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve5(subprocess);
+        resolve6(subprocess);
       });
     });
   }
@@ -2426,7 +2453,7 @@ var decorateErrorWithCounts = (error, attemptNumber, options) => {
   return error;
 };
 async function pRetry(input, options) {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     options = {
       onFailedAttempt() {
       },
@@ -2449,7 +2476,7 @@ async function pRetry(input, options) {
       try {
         const result = await input(attemptNumber);
         cleanUp();
-        resolve5(result);
+        resolve6(result);
       } catch (error) {
         try {
           if (!(error instanceof Error)) {
@@ -3832,6 +3859,46 @@ async function getPackageJson(absoluteProjectPath) {
   return { packageJson, readonlyPackageJson, packageJsonPath };
 }
 
+// src/utilities/resolveEnvVars.ts
+async function callResolveEnvVars(configModule, env, environment, projectRef) {
+  if (configModule && configModule.resolveEnvVars && typeof configModule.resolveEnvVars === "function") {
+    let resolvedEnvVars2 = {};
+    try {
+      let result = await configModule.resolveEnvVars({
+        projectRef,
+        environment,
+        env
+      });
+      if (!result) {
+        return;
+      }
+      result = await result;
+      if (typeof result === "object" && result !== null && "variables" in result) {
+        const variables = result.variables;
+        if (Array.isArray(variables)) {
+          for (const item of variables) {
+            if (typeof item === "object" && item !== null && "name" in item && "value" in item && typeof item.name === "string" && typeof item.value === "string") {
+              resolvedEnvVars2[item.name] = item.value;
+            }
+          }
+        } else if (typeof variables === "object") {
+          for (const [key, value] of Object.entries(variables)) {
+            if (typeof key === "string" && typeof value === "string") {
+              resolvedEnvVars2[key] = value;
+            }
+          }
+        }
+      }
+      return {
+        variables: resolvedEnvVars2,
+        override: result.override
+      };
+    } catch (error) {
+      logger.error(error);
+    }
+  }
+}
+
 // src/commands/deploy.ts
 var DeployCommandOptions = CommonCommandOptions.extend({
   skipTypecheck: z4.boolean().default(false),
@@ -3981,6 +4048,7 @@ async function _deployCommand(dir, options) {
     resolvedConfig.status === "file" ? resolvedConfig.path : void 0
   );
   logger.debug("Compilation result", { compilation });
+  await resolveEnvironmentVariables(resolvedConfig, environmentClient, options);
   const deploymentResponse = await environmentClient.initializeDeployment({
     contentHash: compilation.contentHash,
     userId: authorization.userId
@@ -4579,7 +4647,9 @@ async function compileProject(config, options, configPath) {
       const workerSetupPath = join6(cliRootPath(), "workers", "prod", "worker-setup.js");
       let workerContents = workerFacade.replace("__TASKS__", createTaskFileImports(taskFiles)).replace(
         "__WORKER_SETUP__",
-        `import { tracingSDK } from "${escapeImportPath(workerSetupPath)}";`
+        `import { tracingSDK, otelTracer, otelLogger } from "${escapeImportPath(
+          workerSetupPath
+        )}";`
       );
       if (configPath) {
         logger.debug("Importing project config from", { configPath });
@@ -4794,6 +4864,68 @@ If this is unexpected you should check your ${terminalLink2(
     }
   });
 }
+async function resolveEnvironmentVariables(config, apiClient2, options) {
+  if (config.status !== "file") {
+    return;
+  }
+  if (!config.module || typeof config.module.resolveEnvVars !== "function") {
+    return;
+  }
+  const projectConfig = config.config;
+  return await tracer.startActiveSpan("resolveEnvironmentVariables", async (span) => {
+    try {
+      const $spinner = spinner();
+      $spinner.start("Resolving environment variables");
+      let processEnv = {
+        ...process.env
+      };
+      const environmentVariables = await apiClient2.getEnvironmentVariables(projectConfig.project);
+      if (environmentVariables.success) {
+        processEnv = {
+          ...processEnv,
+          ...environmentVariables.data.variables
+        };
+      }
+      logger.debug("Existing environment variables", {
+        keys: Object.keys(processEnv)
+      });
+      const resolvedEnvVars2 = await callResolveEnvVars(
+        config.module,
+        processEnv,
+        options.env,
+        projectConfig.project
+      );
+      if (resolvedEnvVars2) {
+        const total = Object.keys(resolvedEnvVars2.variables).length;
+        logger.debug("Resolved env vars", {
+          keys: Object.keys(resolvedEnvVars2.variables)
+        });
+        if (total > 0) {
+          $spinner.message(
+            `Syncing ${total} environment variable${total > 1 ? "s" : ""} with the server`
+          );
+          const uploadResult = await apiClient2.importEnvVars(projectConfig.project, options.env, {
+            variables: resolvedEnvVars2.variables,
+            override: typeof resolvedEnvVars2.override === "boolean" ? resolvedEnvVars2.override : true
+          });
+          if (uploadResult.success) {
+            $spinner.stop(`${total} environment variable${total > 1 ? "s" : ""} synced`);
+          } else {
+            $spinner.stop("Failed to sync environment variables");
+            throw new Error(uploadResult.error);
+          }
+        } else {
+          $spinner.stop("No environment variables to sync");
+        }
+      }
+    } catch (e) {
+      recordSpanException5(span, e);
+      throw e;
+    } finally {
+      span.end();
+    }
+  });
+}
 async function resolveDependencies(projectDir, packageJsonContents, config, options) {
   return await tracer.startActiveSpan("resolveDependencies", async (span) => {
     const resolvingDepsSpinner = spinner();
@@ -4830,10 +4962,29 @@ async function resolveDependencies(projectDir, packageJsonContents, config, opti
       });
       logger.debug(`No cached package-lock.json found for ${digest}`);
       try {
-        await execa2("npm", ["install", "--package-lock-only", "--ignore-scripts", "--no-audit"], {
-          cwd: projectDir,
-          stdio: logger.loggerLevel === "debug" ? "inherit" : "pipe"
-        });
+        if (logger.loggerLevel === "debug") {
+          const childProcess2 = await execa2("npm", ["config", "list"], {
+            cwd: projectDir,
+            stdio: "inherit"
+          });
+          logger.debug("npm config list");
+          console.log(childProcess2.stdout);
+        }
+        await execa2(
+          "npm",
+          [
+            "install",
+            "--package-lock-only",
+            "--ignore-scripts",
+            "--no-audit",
+            "--legacy-peer-deps=false",
+            "--strict-peer-deps=false"
+          ],
+          {
+            cwd: projectDir,
+            stdio: logger.loggerLevel === "debug" ? "inherit" : "pipe"
+          }
+        );
         const packageLockContents = await readFile2(join6(projectDir, "package-lock.json"), "utf-8");
         logger.debug(`Writing package-lock.json to cache for ${digest}`);
         await mkdir(cacheDir, { recursive: true });
@@ -4890,8 +5041,8 @@ async function typecheckProject(config, options) {
       tscTypecheck.stdout?.on("data", (chunk) => stdouts.push(chunk.toString()));
       tscTypecheck.stderr?.on("data", (chunk) => stderrs.push(chunk.toString()));
       try {
-        await new Promise((resolve5, reject) => {
-          tscTypecheck.addListener("exit", (code) => code === 0 ? resolve5(code) : reject(code));
+        await new Promise((resolve6, reject) => {
+          tscTypecheck.addListener("exit", (code) => code === 0 ? resolve6(code) : reject(code));
         });
       } catch (error) {
         typecheckSpinner.stop(
@@ -5137,7 +5288,7 @@ import { ZodMessageHandler, ZodMessageSender } from "@trigger.dev/core/v3/zodMes
 import dotenv from "dotenv";
 import { Evt } from "evt";
 import { fork } from "node:child_process";
-import { dirname as dirname2, resolve as resolve3 } from "node:path";
+import { dirname as dirname2, resolve as resolve4 } from "node:path";
 import terminalLink3 from "terminal-link";
 var BackgroundWorkerCoordinator = class {
   constructor(baseURL) {
@@ -5310,6 +5461,7 @@ var BackgroundWorker = class {
   metadata;
   _taskRunProcesses = /* @__PURE__ */ new Map();
   _closed = false;
+  _fullEnv = {};
   close() {
     if (this._closed) {
       return;
@@ -5332,12 +5484,24 @@ var BackgroundWorker = class {
     }
     let resolved = false;
     const cwd = dirname2(this.path);
-    const fullEnv = {
+    this._fullEnv = {
       ...this.params.env,
-      ...this.#readEnvVars()
+      ...this.#readEnvVars(),
+      ...this.params.debugOtel ? { OTEL_LOG_LEVEL: "debug" } : {}
     };
-    logger.debug("Initializing worker", { path: this.path, cwd, fullEnv });
-    this.tasks = await new Promise((resolve5, reject) => {
+    let resolvedEnvVars2 = {};
+    if (this.params.resolveEnvVariables) {
+      const resolvedEnv = await this.params.resolveEnvVariables(this._fullEnv, this);
+      if (resolvedEnv) {
+        resolvedEnvVars2 = resolvedEnv;
+      }
+    }
+    this._fullEnv = {
+      ...this._fullEnv,
+      ...resolvedEnvVars2
+    };
+    logger.debug("Initializing worker", { path: this.path, cwd, fullEnv: this._fullEnv });
+    this.tasks = await new Promise((resolve6, reject) => {
       const child = fork(this.path, {
         stdio: [
           /*stdin*/
@@ -5349,7 +5513,7 @@ var BackgroundWorker = class {
           "ipc"
         ],
         cwd,
-        env: fullEnv
+        env: this._fullEnv
       });
       const timeout = setTimeout(() => {
         if (resolved) {
@@ -5364,7 +5528,7 @@ var BackgroundWorker = class {
         if (message.type === "TASKS_READY" && !resolved) {
           clearTimeout(timeout);
           resolved = true;
-          resolve5(message.payload.tasks);
+          resolve6(message.payload.tasks);
           child.kill();
         } else if (message.type === "UNCAUGHT_EXCEPTION") {
           clearTimeout(timeout);
@@ -5407,9 +5571,8 @@ var BackgroundWorker = class {
         payload.execution,
         this.path,
         {
-          ...this.params.env,
-          ...payload.environment ?? {},
-          ...this.#readEnvVars()
+          ...this._fullEnv,
+          ...payload.environment ?? {}
         },
         this.metadata,
         this.params
@@ -5499,7 +5662,7 @@ var BackgroundWorker = class {
     const result = {};
     dotenv.config({
       processEnv: result,
-      path: [".env", ".env.local", ".env.development.local"].map((p) => resolve3(process.cwd(), p))
+      path: [".env", ".env.local", ".env.development.local"].map((p) => resolve4(process.cwd(), p))
     });
     process.env.TRIGGER_API_URL && (result.TRIGGER_API_URL = process.env.TRIGGER_API_URL);
     delete result.TRIGGER_API_URL;
@@ -5600,8 +5763,8 @@ var TaskRunProcess = class {
   async executeTaskRun(payload) {
     let resolver;
     let rejecter;
-    const promise = new Promise((resolve5, reject) => {
-      resolver = resolve5;
+    const promise = new Promise((resolve6, reject) => {
+      resolver = resolve6;
       rejecter = reject;
     });
     this._attemptStatuses.set(payload.execution.attempt.id, "PENDING");
@@ -5813,7 +5976,7 @@ async function startDev(dir, options, authorization, dashboardUrl) {
       logger.error("Failed to read config", config.error);
       process.exit(1);
     }
-    async function getDevReactElement(configParam, authorization2, configPath) {
+    async function getDevReactElement(configParam, authorization2, configPath, configModule) {
       const accessToken = authorization2.accessToken;
       const apiUrl = authorization2.apiUrl;
       apiClient = new CliApiClient(apiUrl, accessToken);
@@ -5845,7 +6008,8 @@ async function startDev(dir, options, authorization, dashboardUrl) {
           projectName: devEnv.data.name,
           debuggerOn: options.debugger,
           debugOtel: options.debugOtel,
-          configPath
+          configPath,
+          configModule
         }
       );
     }
@@ -5853,7 +6017,8 @@ async function startDev(dir, options, authorization, dashboardUrl) {
       await getDevReactElement(
         config.config,
         authorization,
-        config.status === "file" ? config.path : void 0
+        config.status === "file" ? config.path : void 0,
+        config.status === "file" ? config.module : void 0
       )
     );
     rerender = devReactElement.rerender;
@@ -5876,7 +6041,8 @@ function useDev({
   projectName,
   debuggerOn,
   debugOtel,
-  configPath
+  configPath,
+  configModule
 }) {
   useEffect(() => {
     const websocketUrl = new URL(apiUrl);
@@ -5965,6 +6131,7 @@ function useDev({
       await messageHandler.handleMessage(data);
     });
     let ctx;
+    let firstBuild = true;
     async function runBuild() {
       if (ctx) {
         await ctx.dispose();
@@ -5976,7 +6143,9 @@ function useDev({
       const workerSetupPath = join7(cliRootPath(), "workers", "dev", "worker-setup.js");
       let entryPointContents = workerFacade.replace("__TASKS__", createTaskFileImports(taskFiles)).replace(
         "__WORKER_SETUP__",
-        `import { tracingSDK, sender } from "${escapeImportPath(workerSetupPath)}";`
+        `import { tracingSDK, otelTracer, otelLogger, sender } from "${escapeImportPath(
+          workerSetupPath
+        )}";`
       );
       if (configPath) {
         configPath = normalize(configPath);
@@ -5993,7 +6162,6 @@ function useDev({
           `const importedConfig = undefined; const handleError = undefined;`
         );
       }
-      let firstBuild = true;
       logger.log(chalkGrey("\u25CB Building background worker\u2026"));
       ctx = await context2({
         stdin: {
@@ -6094,7 +6262,8 @@ function useDev({
                     ...environmentVariablesResponse.success ? environmentVariablesResponse.data.variables : {}
                   },
                   debuggerOn,
-                  debugOtel
+                  debugOtel,
+                  resolveEnvVariables: createResolveEnvironmentVariablesFunction(configModule)
                 });
                 try {
                   await backgroundWorker.initialize();
@@ -6366,6 +6535,26 @@ async function findPnpmNodeModulesPath() {
     { type: "directory" }
   );
 }
+var hasResolvedEnvVars = false;
+var resolvedEnvVars = {};
+function createResolveEnvironmentVariablesFunction(configModule) {
+  return async (env, worker) => {
+    if (hasResolvedEnvVars) {
+      return resolvedEnvVars;
+    }
+    const $resolvedEnvVars = await callResolveEnvVars(
+      configModule,
+      env,
+      "dev",
+      worker.params.projectConfig.project
+    );
+    if ($resolvedEnvVars) {
+      resolvedEnvVars = $resolvedEnvVars.variables;
+      hasResolvedEnvVars = true;
+    }
+    return resolvedEnvVars;
+  };
+}
 
 // src/commands/init.ts
 import { intro as intro5, isCancel as isCancel2, log as log6, outro as outro6, select as select2, text } from "@clack/prompts";
@@ -6374,9 +6563,9 @@ import { flattenAttributes as flattenAttributes4 } from "@trigger.dev/core/v3";
 import { recordSpanException as recordSpanException6 } from "@trigger.dev/core/v3/workers";
 import chalk5 from "chalk";
 import { execa as execa3 } from "execa";
-import { applyEdits, modify } from "jsonc-parser";
+import { applyEdits, modify, findNodeAtLocation, parseTree, getNodeValue } from "jsonc-parser";
 import { writeFile as writeFile3 } from "node:fs/promises";
-import { join as join8, relative as relative4, resolve as resolve4 } from "node:path";
+import { join as join8, relative as relative4, resolve as resolve5 } from "node:path";
 import terminalLink4 from "terminal-link";
 import { z as z6 } from "zod";
 
@@ -6541,7 +6730,7 @@ async function createTriggerDir(dir, options) {
       if (isCancel2(location)) {
         throw new OutroCommandError();
       }
-      const triggerDir = resolve4(process.cwd(), location);
+      const triggerDir = resolve5(process.cwd(), location);
       logger.debug({ triggerDir });
       span.setAttributes({
         "cli.triggerDir": triggerDir
@@ -6596,7 +6785,7 @@ async function createTriggerDir(dir, options) {
 async function gitIgnoreDotTriggerDir(dir, options) {
   return await tracer.startActiveSpan("gitIgnoreDotTriggerDir", async (span) => {
     try {
-      const projectDir = resolve4(process.cwd(), dir);
+      const projectDir = resolve5(process.cwd(), dir);
       const gitIgnorePath = join8(projectDir, ".gitignore");
       span.setAttributes({
         "cli.projectDir": projectDir,
@@ -6630,14 +6819,30 @@ async function gitIgnoreDotTriggerDir(dir, options) {
 async function addConfigFileToTsConfig(dir, options) {
   return await tracer.startActiveSpan("createTriggerDir", async (span) => {
     try {
-      const projectDir = resolve4(process.cwd(), dir);
+      const projectDir = resolve5(process.cwd(), dir);
       const tsconfigPath = join8(projectDir, "tsconfig.json");
       span.setAttributes({
         "cli.projectDir": projectDir,
         "cli.tsconfigPath": tsconfigPath
       });
       const tsconfigContent = await readFile(tsconfigPath);
-      const edits = modify(tsconfigContent, ["include", -1], "trigger.config.ts", {
+      const tsconfigContentTree = parseTree(tsconfigContent, void 0);
+      if (!tsconfigContentTree) {
+        span.end();
+        return;
+      }
+      const tsconfigIncludeOption = findNodeAtLocation(tsconfigContentTree, ["include"]);
+      if (!tsconfigIncludeOption) {
+        span.end();
+        return;
+      }
+      const tsConfigFileName = "trigger.config.ts";
+      const tsconfigIncludeOptionValue = getNodeValue(tsconfigIncludeOption);
+      if (tsconfigIncludeOptionValue.includes(tsConfigFileName)) {
+        span.end();
+        return;
+      }
+      const edits = modify(tsconfigContent, ["include", -1], tsConfigFileName, {
         isArrayInsertion: true,
         formattingOptions: {
           tabSize: 2,
@@ -6664,7 +6869,7 @@ async function installPackages2(dir, options) {
   return await tracer.startActiveSpan("installPackages", async (span) => {
     const installSpinner = spinner();
     try {
-      const projectDir = resolve4(process.cwd(), dir);
+      const projectDir = resolve5(process.cwd(), dir);
       const pkgManager = await getUserPackageManager(projectDir);
       span.setAttributes({
         "cli.projectDir": projectDir,
@@ -6716,7 +6921,7 @@ async function writeConfigFile(dir, project, options, triggerDir) {
     try {
       const spnnr = spinner();
       spnnr.start("Creating config file");
-      const projectDir = resolve4(process.cwd(), dir);
+      const projectDir = resolve5(process.cwd(), dir);
       const templatePath = join8(cliRootPath(), "templates", "trigger.config.ts.template");
       const outputPath = join8(projectDir, "trigger.config.ts");
       span.setAttributes({