Squashed commit of the following:

commit 64862db
Author: Niels <[email protected]>
Date:   Thu Sep 19 16:25:17 2024 +0200

    Update dotEnv.ts to ignore OTEL_EXPORTER_OTLP_ENDPOINT as well (#1307)

    * Update dotEnv.ts

    * Create four-buttons-run.md

    ---------

    Co-authored-by: Eric Allam <[email protected]>

commit c65d482
Author: Thibaut Cuchet <[email protected]>
Date:   Thu Sep 19 16:22:57 2024 +0200

    Feat: Extension puppeteer (#1323)

    * feat: add puppeteer extension

    * chore: update package and config

    * feat: add puppeteer task

    * Create little-donkeys-protect.md

    ---------

    Co-authored-by: Eric Allam <[email protected]>

commit b4be736
Author: Eric Allam <[email protected]>
Date:   Thu Sep 19 15:21:03 2024 +0100

    prismaExtension fixes for #1325 and #1327

Author: samejr

.changeset/four-buttons-run.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Ignore OTEL_EXPORTER_OTLP_ENDPOINT environment variable from `.env` files, to prevent the internal OTEL_EXPORTER_OTLP_ENDPOINT being overwritten with a user-supplied value.

.changeset/friendly-brooms-cry.md

@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/build": patch
+---
+
+prismaExtension fixes for #1325 and #1327

.changeset/little-donkeys-protect.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/build": patch
+---
+
+Feat: puppeteer build extension

.vscode/launch.json

@@ -36,6 +36,14 @@
       "cwd": "${workspaceFolder}/references/v3-catalog",
       "sourceMaps": true
     },
+    {
+      "type": "node-terminal",
+      "request": "launch",
+      "name": "Debug prisma-catalog deploy CLI",
+      "command": "pnpm exec trigger deploy --self-hosted --load-image",
+      "cwd": "${workspaceFolder}/references/prisma-catalog",
+      "sourceMaps": true
+    },
     {
       "type": "node-terminal",
       "request": "launch",

docs/config/config-file.mdx

@@ -444,12 +444,9 @@ export default defineConfig({
 ```
 
 <Note>
-  The `prismaExtension` will inject the `DATABASE_URL` environment variable into the build process
-  when running the `deploy` command. This means the CLI needs to have `process.env.DATABASE_URL` set
-  at the time of calling the `deploy` command. You can do this via a `.env` file and passing the
-  `--env-file .env` option to the deploy command or via shell environment variables. This goes for direct database URLs as well.
+  The `prismaExtension` will inject the `DATABASE_URL` environment variable into the build process. Learn more about setting environment variables for deploying in our [Environment Variables](/deploy-environment-variables) guide.
 
-These environment variables are only used during the build process and are not embedded in the final image.
+These environment variables are only used during the build process and are not embedded in the final container image.
 
 </Note>
 

packages/build/package.json

@@ -27,7 +27,8 @@
       "./extensions/core": "./src/extensions/core.ts",
       "./extensions/prisma": "./src/extensions/prisma.ts",
       "./extensions/audioWaveform": "./src/extensions/audioWaveform.ts",
-      "./extensions/typescript": "./src/extensions/typescript.ts"
+      "./extensions/typescript": "./src/extensions/typescript.ts",
+      "./extensions/puppeteer": "./src/extensions/puppeteer.ts"
     },
     "sourceDialects": [
       "@triggerdotdev/source"
@@ -49,6 +50,9 @@
       ],
       "extensions/typescript": [
         "dist/commonjs/extensions/typescript.d.ts"
+      ],
+      "extensions/puppeteer": [
+        "dist/commonjs/extensions/puppeteer.d.ts"
       ]
     }
   },
@@ -145,6 +149,17 @@
         "types": "./dist/commonjs/extensions/typescript.d.ts",
         "default": "./dist/commonjs/extensions/typescript.js"
       }
+    },
+    "./extensions/puppeteer": {
+      "import": {
+        "@triggerdotdev/source": "./src/extensions/puppeteer.ts",
+        "types": "./dist/esm/extensions/puppeteer.d.ts",
+        "default": "./dist/esm/extensions/puppeteer.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/extensions/puppeteer.d.ts",
+        "default": "./dist/commonjs/extensions/puppeteer.js"
+      }
     }
   },
   "main": "./dist/commonjs/index.js",

packages/build/src/extensions/prisma.ts

@@ -127,8 +127,9 @@ export class PrismaExtension implements BuildExtension {
     if (this.options.typedSql) {
       generatorFlags.push(`--sql`);
 
-      const schemaDir = dirname(this._resolvedSchemaPath);
-      const prismaDir = dirname(schemaDir);
+      const prismaDir = usingSchemaFolder
+        ? dirname(dirname(this._resolvedSchemaPath))
+        : dirname(this._resolvedSchemaPath);
 
       context.logger.debug(`Using typedSql`);
 
@@ -226,15 +227,29 @@ export class PrismaExtension implements BuildExtension {
       commands.push(
         `${binaryForRuntime(manifest.runtime)} node_modules/prisma/build/index.js migrate deploy`
       );
+    }
 
-      env.DATABASE_URL = manifest.deploy.env?.DATABASE_URL;
+    env.DATABASE_URL = manifest.deploy.env?.DATABASE_URL;
 
-      if (this.options.directUrlEnvVarName) {
-        env[this.options.directUrlEnvVarName] =
-          manifest.deploy.env?.[this.options.directUrlEnvVarName];
-      } else {
-        env.DIRECT_URL = manifest.deploy.env?.DIRECT_URL;
+    if (this.options.directUrlEnvVarName) {
+      env[this.options.directUrlEnvVarName] =
+        manifest.deploy.env?.[this.options.directUrlEnvVarName] ??
+        process.env[this.options.directUrlEnvVarName];
+
+      if (!env[this.options.directUrlEnvVarName]) {
+        context.logger.warn(
+          `prismaExtension could not resolve the ${this.options.directUrlEnvVarName} environment variable. Make sure you add it to your environment variables or provide it as an environment variable to the deploy CLI command. See our docs for more info: https://trigger.dev/docs/deploy-environment-variables`
+        );
       }
+    } else {
+      env.DIRECT_URL = manifest.deploy.env?.DIRECT_URL;
+      env.DIRECT_DATABASE_URL = manifest.deploy.env?.DIRECT_DATABASE_URL;
+    }
+
+    if (!env.DATABASE_URL) {
+      context.logger.warn(
+        `prismaExtension could not resolve the DATABASE_URL environment variable. Make sure you add it to your environment variables. See our docs for more info: https://trigger.dev/docs/deploy-environment-variables`
+      );
     }
 
     context.logger.debug(`Adding the prisma layer with the following commands`, {

packages/build/src/extensions/puppeteer.ts

@@ -0,0 +1,34 @@
+import { BuildManifest } from "@trigger.dev/core/v3";
+import { BuildContext, BuildExtension } from "@trigger.dev/core/v3/build";
+
+export function puppeteer() {
+  return new PuppeteerExtension();
+}
+
+class PuppeteerExtension implements BuildExtension {
+  public readonly name = "PuppeteerExtension";
+
+  async onBuildComplete(context: BuildContext, manifest: BuildManifest) {
+    if (context.target === "dev") {
+      return;
+    }
+
+    context.logger.debug(`Adding ${this.name} to the build`);
+
+    const instructions = [
+      `RUN apt-get update && apt-get install curl gnupg -y \
+  && curl --location --silent https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+  && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
+  && apt-get update \
+  && apt-get install google-chrome-stable -y --no-install-recommends \
+  && rm -rf /var/lib/apt/lists/*`,
+    ];
+
+    context.addLayer({
+      id: "puppeteer",
+      image: {
+        instructions,
+      },
+    });
+  }
+}

packages/cli-v3/src/deploy/buildImage.ts

@@ -492,7 +492,7 @@ COPY --chown=bun:bun . .
 
 ${postInstallCommands}
 
-from build as indexer
+FROM build AS indexer
 
 USER bun
 WORKDIR /app
@@ -601,7 +601,7 @@ COPY --chown=node:node . .
 
 ${postInstallCommands}
 
-from build as indexer
+FROM build AS indexer
 
 USER node
 WORKDIR /app

packages/cli-v3/src/utilities/dotEnv.ts

@@ -21,6 +21,7 @@ export function resolveDotEnvVars(cwd?: string, envFile?: string) {
   // remove TRIGGER_API_URL and TRIGGER_SECRET_KEY, since those should be coming from the worker
   delete result.TRIGGER_API_URL;
   delete result.TRIGGER_SECRET_KEY;
+  delete result.OTEL_EXPORTER_OTLP_ENDPOINT;
 
   return result;
 }