trigger.dev 3.0.0-beta.1 → 3.0.0-beta.2

package/dist/index.js

@@ -800,7 +800,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "3.0.0-beta.1";
+var version = "3.0.0-beta.2";
 var dependencies = {
   "@clack/prompts": "^0.7.0",
   "@depot/cli": "0.0.1-cli.2.55.0",
@@ -816,7 +816,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.0",
+  "@trigger.dev/core": "workspace:^3.0.0-beta.1",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -1736,7 +1736,7 @@ ${logo()} ${chalkGrey("(v3 Developer Preview)")}`;
 }
 function printDevBanner() {
   logger.log(
-    `${chalkGrey("Key:")} ${chalkWorker("Worker")} ${chalkGrey("|")} ${chalkTask(
+    `${chalkGrey("Key:")} ${chalkWorker("Version")} ${chalkGrey("|")} ${chalkTask(
       "Task"
     )} ${chalkGrey("|")} ${chalkRun("Run")}`
   );
@@ -2722,9 +2722,9 @@ ${authorizationCodeResult.error}`
 }
 
 // src/utilities/build.ts
+import { readFileSync } from "node:fs";
 import { extname, isAbsolute } from "node:path";
 import tsConfigPaths from "tsconfig-paths";
-import { readFileSync } from "node:fs";
 function workerSetupImportConfigPlugin(configPath) {
   return {
     name: "trigger-worker-setup",
@@ -2751,8 +2751,8 @@ function workerSetupImportConfigPlugin(configPath) {
     }
   };
 }
-function bundleDependenciesPlugin(config) {
-  const matchPath = config.tsconfigPath ? createMatchPath(config.tsconfigPath) : void 0;
+function bundleDependenciesPlugin(buildIdentifier, dependenciesToBundle, tsconfigPath) {
+  const matchPath = tsconfigPath ? createMatchPath(tsconfigPath) : void 0;
   function resolvePath(id) {
     if (!matchPath) {
       return id;
@@ -2764,26 +2764,7 @@ function bundleDependenciesPlugin(config) {
     setup(build3) {
       build3.onResolve({ filter: /.*/ }, (args) => {
         const resolvedPath = resolvePath(args.path);
-        logger.ignore(`Checking if ${args.path} should be bundled or external`, {
-          ...args,
-          resolvedPath
-        });
         if (!isBareModuleId(resolvedPath)) {
-          logger.ignore(`Bundling ${args.path} because its not a bareModuleId`, {
-            ...args
-          });
-          return void 0;
-        }
-        if (args.path.startsWith("@trigger.dev/")) {
-          logger.ignore(`Bundling ${args.path} because its a trigger.dev package`, {
-            ...args
-          });
-          return void 0;
-        }
-        if (args.path === "superjson" || args.path === "copy-anything" || args.path === "is-what") {
-          logger.debug(`Bundling ${args.path} because its superjson/copy-anything/is-what`, {
-            ...args
-          });
           return void 0;
         }
         let loader;
@@ -2797,12 +2778,12 @@ function bundleDependenciesPlugin(config) {
         if (loader === "file") {
           return void 0;
         }
-        for (let pattern of config.dependenciesToBundle ?? []) {
+        for (let pattern of dependenciesToBundle ?? []) {
           if (typeof pattern === "string" ? args.path === pattern : pattern.test(args.path)) {
             return void 0;
           }
         }
-        logger.ignore(`Externalizing ${args.path}`, {
+        logger.ignore(`[${buildIdentifier}] Externalizing ${args.path}`, {
           ...args
         });
         return {
@@ -3499,7 +3480,14 @@ async function compileProject(config, options, configPath) {
           TRIGGER_API_URL: `"${config.triggerUrl}"`,
           __PROJECT_CONFIG__: JSON.stringify(config)
         },
-        plugins: [bundleDependenciesPlugin(config), workerSetupImportConfigPlugin(configPath)]
+        plugins: [
+          bundleDependenciesPlugin(
+            "workerFacade",
+            config.dependenciesToBundle,
+            config.tsconfigPath
+          ),
+          workerSetupImportConfigPlugin(configPath)
+        ]
       });
       if (result.errors.length > 0) {
         compileSpinner.stop("Build failed, aborting deployment");
@@ -3531,17 +3519,23 @@ async function compileProject(config, options, configPath) {
         write: false,
         minify: false,
         sourcemap: false,
-        packages: "external",
-        // https://esbuild.github.io/api/#packages
         logLevel: "error",
         platform: "node",
+        packages: "external",
         format: "cjs",
         // This is needed to support opentelemetry instrumentation that uses module patching
         target: ["node18", "es2020"],
         outdir: "out",
         define: {
           __PROJECT_CONFIG__: JSON.stringify(config)
-        }
+        },
+        plugins: [
+          bundleDependenciesPlugin(
+            "entryPoint.ts",
+            config.dependenciesToBundle,
+            config.tsconfigPath
+          )
+        ]
       });
       if (entryPointResult.errors.length > 0) {
         compileSpinner.stop("Build failed, aborting deployment");
@@ -3583,6 +3577,10 @@ async function compileProject(config, options, configPath) {
       );
       await writeFile2(join4(tempDir, "worker.js.map"), workerSourcemapFile.text);
       await writeFile2(join4(tempDir, "index.js"), entryPointOutputFile.text);
+      logger.debug("Getting the imports for the worker and entryPoint builds", {
+        workerImports: metaOutput.imports,
+        entryPointImports: entryPointMetaOutput.imports
+      });
       const allImports = [...metaOutput.imports, ...entryPointMetaOutput.imports];
       const externalPackageJson = await readJSONFile(join4(config.projectDir, "package.json"));
       const dependencies2 = await gatherRequiredDependencies(
@@ -3740,7 +3738,7 @@ async function typecheckProject(config, options) {
 async function gatherRequiredDependencies(imports, config, projectPackageJson) {
   const dependencies2 = {};
   for (const file of imports) {
-    if (file.kind !== "require-call" || !file.external) {
+    if (file.kind !== "require-call" && file.kind !== "dynamic-import" || !file.external) {
       continue;
     }
     const packageName = detectPackageNameFromImportPath(file.path);
@@ -3842,7 +3840,7 @@ async function findAllEnvironmentVariableReferencesInFile(filePath) {
   const fileContents = await readFile2(filePath, "utf-8");
   return findAllEnvironmentVariableReferences(fileContents);
 }
-var IGNORED_ENV_VARS = ["NODE_ENV", "SHELL", "HOME", "PWD", "LOGNAME", "USER", "PATH"];
+var IGNORED_ENV_VARS = ["NODE_ENV", "SHELL", "HOME", "PWD", "LOGNAME", "USER", "PATH", "DEBUG"];
 function findAllEnvironmentVariableReferences(code) {
   const regex = /\bprocess\.env\.([a-zA-Z_][a-zA-Z0-9_]*)\b/g;
   const matches = code.matchAll(regex);
@@ -4708,7 +4706,11 @@ function useDev({
           __PROJECT_CONFIG__: JSON.stringify(config)
         },
         plugins: [
-          bundleDependenciesPlugin(config),
+          bundleDependenciesPlugin(
+            "workerFacade",
+            (config.dependenciesToBundle ?? []).concat([/^@trigger.dev/]),
+            config.tsconfigPath
+          ),
           workerSetupImportConfigPlugin(configPath),
           {
             name: "trigger.dev v3",
@@ -4901,8 +4903,11 @@ function WebsocketFactory(apiKey) {
 }
 async function gatherRequiredDependencies2(outputMeta, config) {
   const dependencies2 = {};
+  logger.debug("Gathering required dependencies from imports", {
+    imports: outputMeta.imports
+  });
   for (const file of outputMeta.imports) {
-    if (file.kind !== "require-call" || !file.external) {
+    if (file.kind !== "require-call" && file.kind !== "dynamic-import" || !file.external) {
       continue;
     }
     const packageName = detectPackageNameFromImportPath(file.path);