trigger.dev 0.0.0-v3-prerelease-20240427071154 → 0.0.0-v3-prerelease-20240501131706

package/dist/Containerfile.prod

@@ -19,6 +19,8 @@ COPY --chown=node:node . .
 USER node
 RUN npm ci --no-fund --no-audit && npm cache clean --force
 
+__POST_INSTALL__
+
 # Development or production stage builds upon the base stage
 FROM base AS final
 

package/dist/index.js

@@ -799,7 +799,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "0.0.0-v3-prerelease-20240427071154";
+var version = "0.0.0-v3-prerelease-20240501131706";
 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:0.0.0-v3-prerelease-20240427071154",
+  "@trigger.dev/core": "workspace:0.0.0-v3-prerelease-20240501131706",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -1676,11 +1676,11 @@ async function readConfig(dir, options) {
   const configPath = await getConfigPath(dir, options?.configFile);
   if (!configPath) {
     if (options?.projectRef) {
-      const rawConfig2 = await normalizeConfig({ project: options.projectRef });
-      const config2 = Config.parse(rawConfig2);
+      const rawConfig = await normalizeConfig({ project: options.projectRef });
+      const config = Config.parse(rawConfig);
       return {
         status: "in-memory",
-        config: await resolveConfig(absoluteDir, config2)
+        config: await resolveConfig(absoluteDir, config)
       };
     } else {
       throw new Error(`Config file not found in ${absoluteDir} or any parent directory.`);
@@ -1713,17 +1713,24 @@ async function readConfig(dir, options) {
       })
     ]
   });
-  const userConfigModule = await import(builtConfigFileHref);
-  const rawConfig = await normalizeConfig(
-    userConfigModule?.config,
-    options?.projectRef ? { project: options?.projectRef } : void 0
-  );
-  const config = Config.parse(rawConfig);
-  return {
-    status: "file",
-    config: await resolveConfig(absoluteDir, config),
-    path: configPath
-  };
+  try {
+    const userConfigModule = await import(builtConfigFileHref);
+    const rawConfig = await normalizeConfig(
+      userConfigModule?.config,
+      options?.projectRef ? { project: options?.projectRef } : void 0
+    );
+    const config = Config.parse(rawConfig);
+    return {
+      status: "file",
+      config: await resolveConfig(absoluteDir, config),
+      path: configPath
+    };
+  } catch (error) {
+    return {
+      status: "error",
+      error
+    };
+  }
 }
 async function resolveConfig(path7, config) {
   if (!config.triggerDirectories) {
@@ -3683,8 +3690,7 @@ var DeployCommandOptions = CommonCommandOptions.extend({
   outputMetafile: z4.string().optional(),
   apiUrl: z4.string().optional(),
   saveLogs: z4.boolean().default(false),
-  skipUpdateCheck: z4.boolean().default(false),
-  noCache: z4.boolean().default(false)
+  skipUpdateCheck: z4.boolean().default(false)
 });
 function configureDeployCommand(program2) {
   return commonOptions(
@@ -3701,11 +3707,6 @@ function configureDeployCommand(program2) {
       "--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."
     ).hideHelp()
-  ).addOption(
-    new CommandOption(
-      "--no-cache",
-      "Do not use the cache when building the image. This will slow down the build process but can be useful if you are experiencing issues with the cache."
-    ).hideHelp()
   ).addOption(
     new CommandOption(
       "--push",
@@ -3784,6 +3785,11 @@ async function _deployCommand(dir, options) {
     configFile: options.config,
     projectRef: options.projectRef
   });
+  if (resolvedConfig.status === "error") {
+    logger.error("Failed to read config:", resolvedConfig.error);
+    span && recordSpanException4(span, resolvedConfig.error);
+    throw new SkipLoggingError("Failed to read config");
+  }
   logger.debug("Resolved config", { resolvedConfig });
   span?.setAttributes({
     "resolvedConfig.status": resolvedConfig.status,
@@ -3842,8 +3848,7 @@ async function _deployCommand(dir, options) {
         projectRef: resolvedConfig.config.project,
         buildPlatform: options.buildPlatform,
         pushImage: options.push,
-        selfHostedRegistry: !!options.registry,
-        noCache: options.noCache
+        selfHostedRegistry: !!options.registry
       });
     }
     if (!deploymentResponse.data.externalBuildData) {
@@ -3866,8 +3871,7 @@ async function _deployCommand(dir, options) {
         contentHash: deploymentResponse.data.contentHash,
         projectRef: resolvedConfig.config.project,
         loadImage: options.loadImage,
-        buildPlatform: options.buildPlatform,
-        noCache: options.noCache
+        buildPlatform: options.buildPlatform
       },
       deploymentSpinner
     );
@@ -3920,8 +3924,7 @@ async function _deployCommand(dir, options) {
   const startIndexingResponse = await environmentClient.startDeploymentIndexing(
     deploymentResponse.data.id,
     {
-      imageReference,
-      selfHosted: options.selfHosted
+      imageReference
     }
   );
   if (!startIndexingResponse.success) {
@@ -4181,7 +4184,6 @@ async function buildAndPushImage(options, updater) {
       "build",
       "-f",
       "Containerfile",
-      options.noCache ? "--no-cache" : void 0,
       "--platform",
       options.buildPlatform,
       "--provenance",
@@ -4273,7 +4275,6 @@ async function buildAndPushSelfHostedImage(options) {
       "build",
       "-f",
       "Containerfile",
-      options.noCache ? "--no-cache" : void 0,
       "--platform",
       options.buildPlatform,
       "--build-arg",
@@ -4291,9 +4292,7 @@ async function buildAndPushSelfHostedImage(options) {
       "."
       // The build context
     ].filter(Boolean);
-    logger.debug(`docker ${buildArgs.join(" ")}`, {
-      cwd: options.cwd
-    });
+    logger.debug(`docker ${buildArgs.join(" ")}`);
     span.setAttribute("docker.command.build", `docker ${buildArgs.join(" ")}`);
     const buildProcess = execa2("docker", buildArgs, {
       cwd: options.cwd
@@ -4445,7 +4444,7 @@ async function compileProject(config, options, configPath) {
         target: ["node18", "es2020"],
         outdir: "out",
         banner: {
-          js: `process.on("uncaughtException", function(error, origin) { process.send && process.send({ type: "EVENT", message: { type: "UNCAUGHT_EXCEPTION", payload: { error: { name: error.name, message: error.message, stack: error.stack }, origin }, version: "v1" } }); });`
+          js: `process.on("uncaughtException", function(error, origin) { if (error instanceof Error) { process.send && process.send({ type: "EVENT", message: { type: "UNCAUGHT_EXCEPTION", payload: { error: { name: error.name, message: error.message, stack: error.stack }, origin }, version: "v1" } }); } else { process.send && process.send({ type: "EVENT", message: { type: "UNCAUGHT_EXCEPTION", payload: { error: { name: "Error", message: typeof error === "string" ? error : JSON.stringify(error) }, origin }, version: "v1" } }); } });`
         },
         define: {
           TRIGGER_API_URL: `"${config.triggerUrl}"`,
@@ -4593,7 +4592,16 @@ If this is unexpected you should check your ${terminalLink2(
         throw new SkipLoggingError("Failed to resolve dependencies");
       }
       const containerFilePath = join6(cliRootPath(), "Containerfile.prod");
-      await copyFile(containerFilePath, join6(tempDir, "Containerfile"));
+      let containerFileContents = readFileSync2(containerFilePath, "utf-8");
+      if (config.postInstall) {
+        containerFileContents = containerFileContents.replace(
+          "__POST_INSTALL__",
+          `RUN ${config.postInstall}`
+        );
+      } else {
+        containerFileContents = containerFileContents.replace("__POST_INSTALL__", "");
+      }
+      await writeFile2(join6(tempDir, "Containerfile"), containerFileContents);
       const contentHasher = createHash("sha256");
       contentHasher.update(Buffer.from(entryPointOutputFile.text));
       contentHasher.update(Buffer.from(workerOutputFile.text));
@@ -5591,22 +5599,26 @@ async function startDev(dir, options, authorization, dashboardUrl) {
       configFile: options.config
     });
     logger.debug("Initial config", { config });
+    if (config.status === "error") {
+      logger.error("Failed to read config", config.error);
+      process.exit(1);
+    }
     async function getDevReactElement(configParam, authorization2, configPath) {
       const accessToken = authorization2.accessToken;
       const apiUrl = authorization2.apiUrl;
       apiClient = new CliApiClient(apiUrl, accessToken);
       const devEnv = await apiClient.getProjectEnv({
-        projectRef: config.config.project,
+        projectRef: configParam.project,
         env: "dev"
       });
       if (!devEnv.success) {
         if (devEnv.error === "Project not found") {
           logger.error(
-            `Project not found: ${config.config.project}. Ensure you are using the correct project ref and CLI profile (use --profile). Currently using the "${options.profile}" profile, which points to ${authorization2.apiUrl}`
+            `Project not found: ${configParam.project}. Ensure you are using the correct project ref and CLI profile (use --profile). Currently using the "${options.profile}" profile, which points to ${authorization2.apiUrl}`
           );
         } else {
           logger.error(
-            `Failed to initialize dev environment: ${devEnv.error}. Using project ref ${config.config.project}`
+            `Failed to initialize dev environment: ${devEnv.error}. Using project ref ${configParam.project}`
           );
         }
         process.exit(1);
@@ -5780,7 +5792,7 @@ function useDev({
           sourcefile: "__entryPoint.ts"
         },
         banner: {
-          js: `process.on("uncaughtException", function(error, origin) { process.send && process.send({ type: "UNCAUGHT_EXCEPTION", payload: { error: { name: error.name, message: error.message, stack: error.stack }, origin }, version: "v1" }); });`
+          js: `process.on("uncaughtException", function(error, origin) { if (error instanceof Error) { process.send && process.send({ type: "UNCAUGHT_EXCEPTION", payload: { error: { name: error.name, message: error.message, stack: error.stack }, origin }, version: "v1" }); } else { process.send && process.send({ type: "UNCAUGHT_EXCEPTION", payload: { error: { name: "Error", message: typeof error === "string" ? error : JSON.stringify(error) }, origin }, version: "v1" }); } });`
         },
         bundle: true,
         metafile: true,
@@ -5951,10 +5963,10 @@ function useDev({
                       return;
                     } else {
                     }
-                    if (e.originalError.stack) {
+                    if (e.originalError.message || e.originalError.stack) {
                       logger.log(
                         `${chalkError("X Error:")} Worker failed to start`,
-                        e.originalError.stack
+                        e.originalError.stack ?? e.originalError.message
                       );
                     }
                     return;