v3: new build system fixes round 2

.changeset/curvy-beers-camp.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fixed empty env vars overriding in dev runs

.changeset/gentle-planets-return.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/build": patch
+---
+
+Fix issue with emitDecoratorMetadata and tsconfigs with extends

.changeset/mighty-sheep-guess.md

@@ -0,0 +1,7 @@
+---
+"@trigger.dev/sdk": patch
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Support self-hosters pushing to a custom registry when running deploy

.changeset/proud-dogs-battle.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/build": patch
+---
+
+Add support for prisma typed sql

.changeset/rude-houses-promise.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fix --project-ref when running deploy

.changeset/strong-years-help.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fixed stuck runs when a child run fails with a process exit

.changeset/tidy-roses-guess.md

@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Add remote forced externals system, in case we come across another package that cannot be bundled (spurred on by header-generator)

.changeset/twenty-seahorses-admire.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/sdk": patch
+---
+
+Remove msw and retry.interceptFetch

.changeset/violet-cherries-deny.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/core": patch
+---
+
+fix node10 moduleResolution in @trigger.dev/core

.changeset/wise-pens-agree.md

@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Only import import-in-the-middle hook if there are instrumented packages

.vscode/launch.json

@@ -20,15 +20,6 @@
       "url": "http://localhost:3030",
       "webRoot": "${workspaceFolder}/apps/webapp/app"
     },
-    {
-      "type": "node-terminal",
-      "request": "launch",
-      "name": "Debug v2 job catalog",
-      "command": "pnpm run byo-auth",
-      "envFile": "${workspaceFolder}/references/job-catalog/.env",
-      "cwd": "${workspaceFolder}/references/job-catalog",
-      "sourceMaps": true
-    },
     {
       "type": "node-terminal",
       "request": "launch",
@@ -89,9 +80,17 @@
       "type": "node-terminal",
       "request": "launch",
       "name": "Debug CLI e2e tests",
-      "command": "PM=yarn pnpm run test:e2e",
+      "command": "MOD=otel-telemetry-loader pnpm run test:e2e",
       "cwd": "${workspaceFolder}/packages/cli-v3",
       "sourceMaps": true
+    },
+    {
+      "type": "node-terminal",
+      "request": "launch",
+      "name": "debug v3 hello-world dev",
+      "command": "pnpm exec triggerdev dev",
+      "cwd": "${workspaceFolder}/references/hello-world",
+      "sourceMaps": true
     }
   ]
 }

apps/webapp/app/routes/api.v1.deployments.ts

@@ -43,7 +43,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     externalBuildData:
       deployment.externalBuildData as InitializeDeploymentResponseBody["externalBuildData"],
     imageTag,
-    registryHost: env.DEPLOY_REGISTRY_HOST,
+    registryHost: body.data.registryHost ?? env.DEPLOY_REGISTRY_HOST,
   };
 
   return json(responseBody, { status: 200 });

apps/webapp/app/routes/api.v1.usage.ingest.ts

@@ -9,7 +9,13 @@ export async function action({ request }: ActionFunctionArgs) {
   }
 
   try {
-    return await reportComputeUsage(request);
+    const result = await reportComputeUsage(request);
+
+    if (result === undefined) {
+      return new Response(null, { status: 500 });
+    }
+
+    return result;
   } catch (e) {
     logger.error("Error reporting compute usage", { error: e });
     return new Response(null, { status: 500 });

apps/webapp/app/v3/services/createDeploymentBackgroundWorker.server.ts

@@ -9,6 +9,7 @@ import {
   syncDeclarativeSchedules,
 } from "./createBackgroundWorker.server";
 import { TimeoutDeploymentService } from "./timeoutDeployment.server";
+import { logger } from "~/services/logger.server";
 
 export class CreateDeploymentBackgroundWorkerService extends BaseService {
   public async call(

apps/webapp/app/v3/services/initializeDeployment.server.ts

@@ -29,7 +29,9 @@ export class InitializeDeploymentService extends BaseService {
       const nextVersion = calculateNextBuildVersion(latestDeployment?.version);
 
       // Try and create a depot build and get back the external build data
-      const externalBuildData = await createRemoteImageBuild(environment.project);
+      const externalBuildData = !!payload.selfHosted
+        ? await createRemoteImageBuild(environment.project)
+        : undefined;
 
       const triggeredBy = payload.userId
         ? await this._prisma.user.findUnique({
@@ -65,7 +67,9 @@ export class InitializeDeploymentService extends BaseService {
         new Date(Date.now() + 180_000) // 3 minutes
       );
 
-      const imageTag = `${env.DEPLOY_REGISTRY_NAMESPACE}/${environment.project.externalRef}:${deployment.version}.${environment.slug}`;
+      const imageTag = `${payload.namespace ?? env.DEPLOY_REGISTRY_NAMESPACE}/${
+        environment.project.externalRef
+      }:${deployment.version}.${environment.slug}`;
 
       return { deployment, imageTag };
     });

docs/errors-retrying.mdx

@@ -200,8 +200,11 @@ In this complicated example:
 - If there are no Response headers we let the normal retrying logic handle it (return undefined).
 - If we've run out of requests or tokens we retry at the time specified in the headers.
 
-```ts
+<CodeGroup>
+
+```ts tasks.ts
 import { task } from "@trigger.dev/sdk/v3";
+import { calculateISO8601DurationOpenAIVariantResetAt, openai } from "./openai.js";
 
 export const openaiTask = task({
   id: "openai-task",
@@ -257,6 +260,48 @@ export const openaiTask = task({
 });
 ```
 
+```ts openai.ts
+import { OpenAI } from "openai";
+
+export const openai = new OpenAI({ apiKey: env.OPENAI_API_KEY });
+
+export function calculateISO8601DurationOpenAIVariantResetAt(
+  resets: string,
+  now: Date = new Date()
+): Date | undefined {
+  // Check if the input is null or undefined
+  if (!resets) return undefined;
+
+  // Regular expression to match the duration string pattern
+  const pattern = /^(?:(\d+)d)?(?:(\d+)h)?(?:(\d+)m)?(?:(\d+(?:\.\d+)?)s)?(?:(\d+)ms)?$/;
+  const match = resets.match(pattern);
+
+  // If the string doesn't match the expected format, return undefined
+  if (!match) return undefined;
+
+  // Extract days, hours, minutes, seconds, and milliseconds from the string
+  const days = parseInt(match[1] ?? "0", 10) || 0;
+  const hours = parseInt(match[2] ?? "0", 10) || 0;
+  const minutes = parseInt(match[3] ?? "0", 10) || 0;
+  const seconds = parseFloat(match[4] ?? "0") || 0;
+  const milliseconds = parseInt(match[5] ?? "0", 10) || 0;
+
+  // Calculate the future date based on the current date plus the extracted time
+  const resetAt = new Date(now);
+  resetAt.setDate(resetAt.getDate() + days);
+  resetAt.setHours(resetAt.getHours() + hours);
+  resetAt.setMinutes(resetAt.getMinutes() + minutes);
+  resetAt.setSeconds(resetAt.getSeconds() + Math.floor(seconds));
+  resetAt.setMilliseconds(
+    resetAt.getMilliseconds() + (seconds - Math.floor(seconds)) * 1000 + milliseconds
+  );
+
+  return resetAt;
+}
+```
+
+</CodeGroup>
+
 ## Preventing retries
 
 ### Using `AbortTaskRunError`

docs/guides/new-build-system-preview.mdx

@@ -399,7 +399,24 @@ You can now authenticate the `dev` command using the `TRIGGER_ACCESS_TOKEN` envi
 TRIGGER_ACCESS_TOKEN=<your access token> npx [email protected] dev
 ```
 
+### Better deploy support for self-hosters
+
+You can now specify a custom registry and namespace when deploying via a self-hosted instance of Trigger.dev:
+
+```sh
+npx [email protected] deploy --self-hosted --load-image --push --registry docker.io --namespace mydockerhubusername
+```
+
+All you have to do is create a repository in dockerhub that matches the project ref of your Trigger.dev project (e.g. `proj_rrkpdguyagvsoktglnod`)
+
+<Note>
+  Docker Hub will automatically create a repository the first time you push, which is public by
+  default. If you want to keep these images private, make sure you create the repository before you
+  first run the `deploy` command
+</Note>
+
 ## Known issues
 
 - Path aliases are not yet support in your `trigger.config.ts` file. To workaround this issue you'll need to rewrite path aliases to their relative paths. (See [this](https://github.com/unjs/jiti/issues/166) and [this](https://knip.dev/reference/known-issues#path-aliases-in-config-files)) for more info.
 - Some events in the run trace view may get permanently stuck in a loading state. This is a known issue and we're working on a fix.
+- `*.test.ts` and `.spec.ts` files inside the trigger dirs will be bundled and could cause issues. You'll need to move these files outside of the trigger dirs to avoid this issue.

packages/build/package.json

@@ -63,7 +63,8 @@
   "dependencies": {
     "@trigger.dev/core": "workspace:3.0.0-beta.56",
     "pkg-types": "^1.1.3",
-    "tinyglobby": "^0.2.2"
+    "tinyglobby": "^0.2.2",
+    "tsconfck": "3.1.3"
   },
   "devDependencies": {
     "@types/node": "20.14.14",

packages/build/src/extensions/prisma.ts

@@ -9,6 +9,10 @@ export type PrismaExtensionOptions = {
   schema: string;
   migrate?: boolean;
   version?: string;
+  /**
+   * Adds the `--sql` flag to the `prisma generate` command. This will generate the SQL files for the Prisma schema. Requires the `typedSql preview feature and prisma 5.19.0 or later.
+   */
+  typedSql?: boolean;
   /**
    * The client generator to use. Set this param to prevent all generators in the prisma schema from being generated.
    *
@@ -114,9 +118,40 @@ export class PrismaExtension implements BuildExtension {
 
     let prismaDir: string | undefined;
 
-    const generatorFlag = this.options.clientGenerator
-      ? `--generator=${this.options.clientGenerator}`
-      : "";
+    const generatorFlags: string[] = [];
+
+    if (this.options.clientGenerator) {
+      generatorFlags.push(`--generator=${this.options.clientGenerator}`);
+    }
+
+    if (this.options.typedSql) {
+      generatorFlags.push(`--sql`);
+
+      const schemaDir = dirname(this._resolvedSchemaPath);
+      const prismaDir = dirname(schemaDir);
+
+      context.logger.debug(`Using typedSql`);
+
+      // Find all the files prisma/sql/*.sql
+      const sqlFiles = await readdir(join(prismaDir, "sql")).then((files) =>
+        files.filter((file) => file.endsWith(".sql"))
+      );
+
+      context.logger.debug(`Found sql files`, {
+        sqlFiles,
+      });
+
+      const sqlDestinationPath = join(manifest.outputPath, "prisma", "sql");
+
+      for (const file of sqlFiles) {
+        const destination = join(sqlDestinationPath, file);
+        const source = join(prismaDir, "sql", file);
+
+        context.logger.debug(`Copying the sql from ${source} to ${destination}`);
+
+        await cp(source, destination);
+      }
+    }
 
     if (usingSchemaFolder) {
       const schemaDir = dirname(this._resolvedSchemaPath);
@@ -150,7 +185,7 @@ export class PrismaExtension implements BuildExtension {
       commands.push(
         `${binaryForRuntime(
           manifest.runtime
-        )} node_modules/prisma/build/index.js generate ${generatorFlag}` // Don't add the --schema flag or this will fail
+        )} node_modules/prisma/build/index.js generate ${generatorFlags.join(" ")}` // Don't add the --schema flag or this will fail
       );
     } else {
       prismaDir = dirname(this._resolvedSchemaPath);
@@ -169,7 +204,9 @@ export class PrismaExtension implements BuildExtension {
       commands.push(
         `${binaryForRuntime(
           manifest.runtime
-        )} node_modules/prisma/build/index.js generate --schema=./prisma/schema.prisma ${generatorFlag}`
+        )} node_modules/prisma/build/index.js generate --schema=./prisma/schema.prisma ${generatorFlags.join(
+          " "
+        )}`
       );
     }