trigger.dev 0.0.0-v3-prerelease-20240513155118 → 0.0.0-v3-prerelease-20240515122634

package/dist/index.js

@@ -799,7 +799,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "0.0.0-v3-prerelease-20240513155118";
+var version = "0.0.0-v3-prerelease-20240515122634";
 var dependencies = {
   "@anatine/esbuild-decorators": "^0.2.19",
   "@clack/prompts": "^0.7.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:0.0.0-v3-prerelease-20240513155118",
+  "@trigger.dev/core": "workspace:0.0.0-v3-prerelease-20240515122634",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -826,7 +826,7 @@ var dependencies = {
   dotenv: "^16.4.4",
   esbuild: "^0.19.11",
   evt: "^2.4.13",
-  execa: "^8.0.0",
+  execa: "^9.1.0",
   "find-up": "^7.0.0",
   glob: "^10.3.10",
   "gradient-string": "^2.0.2",
@@ -1887,14 +1887,27 @@ function stripWorkspaceFromVersion(version2) {
   return version2.replace(/^workspace:/, "");
 }
 function parsePackageName(packageSpecifier) {
-  const parts = packageSpecifier.split("@");
-  if (parts.length === 1 && typeof parts[0] === "string") {
-    return { name: parts[0] };
+  let name;
+  let version2;
+  if (packageSpecifier.startsWith("@")) {
+    const atIndex = packageSpecifier.indexOf("@", 1);
+    if (atIndex !== -1) {
+      name = packageSpecifier.slice(0, atIndex);
+      version2 = packageSpecifier.slice(atIndex + 1);
+    } else {
+      name = packageSpecifier;
+    }
+  } else {
+    const [packageName, packageVersion] = packageSpecifier.split("@");
+    if (typeof packageName === "string") {
+      name = packageName;
+    }
+    version2 = packageVersion;
   }
-  if (parts.length === 2 && typeof parts[0] === "string" && typeof parts[1] === "string") {
-    return { name: parts[0], version: parts[1] };
+  if (!name) {
+    return { name: packageSpecifier };
   }
-  return { name: packageSpecifier };
+  return { name, version: version2 };
 }
 async function setPackageJsonDeps(path7, deps) {
   try {
@@ -3448,8 +3461,7 @@ var PNPMCommands = class {
     }
   }
   async resolveDependencyVersions(packageNames, options) {
-    const { stdout } = await $({ cwd: options.cwd })`${this.cmd} list ${packageNames} -r --json`;
-    const result = JSON.parse(stdout);
+    const result = await this.#listDependencies(packageNames, options);
     logger.debug(`Resolving ${packageNames.join(" ")} version using ${this.name}`);
     const results = {};
     for (const dep of result) {
@@ -3462,6 +3474,18 @@ var PNPMCommands = class {
     }
     return results;
   }
+  async #listDependencies(packageNames, options) {
+    const childProcess2 = await $({
+      cwd: options.cwd,
+      reject: false
+    })`${this.cmd} list ${packageNames} -r --json`;
+    if (childProcess2.failed) {
+      logger.debug("Failed to list dependencies, using stdout anyway...", {
+        error: childProcess2.stderr
+      });
+    }
+    return JSON.parse(childProcess2.stdout);
+  }
 };
 var NPMCommands = class {
   get name() {
@@ -3481,8 +3505,7 @@ var NPMCommands = class {
     return this.#recursivelySearchDependencies(output.dependencies, packageName);
   }
   async resolveDependencyVersions(packageNames, options) {
-    const { stdout } = await $({ cwd: options.cwd })`${this.cmd} list ${packageNames} --json`;
-    const output = JSON.parse(stdout);
+    const output = await this.#listDependencies(packageNames, options);
     logger.debug(`Resolving ${packageNames.join(" ")} version using ${this.name}`, { output });
     const results = {};
     for (const packageName of packageNames) {
@@ -3493,6 +3516,18 @@ var NPMCommands = class {
     }
     return results;
   }
+  async #listDependencies(packageNames, options) {
+    const childProcess2 = await $({
+      cwd: options.cwd,
+      reject: false
+    })`${this.cmd} list ${packageNames} --json`;
+    if (childProcess2.failed) {
+      logger.debug("Failed to list dependencies, using stdout anyway...", {
+        error: childProcess2.stderr
+      });
+    }
+    return JSON.parse(childProcess2.stdout);
+  }
   #recursivelySearchDependencies(dependencies2, packageName) {
     for (const [name, dependency] of Object.entries(dependencies2)) {
       if (name === packageName) {
@@ -3530,7 +3565,7 @@ var YarnCommands = class {
     }
   }
   async resolveDependencyVersions(packageNames, options) {
-    const { stdout } = await $({ cwd: options.cwd })`${this.cmd} info ${packageNames} --json`;
+    const stdout = await this.#listDependencies(packageNames, options);
     const lines = stdout.split("\n");
     logger.debug(`Resolving ${packageNames.join(" ")} version using ${this.name}`);
     const results = {};
@@ -3543,6 +3578,18 @@ var YarnCommands = class {
     }
     return results;
   }
+  async #listDependencies(packageNames, options) {
+    const childProcess2 = await $({
+      cwd: options.cwd,
+      reject: false
+    })`${this.cmd} info ${packageNames} --json`;
+    if (childProcess2.failed) {
+      logger.debug("Failed to list dependencies, using stdout anyway...", {
+        error: childProcess2.stderr
+      });
+    }
+    return childProcess2.stdout;
+  }
   // The "value" when doing yarn info is formatted like this:
   // "package-name@npm:version" or "package-name@workspace:version"
   // This function will parse the value into just the package name.