trigger.dev 0.0.0-v3-pnpm-fix-20240409124823 → 0.0.0-v3-pnpm-fix-20240409132306

package/dist/index.js

@@ -801,7 +801,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "0.0.0-v3-pnpm-fix-20240409124823";
+var version = "0.0.0-v3-pnpm-fix-20240409132306";
 var dependencies = {
   "@clack/prompts": "^0.7.0",
   "@depot/cli": "0.0.1-cli.2.55.0",
@@ -817,7 +817,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-pnpm-fix-20240409124823",
+  "@trigger.dev/core": "workspace:0.0.0-v3-pnpm-fix-20240409132306",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -3076,11 +3076,94 @@ function safeJsonParse(json) {
 // src/utilities/javascriptProject.ts
 import { $ } from "execa";
 import { join as join4 } from "node:path";
+
+// src/utilities/getUserPackageManager.ts
+import { findUp as findUp2 } from "find-up";
+async function getUserPackageManager(path6) {
+  try {
+    return await detectPackageManagerFromArtifacts(path6);
+  } catch (error) {
+    return detectPackageManagerFromCurrentCommand();
+  }
+}
+function detectPackageManagerFromCurrentCommand() {
+  const userAgent = process.env.npm_config_user_agent;
+  if (userAgent) {
+    if (userAgent.startsWith("yarn")) {
+      return "yarn";
+    } else if (userAgent.startsWith("pnpm")) {
+      return "pnpm";
+    } else {
+      return "npm";
+    }
+  } else {
+    return "npm";
+  }
+}
+async function detectPackageManagerFromArtifacts(path6) {
+  const packageFiles = [
+    { name: "yarn.lock", pm: "yarn" },
+    { name: "pnpm-lock.yaml", pm: "pnpm" },
+    { name: "package-lock.json", pm: "npm" },
+    { name: "npm-shrinkwrap.json", pm: "npm" }
+  ];
+  for (const { name, pm } of packageFiles) {
+    const foundPath = await findUp2(name, { cwd: path6 });
+    if (typeof foundPath === "string") {
+      return pm;
+    }
+  }
+  throw new Error("Could not detect package manager from artifacts");
+}
+
+// src/utilities/javascriptProject.ts
+var BuiltInModules = /* @__PURE__ */ new Set([
+  "assert",
+  "async_hooks",
+  "buffer",
+  "child_process",
+  "cluster",
+  "console",
+  "constants",
+  "crypto",
+  "dgram",
+  "dns",
+  "domain",
+  "events",
+  "fs",
+  "http",
+  "http2",
+  "https",
+  "inspector",
+  "module",
+  "net",
+  "os",
+  "path",
+  "perf_hooks",
+  "process",
+  "punycode",
+  "querystring",
+  "readline",
+  "repl",
+  "stream",
+  "string_decoder",
+  "timers",
+  "tls",
+  "trace_events",
+  "tty",
+  "url",
+  "util",
+  "v8",
+  "vm",
+  "worker_threads",
+  "zlib"
+]);
 var JavascriptProject = class {
   constructor(projectPath) {
     this.projectPath = projectPath;
   }
   _packageJson;
+  _packageManager;
   get packageJson() {
     if (!this._packageJson) {
       this._packageJson = readJSONFileSync(join4(this.projectPath, "package.json"));
@@ -3093,6 +3176,13 @@ var JavascriptProject = class {
     };
   }
   async resolve(packageName, options) {
+    if (BuiltInModules.has(packageName)) {
+      return void 0;
+    }
+    if (!this._packageManager) {
+      this._packageManager = await getUserPackageManager(this.projectPath);
+    }
+    const packageManager = this._packageManager;
     const opts = { allowDev: false, ...options };
     const packageJsonVersion = this.packageJson.dependencies?.[packageName];
     if (typeof packageJsonVersion === "string") {
@@ -3104,21 +3194,19 @@ var JavascriptProject = class {
         return devPackageJsonVersion;
       }
     }
-    const commands = [new NPMCommands(), new PNPMCommands(), new YarnCommands()];
-    for (const command of commands) {
-      try {
-        const version2 = await command.resolveDependencyVersion(packageName, {
-          cwd: this.projectPath
-        });
-        if (version2) {
-          return version2;
-        }
-      } catch (error) {
-        logger.debug(`Failed to resolve dependency version using ${command.name}`, {
-          packageName,
-          error
-        });
+    const command = packageManager === "npm" ? new NPMCommands() : packageManager === "pnpm" ? new PNPMCommands() : new YarnCommands();
+    try {
+      const version2 = await command.resolveDependencyVersion(packageName, {
+        cwd: this.projectPath
+      });
+      if (version2) {
+        return version2;
       }
+    } catch (error) {
+      logger.debug(`Failed to resolve dependency version using ${command.name}`, {
+        packageName,
+        error
+      });
     }
   }
 };
@@ -3145,9 +3233,23 @@ var NPMCommands = class {
   }
   async resolveDependencyVersion(packageName, options) {
     const cmd = process.platform === "win32" ? "npm.cmd" : "npm";
-    const { stdout } = await $({ cwd: options.cwd })`${cmd} show ${packageName} version`;
-    logger.debug(`Resolving ${packageName} version using npm`, { version: stdout.trim() });
-    return stdout.trim();
+    const { stdout } = await $({ cwd: options.cwd })`${cmd} list ${packageName} --json`;
+    const output = JSON.parse(stdout);
+    logger.debug(`Resolving ${packageName} version using npm`, { output });
+    return this.#recursivelySearchDependencies(output.dependencies, packageName);
+  }
+  #recursivelySearchDependencies(dependencies2, packageName) {
+    for (const [name, dependency] of Object.entries(dependencies2)) {
+      if (name === packageName) {
+        return dependency.version;
+      }
+      if (dependency.dependencies) {
+        const result = this.#recursivelySearchDependencies(dependency.dependencies, packageName);
+        if (result) {
+          return result;
+        }
+      }
+    }
   }
 };
 var YarnCommands = class {
@@ -4873,7 +4975,7 @@ function runtimeCheck(minimumMajor, minimumMinor) {
 }
 
 // src/commands/dev.tsx
-import { findUp as findUp2, pathExists as pathExists2 } from "find-up";
+import { findUp as findUp3, pathExists as pathExists2 } from "find-up";
 var apiClient;
 var DevCommandOptions = CommonCommandOptions.extend({
   debugger: z5.boolean().default(false),
@@ -5457,7 +5559,7 @@ async function amendNodePathWithPnpmNodeModules(nodePath) {
   return pnpmModulesPath;
 }
 async function findPnpmNodeModulesPath() {
-  return await findUp2(
+  return await findUp3(
     async (directory) => {
       const pnpmModules = join6(directory, "node_modules", ".pnpm", "node_modules");
       const hasPnpmNodeModules = await pathExists2(pnpmModules);
@@ -5525,45 +5627,6 @@ function replaceAll(input, replacements) {
   return output;
 }
 
-// src/utilities/getUserPackageManager.ts
-import pathModule2 from "path";
-async function getUserPackageManager(path6) {
-  try {
-    return await detectPackageManagerFromArtifacts(path6);
-  } catch (error) {
-    return detectPackageManagerFromCurrentCommand();
-  }
-}
-function detectPackageManagerFromCurrentCommand() {
-  const userAgent = process.env.npm_config_user_agent;
-  if (userAgent) {
-    if (userAgent.startsWith("yarn")) {
-      return "yarn";
-    } else if (userAgent.startsWith("pnpm")) {
-      return "pnpm";
-    } else {
-      return "npm";
-    }
-  } else {
-    return "npm";
-  }
-}
-async function detectPackageManagerFromArtifacts(path6) {
-  const packageFiles = [
-    { name: "yarn.lock", pm: "yarn" },
-    { name: "pnpm-lock.yaml", pm: "pnpm" },
-    { name: "package-lock.json", pm: "npm" },
-    { name: "npm-shrinkwrap.json", pm: "npm" }
-  ];
-  for (const { name, pm } of packageFiles) {
-    const exists = await pathExists(pathModule2.join(path6, name));
-    if (exists) {
-      return pm;
-    }
-  }
-  throw new Error("Could not detect package manager from artifacts");
-}
-
 // src/utilities/resolveInternalFilePath.ts
 import { resolve as importResolve3 } from "import-meta-resolve";
 function resolveInternalFilePath(filePath) {