trigger.dev 0.0.0-v3-prelease-20240419151535 → 0.0.0-v3-trigger-dirs-20240422172150

package/dist/Containerfile.prod

@@ -1,4 +1,4 @@
-FROM node:20-bookworm-slim@sha256:d4cdfc305abe5ea78da7167bf78263c22596dc332f2654b662890777ea166224 AS base
+FROM node:21-bookworm-slim@sha256:fb82287cf66ca32d854c05f54251fca8b572149163f154248df7e800003c90b5 AS base
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \

package/dist/index.js

@@ -795,12 +795,12 @@ import { readFileSync as readFileSync2 } from "node:fs";
 import { copyFile, mkdir, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname, join as join5, relative as relative3, posix } from "node:path";
 import { setTimeout as setTimeout2 } from "node:timers/promises";
-import terminalLink from "terminal-link";
+import terminalLink2 from "terminal-link";
 import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "0.0.0-v3-prelease-20240419151535";
+var version = "0.0.0-v3-trigger-dirs-20240422172150";
 var dependencies = {
   "@clack/prompts": "^0.7.0",
   "@depot/cli": "0.0.1-cli.2.55.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:0.0.0-v3-prelease-20240419151535",
+  "@trigger.dev/core": "workspace:0.0.0-v3-trigger-dirs-20240422172150",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -1540,9 +1540,12 @@ async function getTriggerDirectories(dirPath) {
   const entries = await fs2.promises.readdir(dirPath, { withFileTypes: true });
   const triggerDirectories = [];
   for (const entry of entries) {
-    if (!entry.isDirectory() || IGNORED_DIRS.includes(entry.name))
+    if (!entry.isDirectory() || IGNORED_DIRS.includes(entry.name) || entry.name.startsWith("."))
       continue;
     const fullPath = join(dirPath, entry.name);
+    if (fullPath.endsWith("app/api/trigger")) {
+      continue;
+    }
     if (entry.name === "trigger") {
       triggerDirectories.push(fullPath);
     }
@@ -1616,6 +1619,15 @@ async function getConfigPath(dir, fileName) {
   });
   return await findUp(fileName ? [fileName] : CONFIG_FILES, { cwd: dir });
 }
+async function findFilePath(dir, fileName) {
+  const result = await findUp([fileName], { cwd: dir });
+  logger.debug("Searched for the file", {
+    dir,
+    fileName,
+    result
+  });
+  return result;
+}
 async function readConfig(dir, options) {
   const absoluteDir = path2.resolve(process.cwd(), dir);
   const configPath = await getConfigPath(dir, options?.configFile);
@@ -1668,6 +1680,7 @@ async function resolveConfig(path7, config) {
     config.triggerDirectories = await findTriggerDirectories(path7);
   }
   config.triggerDirectories = resolveTriggerDirectories(config.triggerDirectories);
+  logger.debug("Resolved trigger directories", { triggerDirectories: config.triggerDirectories });
   if (!config.triggerUrl) {
     config.triggerUrl = CLOUD_API_URL;
   }
@@ -1675,7 +1688,7 @@ async function resolveConfig(path7, config) {
     config.projectDir = path7;
   }
   if (!config.tsconfigPath) {
-    config.tsconfigPath = await getConfigPath(path7, "tsconfig.json");
+    config.tsconfigPath = await findFilePath(path7, "tsconfig.json");
   }
   return config;
 }
@@ -2954,6 +2967,20 @@ function getLoaderForFile(file) {
 import chalk4 from "chalk";
 import { relative as relative2 } from "node:path";
 import { groupTaskMetadataIssuesByTask } from "@trigger.dev/core/v3";
+import terminalLink from "terminal-link";
+
+// src/utilities/links.ts
+var docs = {
+  config: {
+    home: "https://trigger.dev/docs/v3/trigger-config",
+    esm: "https://trigger.dev/docs/v3/trigger-config#esm-only-packages",
+    prisma: "https://trigger.dev/docs/v3/trigger-config#prisma-and-other-generators",
+    additionalPackages: "https://trigger.dev/docs/v3/trigger-config#prisma-and-other-generators"
+  }
+};
+var getInTouch = "https://trigger.dev/contact";
+
+// src/utilities/deployErrors.ts
 function errorIsErrorLike(error) {
   return error instanceof Error || typeof error === "object" && error !== null && "message" in error;
 }
@@ -3019,6 +3046,10 @@ ${chalkGrey("\u25CB")} Dynamically import the module in your code: ${chalkGrey(
 `
     );
   }
+  logger.log(
+    `${chalkGrey("\u25CB")} For more info see the ${terminalLink("relevant docs", docs.config.esm)}.
+`
+  );
 }
 function parseNpmInstallError(error) {
   if (typeof error === "string") {
@@ -3313,7 +3344,8 @@ var DeployCommandOptions = CommonCommandOptions.extend({
   config: z4.string().optional(),
   projectRef: z4.string().optional(),
   outputMetafile: z4.string().optional(),
-  apiUrl: z4.string().optional()
+  apiUrl: z4.string().optional(),
+  saveLogs: z4.boolean().default(false)
 });
 function configureDeployCommand(program2) {
   return commonOptions(
@@ -3360,6 +3392,11 @@ function configureDeployCommand(program2) {
       "--output-metafile <path>",
       "If provided, will save the esbuild metafile for the build to the specified path"
     ).hideHelp()
+  ).addOption(
+    new CommandOption(
+      "--save-logs",
+      "If provided, will save logs even for successful builds"
+    ).hideHelp()
   ).action(async (path7, options) => {
     await handleTelemetry(async () => {
       await printStandloneInitialBanner(true);
@@ -3494,19 +3531,35 @@ async function _deployCommand(dir, options) {
     );
   };
   const image = await buildImage();
+  const warnings = checkLogsForWarnings(image.logs);
+  if (!warnings.ok) {
+    await failDeploy(
+      deploymentResponse.data.shortCode,
+      warnings.summary,
+      image.logs,
+      deploymentSpinner,
+      warnings.warnings,
+      warnings.errors
+    );
+    throw new SkipLoggingError(`Failed to build project image: ${warnings.summary}`);
+  }
   if (!image.ok) {
-    deploymentSpinner.stop(`Failed to build project.`);
-    if (image.logs.trim() !== "") {
-      const logPath = join5(await createTempDir(), `build-${deploymentResponse.data.shortCode}.log`);
-      await writeFile2(logPath, image.logs);
-      logger.log(
-        `${chalkError("X Error:")} ${image.error}. Full build logs have been saved to ${logPath})`
-      );
-    } else {
-      logger.log(`${chalkError("X Error:")} ${image.error}.`);
-    }
+    await failDeploy(
+      deploymentResponse.data.shortCode,
+      image.error,
+      image.logs,
+      deploymentSpinner,
+      warnings.warnings
+    );
     throw new SkipLoggingError(`Failed to build project image: ${image.error}`);
   }
+  const preExitTasks = async () => {
+    printWarnings(warnings.warnings);
+    if (options.saveLogs) {
+      const logPath = await saveLogs(deploymentResponse.data.shortCode, image.logs);
+      log3.info(`Build logs have been saved to ${logPath}`);
+    }
+  };
   const imageReference = options.selfHosted ? `${selfHostedRegistryHost ? `${selfHostedRegistryHost}/` : ""}${image.image}${image.digest ? `@${image.digest}` : ""}` : `${registryHost}/${image.image}${image.digest ? `@${image.digest}` : ""}`;
   span?.setAttributes({
     "image.reference": imageReference
@@ -3515,6 +3568,7 @@ async function _deployCommand(dir, options) {
     deploymentSpinner.stop(
       `Project image built: ${imageReference}. Skipping deployment as requested`
     );
+    await preExitTasks();
     throw new SkipCommandError("Skipping deployment as requested");
   }
   deploymentSpinner.message(
@@ -3529,6 +3583,7 @@ async function _deployCommand(dir, options) {
   );
   if (!startIndexingResponse.success) {
     deploymentSpinner.stop(`Failed to start indexing: ${startIndexingResponse.error}`);
+    await preExitTasks();
     throw new SkipLoggingError(`Failed to start indexing: ${startIndexingResponse.error}`);
   }
   const finishedDeployment = await waitForDeploymentToFinish(
@@ -3537,19 +3592,26 @@ async function _deployCommand(dir, options) {
   );
   if (!finishedDeployment) {
     deploymentSpinner.stop(`Deployment failed to complete`);
+    await preExitTasks();
     throw new SkipLoggingError("Deployment failed to complete: unknown issue");
   }
   if (typeof finishedDeployment === "string") {
     deploymentSpinner.stop(`Deployment failed to complete: ${finishedDeployment}`);
+    await preExitTasks();
     throw new SkipLoggingError(`Deployment failed to complete: ${finishedDeployment}`);
   }
-  const deploymentLink = terminalLink(
+  const deploymentLink = terminalLink2(
     "View deployment",
     `${authorization.dashboardUrl}/projects/v3/${resolvedConfig.config.project}/deployments/${finishedDeployment.shortCode}`
   );
   switch (finishedDeployment.status) {
     case "DEPLOYED": {
-      deploymentSpinner.stop("Deployment completed");
+      if (warnings.warnings.length > 0) {
+        deploymentSpinner.stop("Deployment completed with warnings");
+      } else {
+        deploymentSpinner.stop("Deployment completed");
+      }
+      await preExitTasks();
       const taskCount = finishedDeployment.worker?.tasks.length ?? 0;
       if (taskCount === 0) {
         outro3(
@@ -3571,6 +3633,7 @@ async function _deployCommand(dir, options) {
             if (parsedError2.success) {
               deploymentSpinner.stop(`Deployment encountered an error. ${deploymentLink}`);
               logTaskMetadataParseError(parsedError2.data.zodIssues, parsedError2.data.tasks);
+              await preExitTasks();
               throw new SkipLoggingError(
                 `Deployment encountered an error: ${finishedDeployment.errorData.name}`
               );
@@ -3585,6 +3648,7 @@ async function _deployCommand(dir, options) {
           deploymentSpinner.stop(`Deployment encountered an error. ${deploymentLink}`);
           logESMRequireError(parsedError, resolvedConfig);
         }
+        await preExitTasks();
         throw new SkipLoggingError(
           `Deployment encountered an error: ${finishedDeployment.errorData.name}`
         );
@@ -3592,19 +3656,133 @@ async function _deployCommand(dir, options) {
         deploymentSpinner.stop(
           `Deployment failed with an unknown error. Please contact eric@trigger.dev for help. ${deploymentLink}`
         );
+        await preExitTasks();
         throw new SkipLoggingError("Deployment failed with an unknown error");
       }
     }
     case "CANCELED": {
       deploymentSpinner.stop(`Deployment was canceled. ${deploymentLink}`);
+      await preExitTasks();
       throw new SkipLoggingError("Deployment was canceled");
     }
     case "TIMED_OUT": {
       deploymentSpinner.stop(`Deployment timed out. ${deploymentLink}`);
+      await preExitTasks();
       throw new SkipLoggingError("Deployment timed out");
     }
   }
 }
+function printErrors(errors) {
+  for (const error of errors ?? []) {
+    log3.error(`${chalkError("Error:")} ${error}`);
+  }
+}
+function printWarnings(warnings) {
+  for (const warning of warnings ?? []) {
+    log3.warn(`${chalkWarning("Warning:")} ${warning}`);
+  }
+}
+function checkLogsForWarnings(logs) {
+  const warnings = [
+    {
+      regex: /prisma:warn We could not find your Prisma schema/,
+      message: `Prisma generate failed to find the default schema. Did you include it in config.additionalFiles? ${terminalLink2(
+        "Config docs",
+        docs.config.prisma
+      )}
+Custom schema paths require a postinstall script like this: \`prisma generate --schema=./custom/path/to/schema.prisma\``,
+      shouldFail: true
+    }
+  ];
+  const errorMessages2 = [];
+  const warningMessages = [];
+  let shouldFail = false;
+  for (const warning of warnings) {
+    const matches = logs.match(warning.regex);
+    if (!matches) {
+      continue;
+    }
+    const message = getMessageFromTemplate(warning.message, matches.groups);
+    if (warning.shouldFail) {
+      shouldFail = true;
+      errorMessages2.push(message);
+    } else {
+      warningMessages.push(message);
+    }
+  }
+  if (shouldFail) {
+    return {
+      ok: false,
+      summary: "Build succeeded with critical warnings. Will not proceed",
+      warnings: warningMessages,
+      errors: errorMessages2
+    };
+  }
+  return {
+    ok: true,
+    warnings: warningMessages
+  };
+}
+function checkLogsForErrors(logs) {
+  const errors = [
+    {
+      regex: /Error: Provided --schema at (?<schema>.*) doesn't exist/,
+      message: `Prisma generate failed to find the specified schema at "$schema".
+Did you include it in config.additionalFiles? ${terminalLink2(
+        "Config docs",
+        docs.config.prisma
+      )}`
+    },
+    {
+      regex: /sh: 1: (?<packageOrBinary>.*): not found/,
+      message: `$packageOrBinary not found
+
+If it's a package: Include it in ${terminalLink2(
+        "config.additionalPackages",
+        docs.config.prisma
+      )}
+If it's a binary:  Please ${terminalLink2(
+        "get in touch",
+        getInTouch
+      )} and we'll see what we can do!`
+    }
+  ];
+  for (const error of errors) {
+    const matches = logs.match(error.regex);
+    if (!matches) {
+      continue;
+    }
+    const message = getMessageFromTemplate(error.message, matches.groups);
+    log3.error(`${chalkError("Error:")} ${message}`);
+    break;
+  }
+}
+function getMessageFromTemplate(template, replacer) {
+  let message = template;
+  if (replacer) {
+    for (const [key, value] of Object.entries(replacer)) {
+      message = message.replaceAll(`$${key}`, value);
+    }
+  }
+  return message;
+}
+async function saveLogs(shortCode, logs) {
+  const logPath = join5(await createTempDir(), `build-${shortCode}.log`);
+  await writeFile2(logPath, logs);
+  return logPath;
+}
+async function failDeploy(shortCode, errorSummary, logs, deploymentSpinner, warnings, errors) {
+  deploymentSpinner.stop(`Failed to deploy project`);
+  if (logs.trim() !== "") {
+    const logPath = await saveLogs(shortCode, logs);
+    printWarnings(warnings);
+    printErrors(errors);
+    checkLogsForErrors(logs);
+    outro3(`${chalkError("Error:")} ${errorSummary}. Full build logs have been saved to ${logPath}`);
+  } else {
+    outro3(`${chalkError("Error:")} ${errorSummary}.`);
+  }
+}
 async function checkEnvVars(envVars, config, options, environmentClient, apiUrl) {
   return await tracer.startActiveSpan("detectEnvVars", async (span) => {
     try {
@@ -3623,7 +3801,7 @@ async function checkEnvVars(envVars, config, options, environmentClient, apiUrl)
             `Found missing env vars in ${options.env}: ${arrayToSentence(
               missingEnvironmentVariables
             )}. ${options.ignoreEnvVarCheck ? "Continuing deployment because of --ignore-env-var-check. " : "Aborting deployment. "}${chalk5.bgBlueBright(
-              terminalLink(
+              terminalLink2(
                 "Manage env vars",
                 `${apiUrl}/projects/v3/${config.project}/environment-variables`
               )
@@ -3926,7 +4104,7 @@ async function compileProject(config, options, configPath) {
         join5(cliRootPath(), "workers", "prod", "worker-facade.js"),
         "utf-8"
       );
-      const workerSetupPath = join5(cliRootPath(), "workers", "dev", "worker-setup.js");
+      const workerSetupPath = join5(cliRootPath(), "workers", "prod", "worker-setup.js");
       let workerContents = workerFacade.replace("__TASKS__", createTaskFileImports(taskFiles)).replace(
         "__WORKER_SETUP__",
         `import { tracingSDK } from "${escapeImportPath(workerSetupPath)}";`
@@ -4078,8 +4256,22 @@ async function compileProject(config, options, configPath) {
         }
       };
       await writeJSONFile(join5(tempDir, "package.json"), packageJsonContents);
-      await copyAdditionalFiles(config, tempDir);
-      compileSpinner.stop("Project built successfully");
+      const copyResult = await copyAdditionalFiles(config, tempDir);
+      if (!copyResult.ok) {
+        compileSpinner.stop("Project built with warnings");
+        log3.warn(
+          `No additionalFiles matches for:
+
+${copyResult.noMatches.map((glob) => `- "${glob}"`).join("\n")}
+
+If this is unexpected you should check your ${terminalLink2(
+            "glob patterns",
+            "https://github.com/isaacs/node-glob?tab=readme-ov-file#glob-primer"
+          )} are valid.`
+        );
+      } else {
+        compileSpinner.stop("Project built successfully");
+      }
       const resolvingDependenciesResult = await resolveDependencies(
         tempDir,
         packageJsonContents,
@@ -4286,8 +4478,9 @@ async function gatherRequiredDependencies(imports, config, project) {
 }
 async function copyAdditionalFiles(config, tempDir) {
   const additionalFiles = config.additionalFiles ?? [];
+  const noMatches = [];
   if (additionalFiles.length === 0) {
-    return;
+    return { ok: true };
   }
   return await tracer.startActiveSpan(
     "copyAdditionalFiles",
@@ -4301,22 +4494,55 @@ async function copyAdditionalFiles(config, tempDir) {
         logger.debug(`Copying files to ${tempDir}`, {
           additionalFiles
         });
-        const glob = new Glob(additionalFiles, {
+        const globOptions = {
           withFileTypes: true,
           ignore: ["node_modules"],
           cwd: config.projectDir,
           nodir: true
-        });
-        for await (const file of glob) {
-          const relativeDestinationPath = join5(
-            tempDir,
-            relative3(config.projectDir, file.fullpath())
-          );
-          logger.debug(`Copying file ${file.fullpath()} to ${relativeDestinationPath}`);
-          await mkdir(dirname(relativeDestinationPath), { recursive: true });
-          await copyFile(file.fullpath(), relativeDestinationPath);
+        };
+        const globs = [];
+        let i = 0;
+        for (const additionalFile of additionalFiles) {
+          let glob;
+          if (i === 0) {
+            glob = new Glob(additionalFile, globOptions);
+          } else {
+            const previousGlob = globs[i - 1];
+            if (!previousGlob) {
+              logger.error("No previous glob, this shouldn't happen", { i, additionalFiles });
+              continue;
+            }
+            glob = new Glob(additionalFile, previousGlob);
+          }
+          if (!(Symbol.asyncIterator in glob)) {
+            logger.error("Glob should be an async iterator", { glob });
+            throw new Error("Unrecoverable error while copying additional files");
+          }
+          let matches = 0;
+          for await (const file of glob) {
+            matches++;
+            const pathInsideTempDir = relative3(config.projectDir, file.fullpath()).split(posix.sep).filter((p) => p !== "..").join(posix.sep);
+            const relativeDestinationPath = join5(tempDir, pathInsideTempDir);
+            logger.debug(`Copying file ${file.fullpath()} to ${relativeDestinationPath}`);
+            await mkdir(dirname(relativeDestinationPath), { recursive: true });
+            await copyFile(file.fullpath(), relativeDestinationPath);
+          }
+          if (matches === 0) {
+            noMatches.push(additionalFile);
+          }
+          globs[i] = glob;
+          i++;
         }
         span.end();
+        if (noMatches.length > 0) {
+          return {
+            ok: false,
+            noMatches
+          };
+        }
+        return {
+          ok: true
+        };
       } catch (error) {
         recordSpanException4(span, error);
         span.end();
@@ -4413,7 +4639,7 @@ import dotenv from "dotenv";
 import { Evt } from "evt";
 import { fork } from "node:child_process";
 import { dirname as dirname2, resolve as resolve2 } from "node:path";
-import terminalLink2 from "terminal-link";
+import terminalLink3 from "terminal-link";
 var BackgroundWorkerCoordinator = class {
   constructor(baseURL) {
     this.baseURL = baseURL;
@@ -4498,7 +4724,7 @@ var BackgroundWorkerCoordinator = class {
     const logsUrl = `${this.baseURL}/runs/${execution.run.id}`;
     const pipe = chalkGrey("|");
     const bullet = chalkGrey("\u25CB");
-    const link = chalkLink(terminalLink2("View logs", logsUrl));
+    const link = chalkLink(terminalLink3("View logs", logsUrl));
     let timestampPrefix = chalkGrey(prettyPrintDate(payload.execution.attempt.startedAt));
     const workerPrefix = chalkWorker(record.version);
     const taskPrefix = chalkTask(execution.task.id);
@@ -5628,7 +5854,7 @@ import { execa as execa3 } from "execa";
 import { applyEdits, modify } from "jsonc-parser";
 import { writeFile as writeFile3 } from "node:fs/promises";
 import { join as join7, relative as relative4, resolve as resolve3 } from "node:path";
-import terminalLink3 from "terminal-link";
+import terminalLink4 from "terminal-link";
 import { z as z6 } from "zod";
 
 // src/utilities/createFileFromTemplate.ts
@@ -5754,7 +5980,7 @@ async function _initCommand(dir, options) {
   await writeConfigFile(dir, selectedProject, options, triggerDir);
   await addConfigFileToTsConfig(dir, options);
   await gitIgnoreDotTriggerDir(dir, options);
-  const projectDashboard = terminalLink3(
+  const projectDashboard = terminalLink4(
     "project dashboard",
     `${authorization.dashboardUrl}/projects/v3/${selectedProject.externalRef}`
   );
@@ -5767,13 +5993,13 @@ async function _initCommand(dir, options) {
   );
   log4.info(`   2. Visit your ${projectDashboard} to view your newly created tasks.`);
   log4.info(
-    `   3. Head over to our ${terminalLink3(
+    `   3. Head over to our ${terminalLink4(
       "v3 docs",
       "https://trigger.dev/docs/v3"
     )} to learn more.`
   );
   log4.info(
-    `   4. Need help? Join our ${terminalLink3(
+    `   4. Need help? Join our ${terminalLink4(
       "Discord community",
       "https://trigger.dev/discord"
     )} or email us at ${chalk6.cyan("help@trigger.dev")}`
@@ -6025,7 +6251,7 @@ async function selectProject(apiClient2, dashboardUrl, projectRef) {
         throw new Error(`Failed to get projects: ${projectsResponse.error}`);
       }
       if (projectsResponse.data.length === 0) {
-        const newProjectLink = terminalLink3(
+        const newProjectLink = terminalLink4(
           "Create new project",
           `${dashboardUrl}/projects/new?version=v3`
         );