trigger.dev 3.0.0-beta.10 → 3.0.0-beta.11

package/dist/index.js

@@ -801,7 +801,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "3.0.0-beta.10";
+var version = "3.0.0-beta.11";
 var dependencies = {
   "@clack/prompts": "^0.7.0",
   "@depot/cli": "0.0.1-cli.2.55.0",
@@ -817,7 +817,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.7",
+  "@trigger.dev/core": "workspace:^3.0.0-beta.11",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -1656,7 +1656,8 @@ async function readConfig(dir, options) {
   });
   const userConfigModule = await import(builtConfigFileHref);
   const rawConfig = await normalizeConfig(
-    userConfigModule ? userConfigModule.config : { project: options?.projectRef }
+    userConfigModule?.config,
+    options?.projectRef ? { project: options?.projectRef } : void 0
   );
   const config = Config.parse(rawConfig);
   return {
@@ -1681,11 +1682,13 @@ async function resolveConfig(path6, config) {
   }
   return config;
 }
-async function normalizeConfig(config) {
+async function normalizeConfig(config, overrides) {
+  let normalized = config;
   if (typeof config === "function") {
-    config = config();
+    normalized = await config();
   }
-  return await config;
+  normalized = { ...normalized, ...overrides };
+  return normalized;
 }
 
 // src/utilities/initialBanner.ts
@@ -3297,7 +3300,7 @@ function configureDeployCommand(program2) {
       "Detected missing environment variables won't block deployment"
     ).option("-c, --config <config file>", "The name of the config file, found at [path]").option(
       "-p, --project-ref <project ref>",
-      "The project ref. Required if there is no config file."
+      "The project ref. Required if there is no config file. This will override the project specified in the config file."
     )
   ).addOption(
     new CommandOption(
@@ -3713,7 +3716,8 @@ async function buildAndPushImage(options, updater) {
       const processCode = await new Promise((res, rej) => {
         childProcess2.stderr?.on("data", (data) => {
           const text3 = data.toString();
-          errors.push(text3);
+          const lines = text3.split("\n").filter(Boolean);
+          errors.push(...lines);
           logger.debug(text3);
         });
         childProcess2.on("error", (e) => rej(e));
@@ -3867,13 +3871,12 @@ async function buildAndPushSelfHostedImage(options) {
   });
 }
 function extractImageDigest(outputs) {
-  const imageDigestRegex = /sha256:[a-f0-9]{64}/;
+  const imageDigestRegex = /pushing manifest for .+(?<digest>sha256:[a-f0-9]{64})/;
   for (const line of outputs) {
-    if (line.includes("pushing manifest")) {
-      const imageDigestMatch = line.match(imageDigestRegex);
-      if (imageDigestMatch) {
-        return imageDigestMatch[0];
-      }
+    const imageDigestMatch = line.match(imageDigestRegex);
+    const digest = imageDigestMatch?.groups?.digest;
+    if (digest) {
+      return digest;
     }
   }
 }