trigger.dev 3.0.0-beta.36 → 3.0.0-beta.38

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.36";
+var version = "3.0.0-beta.38";
 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.36",
+  "@trigger.dev/core": "workspace:3.0.0-beta.38",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -913,7 +913,7 @@ var package_default = {
     tsup: "^8.0.1",
     "type-fest": "^3.6.0",
     typescript: "^5.3.3",
-    vitest: "^0.34.4",
+    vitest: "^1.6.0",
     "xdg-app-paths": "^8.3.0"
   },
   scripts: {
@@ -928,7 +928,8 @@ var package_default = {
     "dev:test": "nodemon -w src/Containerfile.prod -x npm run build:prod-containerfile",
     clean: "rimraf dist",
     start: "node dist/index.js",
-    test: "vitest"
+    test: "vitest",
+    "test:e2e": "vitest --run -c e2e/vite.config.js"
   },
   dependencies,
   engines: {
@@ -1185,55 +1186,6 @@ import {
   SEMRESATTRS_SERVICE_NAME,
   SEMRESATTRS_SERVICE_VERSION
 } from "@opentelemetry/semantic-conventions";
-function initializeTracing() {
-  if (process.argv.includes("--skip-telemetry") || process.env.TRIGGER_DEV_SKIP_TELEMETRY) {
-    return;
-  }
-  if (process.env.OTEL_INTERNAL_DIAG_DEBUG) {
-    diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
-  }
-  const resource = detectResourcesSync({
-    detectors: [processDetectorSync]
-  }).merge(
-    new Resource({
-      [SEMRESATTRS_SERVICE_NAME]: "trigger.dev cli v3",
-      [SEMRESATTRS_SERVICE_VERSION]: version
-    })
-  );
-  const traceProvider = new NodeTracerProvider({
-    forceFlushTimeoutMillis: 500,
-    resource,
-    spanLimits: {
-      attributeCountLimit: 1e3,
-      attributeValueLengthLimit: 1e3,
-      eventCountLimit: 100,
-      attributePerEventCountLimit: 100,
-      linkCountLimit: 10,
-      attributePerLinkCountLimit: 100
-    }
-  });
-  const spanExporter = new OTLPTraceExporter({
-    url: "https://otel.baselime.io/v1",
-    timeoutMillis: 5e3,
-    headers: {
-      "x-api-key": "b6e0fbbaf8dc2524773d2152ae2e9eb5c7fbaa52"
-    }
-  });
-  const spanProcessor = new SimpleSpanProcessor(spanExporter);
-  traceProvider.addSpanProcessor(spanProcessor);
-  traceProvider.register();
-  registerInstrumentations({
-    instrumentations: [new FetchInstrumentation()]
-  });
-  return traceProvider;
-}
-var provider = initializeTracing();
-function getTracer() {
-  return trace.getTracer("trigger.dev cli v3", version);
-}
-
-// src/cli/common.ts
-import { fromZodError } from "zod-validation-error";
 
 // src/utilities/logger.ts
 import { format } from "node:util";
@@ -1348,7 +1300,58 @@ var Logger = class {
 };
 var logger = new Logger();
 
+// src/telemetry/tracing.ts
+function initializeTracing() {
+  if (process.argv.includes("--skip-telemetry") || process.env.TRIGGER_DEV_SKIP_TELEMETRY || // only for backwards compat
+  process.env.TRIGGER_TELEMETRY_DISABLED) {
+    logger.debug("\u{1F4C9} Telemetry disabled");
+    return;
+  }
+  if (process.env.OTEL_INTERNAL_DIAG_DEBUG) {
+    diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
+  }
+  const resource = detectResourcesSync({
+    detectors: [processDetectorSync]
+  }).merge(
+    new Resource({
+      [SEMRESATTRS_SERVICE_NAME]: "trigger.dev cli v3",
+      [SEMRESATTRS_SERVICE_VERSION]: version
+    })
+  );
+  const traceProvider = new NodeTracerProvider({
+    forceFlushTimeoutMillis: 3e4,
+    resource,
+    spanLimits: {
+      attributeCountLimit: 1e3,
+      attributeValueLengthLimit: 1e3,
+      eventCountLimit: 100,
+      attributePerEventCountLimit: 100,
+      linkCountLimit: 10,
+      attributePerLinkCountLimit: 100
+    }
+  });
+  const spanExporter = new OTLPTraceExporter({
+    url: "https://otel.baselime.io/v1",
+    timeoutMillis: 5e3,
+    headers: {
+      "x-api-key": "b6e0fbbaf8dc2524773d2152ae2e9eb5c7fbaa52"
+    }
+  });
+  const spanProcessor = new SimpleSpanProcessor(spanExporter);
+  traceProvider.addSpanProcessor(spanProcessor);
+  traceProvider.register();
+  registerInstrumentations({
+    instrumentations: [new FetchInstrumentation()]
+  });
+  return traceProvider;
+}
+var provider = initializeTracing();
+function getTracer() {
+  return trace.getTracer("trigger.dev cli v3", version);
+}
+
 // src/cli/common.ts
+import { fromZodError } from "zod-validation-error";
 import { outro } from "@clack/prompts";
 
 // src/utilities/cliOutput.ts
@@ -1600,8 +1603,8 @@ async function gatherTaskFilesFromDir(dirPath, triggerDir, config) {
   }
   return taskFiles;
 }
-function resolveTriggerDirectories(dirs) {
-  return dirs.map((dir) => resolve(dir));
+function resolveTriggerDirectories(projectDir, dirs) {
+  return dirs.map((dir) => resolve(projectDir, dir));
 }
 var IGNORED_DIRS = ["node_modules", ".git", "dist", "build"];
 async function findTriggerDirectories(dirPath) {
@@ -1701,7 +1704,7 @@ async function findFilePath(dir, fileName) {
   return result;
 }
 async function readConfig(dir, options) {
-  const absoluteDir = path2.resolve(process.cwd(), dir);
+  const absoluteDir = path2.resolve(options?.cwd || process.cwd(), dir);
   const configPath = await getConfigPath(dir, options?.configFile);
   if (!configPath) {
     if (options?.projectRef) {
@@ -1774,7 +1777,7 @@ async function resolveConfig(path7, config) {
   if (!config.triggerDirectories) {
     config.triggerDirectories = await findTriggerDirectories(path7);
   }
-  config.triggerDirectories = resolveTriggerDirectories(config.triggerDirectories);
+  config.triggerDirectories = resolveTriggerDirectories(path7, config.triggerDirectories);
   logger.debug("Resolved trigger directories", { triggerDirectories: config.triggerDirectories });
   if (!config.triggerUrl) {
     config.triggerUrl = CLOUD_API_URL;
@@ -2680,7 +2683,7 @@ async function login(options) {
       if (accessTokenFromEnv) {
         const auth = {
           accessToken: accessTokenFromEnv,
-          apiUrl: process.env.TRIGGER_API_URL ?? "https://api.trigger.dev"
+          apiUrl: process.env.TRIGGER_API_URL ?? opts.defaultApiUrl ?? "https://api.trigger.dev"
         };
         const apiClient3 = new CliApiClient(auth.apiUrl, auth.accessToken);
         const userData = await apiClient3.whoAmI();
@@ -3941,7 +3944,7 @@ function configureDeployCommand(program2) {
   ).addOption(
     new CommandOption(
       "--self-hosted",
-      "Build and load the image using your local Docker. Use the --registry option to specify the registry to push the image to when using --self-hosted, or just use --push-image to push to the default registry."
+      "Build and load the image using your local Docker. Use the --registry option to specify the registry to push the image to when using --self-hosted, or just use --push to push to the default registry."
     ).hideHelp()
   ).addOption(
     new CommandOption(
@@ -4244,6 +4247,10 @@ ${authorization.error}`
           logESMRequireError(parsedError, resolvedConfig);
         }
         await preExitTasks();
+        if (finishedDeployment.errorData.stderr) {
+          log5.error(`Error logs:
+${finishedDeployment.errorData.stderr}`);
+        }
         throw new SkipLoggingError(
           `Deployment encountered an error: ${finishedDeployment.errorData.name}`
         );
@@ -4647,7 +4654,7 @@ async function compileProject(config, options, configPath) {
   return await tracer.startActiveSpan("compileProject", async (span) => {
     try {
       if (!options.skipTypecheck) {
-        const typecheck = await typecheckProject(config, options);
+        const typecheck = await typecheckProject(config);
         if (!typecheck) {
           throw new Error("Typecheck failed, aborting deployment");
         }
@@ -4845,8 +4852,7 @@ If this is unexpected you should check your ${terminalLink2(
       const resolvingDependenciesResult = await resolveDependencies(
         tempDir,
         packageJsonContents,
-        config,
-        options
+        config
       );
       if (!resolvingDependenciesResult) {
         throw new SkipLoggingError("Failed to resolve dependencies");
@@ -4925,14 +4931,17 @@ async function resolveEnvironmentVariables(config, apiClient2, options) {
           });
           if (uploadResult.success) {
             $spinner.stop(`${total} environment variable${total > 1 ? "s" : ""} synced`);
+            return;
           } else {
             $spinner.stop("Failed to sync environment variables");
             throw new Error(uploadResult.error);
           }
         } else {
           $spinner.stop("No environment variables to sync");
+          return;
         }
       }
+      $spinner.stop("Environment variables resolved");
     } catch (e) {
       recordSpanException5(span, e);
       throw e;
@@ -4941,7 +4950,7 @@ async function resolveEnvironmentVariables(config, apiClient2, options) {
     }
   });
 }
-async function resolveDependencies(projectDir, packageJsonContents, config, options) {
+async function resolveDependencies(projectDir, packageJsonContents, config) {
   return await tracer.startActiveSpan("resolveDependencies", async (span) => {
     const resolvingDepsSpinner = spinner();
     resolvingDepsSpinner.start("Resolving dependencies");
@@ -5043,7 +5052,7 @@ ${chalkError("X Error:")} The package ${chalkPurple(
     }
   });
 }
-async function typecheckProject(config, options) {
+async function typecheckProject(config) {
   return await tracer.startActiveSpan("typecheckProject", async (span) => {
     try {
       const typecheckSpinner = spinner();
@@ -5497,6 +5506,7 @@ var BackgroundWorker = class {
   _onClose = new Evt();
   tasks = [];
   metadata;
+  stderr = [];
   _taskRunProcesses = /* @__PURE__ */ new Map();
   _taskRunProcessesBeingKilled = /* @__PURE__ */ new Set();
   _closed = false;
@@ -5595,6 +5605,9 @@ var BackgroundWorker = class {
       child.stdout?.on("data", (data) => {
         logger.log(data.toString());
       });
+      child.stderr?.on("data", (data) => {
+        this.stderr.push(data.toString());
+      });
     });
     this._initialized = true;
   }
@@ -5981,6 +5994,9 @@ var TaskRunProcess = class {
     switch (message.type) {
       case "TASK_RUN_COMPLETED": {
         const { result, execution } = message.payload;
+        logger.debug(`[${this.runId}] task run completed`, {
+          result
+        });
         const promiseStatus = this._attemptStatuses.get(execution.attempt.id);
         if (promiseStatus !== "PENDING") {
           return;
@@ -6614,7 +6630,8 @@ function useDev({
                   }
                   const parsedError = parseNpmInstallError(e);
                   if (typeof parsedError === "string") {
-                    logger.log(`${chalkError("X Error:")} ${parsedError}`);
+                    logger.log(`
+${chalkError("X Error:")} ${parsedError}`);
                   } else {
                     switch (parsedError.type) {
                       case "package-not-found-error": {
@@ -6637,6 +6654,12 @@ ${chalkError("X Error:")} The package ${chalkPurple(
                       }
                     }
                   }
+                  const stderr = backgroundWorker.stderr.map((line) => line.trim()).filter((line) => line.length > 0).join("\n");
+                  if (stderr) {
+                    logger.log(`
+${chalkError("X Error logs:")}
+${stderr}`);
+                  }
                 }
               });
             }
@@ -6877,7 +6900,7 @@ function configureInitCommand(program2) {
     ).option(
       "-t, --tag <package tag>",
       "The version of the @trigger.dev/sdk package to install",
-      "beta"
+      version
     ).option("--skip-package-install", "Skip installing the @trigger.dev/sdk package").option("--override-config", "Override the existing config file if it exists")
   ).action(async (path7, options) => {
     await handleTelemetry(async () => {
@@ -6952,7 +6975,7 @@ async function _initCommand(dir, options) {
   log6.info("Next steps:");
   log6.info(
     `   1. To start developing, run ${chalk5.green(
-      `npx trigger.dev@${options.tag} dev`
+      `npx trigger.dev@${options.tag} dev${options.apiUrl === CLOUD_API_URL ? "" : ` -a ${options.apiUrl}`}`
     )} in your project directory`
   );
   log6.info(`   2. Visit your ${projectDashboard} to view your newly created tasks.`);
@@ -7131,7 +7154,7 @@ async function installPackages2(dir, options) {
       switch (pkgManager) {
         case "npm": {
           installSpinner.start(`Running npm install @trigger.dev/sdk@${options.tag}`);
-          await execa3("npm", ["install", `@trigger.dev/sdk@${options.tag}`], {
+          await execa3("npm", ["install", "--save-exact", `@trigger.dev/sdk@${options.tag}`], {
             cwd: projectDir,
             stdio: options.logLevel === "debug" ? "inherit" : "ignore"
           });