Merge branch 'main' into v3/misc-cli-improvements

Author: nicktrn

.changeset/six-rats-hunt.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Improved ESM module require error detection logic

packages/cli-v3/src/commands/dev.tsx

@@ -658,6 +658,10 @@ function useDev({
                     backgroundWorker
                   );
                 } catch (e) {
+                  logger.debug("Error starting background worker", {
+                    error: e,
+                  });
+
                   if (e instanceof TaskMetadataParseError) {
                     logTaskMetadataParseError(e.zodIssues, e.tasks);
                     return;

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

@@ -27,17 +27,10 @@ export function parseBuildErrorStack(error: unknown): BuildError | undefined {
 
   if (errorIsErrorLike(error)) {
     if (typeof error.stack === "string") {
-      const isErrRequireEsm = error.stack.includes("ERR_REQUIRE_ESM");
-
-      let moduleName = null;
-
-      if (isErrRequireEsm) {
-        // Regular expression to match the module path
-        const moduleRegex = /node_modules\/(@[^\/]+\/[^\/]+|[^\/]+)\/[^\/]+\s/;
-        const match = moduleRegex.exec(error.stack);
-        if (match) {
-          moduleName = match[1] as string; // Capture the module name
+      if (error.stack.includes("ERR_REQUIRE_ESM")) {
+        const moduleName = getPackageNameFromEsmRequireError(error.stack);
 
+        if (moduleName) {
           return {
             type: "esm-require-error",
             moduleName,
@@ -50,6 +43,38 @@ export function parseBuildErrorStack(error: unknown): BuildError | undefined {
   }
 }
 
+function getPackageNameFromEsmRequireError(stack: string): string | undefined {
+  const pathRegex = /require\(\) of ES Module (.*) from/;
+  const pathMatch = pathRegex.exec(stack);
+
+  if (!pathMatch) {
+    return;
+  }
+
+  const filePath = pathMatch[1];
+
+  if (!filePath) {
+    return;
+  }
+
+  const lastPart = filePath.split("node_modules/").pop();
+
+  if (!lastPart) {
+    return;
+  }
+
+  // regular expression to match the package name
+  const moduleRegex = /(@[^\/]+\/[^\/]+|[^\/]+)/;
+
+  const match = moduleRegex.exec(lastPart);
+
+  if (!match) {
+    return;
+  }
+
+  return match[1];
+}
+
 export function logESMRequireError(parsedError: ESMRequireError, resolvedConfig: ReadConfigResult) {
   logger.log(
     `\n${chalkError("X Error:")} The ${chalkPurple(

pnpm-lock.yaml

@@ -17,6 +17,7 @@
     "@react-email/components": "^0.0.17",
     "@react-email/render": "^0.0.7",
     "@sindresorhus/slugify": "^2.2.1",
+    "@t3-oss/env-nextjs": "^0.10.1",
     "@traceloop/instrumentation-openai": "^0.3.9",
     "@trigger.dev/core": "workspace:^3.0.0-beta.0",
     "@trigger.dev/sdk": "workspace:^3.0.0-beta.0",
@@ -31,7 +32,8 @@
     "server-only": "^0.0.1",
     "stripe": "^12.14.0",
     "typeorm": "^0.3.20",
-    "yt-dlp-wrap": "^2.3.12"
+    "yt-dlp-wrap": "^2.3.12",
+    "zod": "3.22.3"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.8.0",
@@ -52,11 +54,11 @@
     "@trigger.dev/tsconfig": "workspace:*",
     "@types/node": "20.4.2",
     "@types/react": "^18.3.1",
+    "esbuild": "^0.19.11",
     "trigger.dev": "workspace:*",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.3.0",
-    "esbuild": "^0.19.11",
-    "tsup": "^8.0.1"
+    "tsup": "^8.0.1",
+    "typescript": "^5.3.0"
   }
 }

references/v3-catalog/package.json

@@ -0,0 +1,32 @@
+import { createEnv } from "@t3-oss/env-nextjs";
+import { z } from "zod";
+
+export const env = createEnv({
+  /*
+   * Serverside Environment variables, not available on the client.
+   * Will throw if you access these variables on the client.
+   */
+  server: {
+    TRIGGER_SECRET_KEY: z.string(),
+    OPENAI_API_KEY: z.string().min(1),
+  },
+  /*
+   * Environment variables available on the client (and server).
+   *
+   * 💡 You'll get type errors if these are not prefixed with NEXT_PUBLIC_.
+   */
+  client: {
+    NEXT_PUBLIC_TEST: z.string().min(1).optional(),
+  },
+  /*
+   * Due to how Next.js bundles environment variables on Edge and Client,
+   * we need to manually destructure them to make sure all are included in bundle.
+   *
+   * 💡 You'll get type errors if not all variables from `server` & `client` are included here.
+   */
+  runtimeEnv: {
+    TRIGGER_SECRET_KEY: process.env.TRIGGER_SECRET_KEY,
+    OPENAI_API_KEY: process.env.OPENAI_API_KEY,
+    NEXT_PUBLIC_TEST: process.env.NEXT_PUBLIC_TEST,
+  },
+});

references/v3-catalog/src/env.ts

@@ -1,12 +1,14 @@
 import { logger, task, wait } from "@trigger.dev/sdk/v3";
 
+import { env } from "../env";
+
 export const oneAtATime = task({
   id: "on-at-a-time",
   queue: {
     concurrencyLimit: 1,
   },
   run: async (payload: { message: string }) => {
-    logger.info("One at a time task payload", { payload });
+    logger.info("One at a time task payload", { payload, env });
 
     await wait.for({ seconds: 10 });
 

references/v3-catalog/src/trigger/concurrency.ts

@@ -48,7 +48,7 @@ export const config: TriggerConfig = {
   enableConsoleLogging: false,
   additionalPackages: ["[email protected]", "[email protected]"],
   additionalFiles: ["./wrangler/wrangler.toml"],
-  dependenciesToBundle: [/@sindresorhus/, "escape-string-regexp"],
+  dependenciesToBundle: [/@sindresorhus/, "escape-string-regexp", /@t3-oss/],
   instrumentations: [new OpenAIInstrumentation()],
   logLevel: "info",
   onStart: async (payload, { ctx }) => {

references/v3-catalog/trigger.config.ts

@@ -13,6 +13,9 @@
       "@trigger.dev/sdk/v3/*": ["../../packages/trigger-sdk/src/v3/*"]
     },
     "emitDecoratorMetadata": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowJs": true,
+    "moduleResolution": "Bundler",
+    "module": "ES2015"
   }
 }