trigger.dev 3.0.0-beta.50 → 3.0.0-beta.51

package/dist/index.js

@@ -798,7 +798,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "3.0.0-beta.50";
+var version = "3.0.0-beta.51";
 var dependencies = {
   "@anatine/esbuild-decorators": "^0.2.19",
   "@clack/prompts": "^0.7.0",
@@ -815,7 +815,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.50",
+  "@trigger.dev/core": "workspace:3.0.0-beta.51",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -3016,7 +3016,7 @@ function workerSetupImportConfigPlugin(configPath) {
     }
   };
 }
-function bundleDependenciesPlugin(buildIdentifier, dependenciesToBundle, tsconfigPath) {
+function bundleDependenciesPlugin(buildIdentifier, dependencies2, dependenciesToBundle, tsconfigPath) {
   const matchPath = tsconfigPath ? createMatchPath(tsconfigPath) : void 0;
   function resolvePath(id) {
     if (!matchPath) {
@@ -3048,6 +3048,9 @@ function bundleDependenciesPlugin(buildIdentifier, dependenciesToBundle, tsconfi
             return void 0;
           }
         }
+        if (dependencies2[args.path] && !dependencies2[args.path].external) {
+          return void 0;
+        }
         logger.debug(`[${buildIdentifier}] Externalizing ${args.path}`, {
           ...args
         });
@@ -3447,10 +3450,33 @@ var JavascriptProject = class {
       });
     }
   }
-  async resolveAll(packageNames, options) {
+  async extractDirectDependenciesMeta() {
+    return tracer.startActiveSpan(
+      "JavascriptProject.extractDirectDependenciesMeta",
+      async (span) => {
+        const command = await this.#getCommand();
+        span.setAttributes({
+          packageManager: command.name
+        });
+        try {
+          span.end();
+          return await command.extractDirectDependenciesMeta({
+            cwd: this.projectPath
+          });
+        } catch (error) {
+          recordSpanException4(span, error);
+          span.end();
+          logger.debug(`Failed to resolve internal dependencies using ${command.name}`, {
+            error
+          });
+          throw error;
+        }
+      }
+    );
+  }
+  async resolveAll(packageNames) {
     return tracer.startActiveSpan("JavascriptProject.resolveAll", async (span) => {
       const externalPackages = packageNames.filter((packageName) => !isBuiltInModule(packageName));
-      const opts = { allowDev: false, ...options };
       const command = await this.#getCommand();
       span.setAttributes({
         externalPackages,
@@ -3478,15 +3504,6 @@ var JavascriptProject = class {
             });
             missingPackageVersions[packageName] = packageJsonVersion;
           }
-          if (opts.allowDev) {
-            const devPackageJsonVersion = this.packageJson.devDependencies?.[packageName];
-            if (typeof devPackageJsonVersion === "string") {
-              logger.debug(`Resolved ${packageName} version using devDependencies`, {
-                devPackageJsonVersion
-              });
-              missingPackageVersions[packageName] = devPackageJsonVersion;
-            }
-          }
         }
         span.setAttributes({
           ...flattenAttributes2(missingPackageVersions, "missingPackageVersions"),
@@ -3596,6 +3613,36 @@ var PNPMCommands = class {
     }
     return results;
   }
+  async extractDirectDependenciesMeta(options) {
+    const result = await this.#listDirectDependencies(options);
+    logger.debug(`Extracting direct dependencies metadata using ${this.name}`);
+    const results = {};
+    for (const projectPkg of result) {
+      results[projectPkg.name] = { version: projectPkg.version, external: false };
+      if (projectPkg.dependencies) {
+        for (const [name, dep] of Object.entries(projectPkg.dependencies)) {
+          const { version: version2 } = dep;
+          results[name] = {
+            version: version2,
+            external: !version2.startsWith("link:")
+          };
+        }
+      }
+    }
+    return results;
+  }
+  async #listDirectDependencies(options) {
+    const childProcess2 = await $({
+      cwd: options.cwd,
+      reject: false
+    })`${this.cmd} list --recursive --json`;
+    if (childProcess2.failed) {
+      logger.debug("Failed to list dependencies, using stdout anyway...", {
+        error: childProcess2
+      });
+    }
+    return JSON.parse(childProcess2.stdout);
+  }
   async #listDependencies(packageNames, options) {
     const childProcess2 = await $({
       cwd: options.cwd,
@@ -3603,7 +3650,7 @@ var PNPMCommands = class {
     })`${this.cmd} list ${packageNames} -r --json`;
     if (childProcess2.failed) {
       logger.debug("Failed to list dependencies, using stdout anyway...", {
-        error: childProcess2.stderr
+        error: childProcess2
       });
     }
     return JSON.parse(childProcess2.stdout);
@@ -3638,6 +3685,23 @@ var NPMCommands = class {
     }
     return results;
   }
+  async extractDirectDependenciesMeta(options) {
+    const result = await this.#listDirectDependencies(options);
+    logger.debug(`Extracting direct dependencies metadata using ${this.name}`);
+    return result.dependencies ? this.#flattenDependenciesMeta(result.dependencies) : {};
+  }
+  async #listDirectDependencies(options) {
+    const childProcess2 = await $({
+      cwd: options.cwd,
+      reject: false
+    })`${this.cmd} list --json`;
+    if (childProcess2.failed) {
+      logger.debug("Failed to list dependencies, using stdout anyway...", {
+        error: childProcess2
+      });
+    }
+    return JSON.parse(childProcess2.stdout);
+  }
   async #listDependencies(packageNames, options) {
     const childProcess2 = await $({
       cwd: options.cwd,
@@ -3645,7 +3709,7 @@ var NPMCommands = class {
     })`${this.cmd} list ${packageNames} --json`;
     if (childProcess2.failed) {
       logger.debug("Failed to list dependencies, using stdout anyway...", {
-        error: childProcess2.stderr
+        error: childProcess2
       });
     }
     return JSON.parse(childProcess2.stdout);
@@ -3663,6 +3727,17 @@ var NPMCommands = class {
       }
     }
   }
+  #flattenDependenciesMeta(dependencies2) {
+    let results = {};
+    for (const [name, dep] of Object.entries(dependencies2)) {
+      const { version: version2, resolved, dependencies: children } = dep;
+      results[name] = { version: version2, external: !!resolved && !resolved.startsWith("file:") };
+      if (children) {
+        results = { ...results, ...this.#flattenDependenciesMeta(children) };
+      }
+    }
+    return results;
+  }
 };
 var YarnCommands = class {
   get name() {
@@ -3700,6 +3775,30 @@ var YarnCommands = class {
     }
     return results;
   }
+  async extractDirectDependenciesMeta(options) {
+    const result = await this.#listDirectDependencies(options);
+    const rawPackagesData = result.split("\n");
+    logger.debug(`Extracting direct dependencies metadata using ${this.name}`);
+    const results = {};
+    for (const rawPackageData of rawPackagesData) {
+      const packageData = JSON.parse(rawPackageData);
+      const [name, dependencyMeta] = this.#parseYarnValueIntoDependencyMeta(packageData.value);
+      results[name] = dependencyMeta;
+    }
+    return results;
+  }
+  async #listDirectDependencies(options) {
+    const childProcess2 = await $({
+      cwd: options.cwd,
+      reject: false
+    })`${this.cmd} info --all --json`;
+    if (childProcess2.failed) {
+      logger.debug("Failed to list dependencies, using stdout anyway...", {
+        error: childProcess2
+      });
+    }
+    return childProcess2.stdout;
+  }
   async #listDependencies(packageNames, options) {
     const childProcess2 = await $({
       cwd: options.cwd,
@@ -3707,7 +3806,7 @@ var YarnCommands = class {
     })`${this.cmd} info ${packageNames} --json`;
     if (childProcess2.failed) {
       logger.debug("Failed to list dependencies, using stdout anyway...", {
-        error: childProcess2.stderr
+        error: childProcess2
       });
     }
     return childProcess2.stdout;
@@ -3723,6 +3822,26 @@ var YarnCommands = class {
     }
     return parts[0];
   }
+  #parseYarnValueIntoDependencyMeta(value) {
+    const parts = value.split("@");
+    let name, protocol, version2;
+    if (parts.length === 3) {
+      name = `@${parts[1]}`;
+      [protocol = "", version2 = ""] = parts[2].split(":");
+    } else if (parts.length === 2) {
+      name = parts[0].toString();
+      [protocol = "", version2 = ""] = parts[1].split(":");
+    } else {
+      throw new Error("Failed parsing ${value} into dependency meta");
+    }
+    return [
+      name,
+      {
+        version: version2,
+        external: protocol !== "workspace" && protocol !== "file"
+      }
+    ];
+  }
 };
 function isBuiltInModule(module) {
   if (module.startsWith("node:")) {
@@ -4846,6 +4965,7 @@ async function compileProject(config, options, configPath) {
           mockServerOnlyPlugin(),
           bundleDependenciesPlugin(
             "workerFacade",
+            {},
             config.dependenciesToBundle,
             config.tsconfigPath
           ),
@@ -4897,6 +5017,7 @@ async function compileProject(config, options, configPath) {
         plugins: [
           bundleDependenciesPlugin(
             "entryPoint.ts",
+            {},
             config.dependenciesToBundle,
             config.tsconfigPath
           )
@@ -6660,6 +6781,7 @@ function useDev({
           bundleTriggerDevCore("workerFacade", config.tsconfigPath),
           bundleDependenciesPlugin(
             "workerFacade",
+            {},
             (config.dependenciesToBundle ?? []).concat([/^@trigger.dev/]),
             config.tsconfigPath
           ),