trigger.dev 3.0.0-beta.5 → 3.0.0-beta.7

package/dist/Containerfile.prod

@@ -1,11 +1,19 @@
-FROM node:20-alpine@sha256:bf77dc26e48ea95fca9d1aceb5acfa69d2e546b765ec2abfb502975f1a2d4def AS base
+FROM node:20-bookworm-slim@sha256:d4cdfc305abe5ea78da7167bf78263c22596dc332f2654b662890777ea166224 AS base
 
-RUN apk add --no-cache dumb-init
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    busybox \
+    dumb-init \
+    && rm -rf /var/lib/apt/lists/*
 
+# Create and set workdir with appropriate permissions
+RUN mkdir /app && chown node:node /app
 WORKDIR /app
 
 # copy all the files just in case anything is needed in postinstall
 COPY --chown=node:node . .
+
+USER node
 RUN npm ci --no-fund --no-audit && npm cache clean --force
 
 # Development or production stage builds upon the base stage

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.5";
+var version = "3.0.0-beta.7";
 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.5",
+  "@trigger.dev/core": "workspace:^3.0.0-beta.6",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -851,7 +851,6 @@ var dependencies = {
   "simple-git": "^3.19.0",
   "socket.io-client": "^4.7.4",
   "source-map-support": "^0.5.21",
-  "supports-color": "^9.4.0",
   "terminal-link": "^3.0.0",
   "tiny-invariant": "^1.2.0",
   "tsconfig-paths": "^4.2.0",
@@ -895,7 +894,7 @@ var package_default = {
   type: "module",
   exports: "./dist/index.js",
   bin: {
-    "trigger.dev": "./dist/index.js"
+    triggerdev: "./dist/index.js"
   },
   devDependencies: {
     "@trigger.dev/core-apps": "workspace:*",
@@ -1694,7 +1693,6 @@ async function normalizeConfig(config) {
 // src/utilities/initialBanner.ts
 import { spinner } from "@clack/prompts";
 import chalk3 from "chalk";
-import supportsColor from "supports-color";
 import checkForUpdate from "update-check";
 
 // src/utilities/getVersion.ts
@@ -1743,7 +1741,7 @@ ${logo()} ${chalkGrey("(v3 Developer Preview)")}`;
       text3 = `${text3} (update available ${chalk3.green(maybeNewVersion)})`;
     }
   }
-  logger.log(text3 + "\n" + (supportsColor.stdout ? chalkGrey("-".repeat(54)) : "-".repeat(54)));
+  logger.log(text3 + "\n" + chalkGrey("-".repeat(54)));
 }
 function printDevBanner() {
   logger.log(
@@ -2733,6 +2731,38 @@ import { Glob } from "glob";
 import { readFileSync } from "node:fs";
 import { extname, isAbsolute } from "node:path";
 import tsConfigPaths from "tsconfig-paths";
+function bundleTriggerDevCore(buildIdentifier, tsconfigPath) {
+  return {
+    name: "trigger-bundle-core",
+    setup(build3) {
+      build3.onResolve({ filter: /.*/ }, (args) => {
+        if (args.path !== "@trigger.dev/core/v3") {
+          return void 0;
+        }
+        const triggerSdkPath = __require.resolve("@trigger.dev/sdk/v3", { paths: [process.cwd()] });
+        logger.debug(`[${buildIdentifier}][trigger-bundle-core] Resolved @trigger.dev/sdk/v3`, {
+          ...args,
+          triggerSdkPath
+        });
+        const resolvedPath = __require.resolve("@trigger.dev/core/v3", {
+          paths: [triggerSdkPath]
+        });
+        logger.debug(
+          `[${buildIdentifier}][trigger-bundle-core] Externalizing @trigger.dev/core/v3`,
+          {
+            ...args,
+            triggerSdkPath,
+            resolvedPath
+          }
+        );
+        return {
+          path: resolvedPath,
+          external: false
+        };
+      });
+    }
+  };
+}
 function workerSetupImportConfigPlugin(configPath) {
   return {
     name: "trigger-worker-setup",
@@ -3543,15 +3573,22 @@ async function buildAndPushSelfHostedImage(options) {
     const errors = [];
     let digest;
     try {
-      await new Promise((res, rej) => {
+      const processCode = await new Promise((res, rej) => {
         buildProcess.stderr?.on("data", (data) => {
           const text3 = data.toString();
           errors.push(text3);
           logger.debug(text3);
         });
         buildProcess.on("error", (e) => rej(e));
-        buildProcess.on("close", () => res());
+        buildProcess.on("close", (code) => res(code));
       });
+      if (processCode !== 0) {
+        return {
+          ok: false,
+          error: "Error building image",
+          logs: extractLogs(errors)
+        };
+      }
       digest = extractImageDigest(errors);
       span.setAttributes({
         "image.digest": digest
@@ -3573,7 +3610,7 @@ async function buildAndPushSelfHostedImage(options) {
         cwd: options.cwd
       });
       try {
-        await new Promise((res, rej) => {
+        const processCode = await new Promise((res, rej) => {
           pushProcess.stdout?.on("data", (data) => {
             const text3 = data.toString();
             logger.debug(text3);
@@ -3583,8 +3620,15 @@ async function buildAndPushSelfHostedImage(options) {
             logger.debug(text3);
           });
           pushProcess.on("error", (e) => rej(e));
-          pushProcess.on("close", () => res());
+          pushProcess.on("close", (code) => res(code));
         });
+        if (processCode !== 0) {
+          return {
+            ok: false,
+            error: "Error pushing image",
+            logs: extractLogs(errors)
+          };
+        }
         span.end();
       } catch (e) {
         recordSpanException4(span, e);
@@ -4327,6 +4371,12 @@ var BackgroundWorker = class {
       await installPackages(this.params.dependencies, { cwd: dirname2(this.path) });
     }
     let resolved = false;
+    const cwd = dirname2(this.path);
+    const fullEnv = {
+      ...this.params.env,
+      ...this.#readEnvVars()
+    };
+    logger.debug("Initializing worker", { path: this.path, cwd, fullEnv });
     this.tasks = await new Promise((resolve4, reject) => {
       const child = fork(this.path, {
         stdio: [
@@ -4338,10 +4388,8 @@ var BackgroundWorker = class {
           "pipe",
           "ipc"
         ],
-        env: {
-          ...this.params.env,
-          ...this.#readEnvVars()
-        }
+        cwd,
+        env: fullEnv
       });
       const timeout = setTimeout(() => {
         if (resolved) {
@@ -4544,9 +4592,11 @@ var TaskRunProcess = class {
       OTEL_EXPORTER_OTLP_COMPRESSION: "none",
       ...this.worker.debugOtel ? { OTEL_LOG_LEVEL: "debug" } : {}
     };
+    const cwd = dirname2(this.path);
     logger.debug(`[${this.execution.run.id}] initializing task run process`, {
       env: fullEnv,
-      path: this.path
+      path: this.path,
+      cwd
     });
     this._child = fork(this.path, {
       stdio: [
@@ -4558,7 +4608,7 @@ var TaskRunProcess = class {
         "pipe",
         "ipc"
       ],
-      cwd: dirname2(this.path),
+      cwd,
       env: fullEnv,
       execArgv: this.worker.debuggerOn ? ["--inspect-brk", "--trace-uncaught", "--no-warnings=ExperimentalWarning"] : ["--trace-uncaught", "--no-warnings=ExperimentalWarning"]
     });
@@ -4713,6 +4763,7 @@ function runtimeCheck(minimumMajor, minimumMinor) {
 }
 
 // src/commands/dev.tsx
+import { findUp as findUp2, pathExists as pathExists2 } from "find-up";
 var apiClient;
 var DevCommandOptions = CommonCommandOptions.extend({
   debugger: z5.boolean().default(false),
@@ -4978,6 +5029,7 @@ function useDev({
           __PROJECT_CONFIG__: JSON.stringify(config)
         },
         plugins: [
+          bundleTriggerDevCore("workerFacade", config.tsconfigPath),
           bundleDependenciesPlugin(
             "workerFacade",
             (config.dependenciesToBundle ?? []).concat([/^@trigger.dev/]),
@@ -5033,7 +5085,7 @@ function useDev({
                   await fs7.promises.writeFile(sourceMapPath2, sourceMapFile.text);
                 }
                 const environmentVariablesResponse = await environmentClient.getEnvironmentVariables(config.project);
-                const processEnv = gatherProcessEnv();
+                const processEnv = await gatherProcessEnv();
                 const backgroundWorker = new BackgroundWorker(fullPath, {
                   projectConfig: config,
                   dependencies: dependencies2,
@@ -5264,7 +5316,7 @@ ${task.filePath} -> ${task.exportName}`).join("")}`;
   }).join("");
   return `Duplicate ${chalkTask("task id")} detected:${duplicateTable}`;
 }
-function gatherProcessEnv() {
+async function gatherProcessEnv() {
   const env = {
     NODE_ENV: process.env.NODE_ENV ?? "development",
     PATH: process.env.PATH,
@@ -5275,12 +5327,37 @@ function gatherProcessEnv() {
     NVM_BIN: process.env.NVM_BIN,
     LANG: process.env.LANG,
     TERM: process.env.TERM,
-    NODE_PATH: process.env.NODE_PATH,
+    NODE_PATH: await amendNodePathWithPnpmNodeModules(process.env.NODE_PATH),
     HOME: process.env.HOME,
     BUN_INSTALL: process.env.BUN_INSTALL
   };
   return Object.fromEntries(Object.entries(env).filter(([key, value]) => value !== void 0));
 }
+async function amendNodePathWithPnpmNodeModules(nodePath) {
+  const pnpmModulesPath = await findPnpmNodeModulesPath();
+  if (!pnpmModulesPath) {
+    return nodePath;
+  }
+  if (nodePath) {
+    if (nodePath.includes(pnpmModulesPath)) {
+      return nodePath;
+    }
+    return `${nodePath}:${pnpmModulesPath}`;
+  }
+  return pnpmModulesPath;
+}
+async function findPnpmNodeModulesPath() {
+  return await findUp2(
+    async (directory) => {
+      const pnpmModules = join5(directory, "node_modules", ".pnpm", "node_modules");
+      const hasPnpmNodeModules = await pathExists2(pnpmModules);
+      if (hasPnpmNodeModules) {
+        return pnpmModules;
+      }
+    },
+    { type: "directory" }
+  );
+}
 
 // src/commands/init.ts
 import { intro as intro4, isCancel, log as log3, outro as outro4, select as select2, spinner as spinner5, text } from "@clack/prompts";