v3: pnpm deploy & various fixes for dependency resolution (#1012)

* Don’t swallow some error messages when deploying

* Try and resolve dependency versions using pnpm/npm/yarn

* Adding some debug logs around dependency resolution

* Use npm list instead of npm show to resolve deps

* Improve the dependency resolution

Author: ericallam

.changeset/cuddly-feet-approve.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Don’t swallow some error messages when deploying

packages/cli-v3/package.json

@@ -38,7 +38,6 @@
     "@trigger.dev/core-apps": "workspace:*",
     "@trigger.dev/tsconfig": "workspace:*",
     "@types/gradient-string": "^1.1.2",
-    "@types/jsonlines": "^0.1.5",
     "@types/mock-fs": "^4.13.1",
     "@types/node": "18",
     "@types/object-hash": "^3.0.6",
@@ -106,7 +105,6 @@
     "import-meta-resolve": "^4.0.0",
     "ink": "^4.4.1",
     "jsonc-parser": "^3.2.1",
-    "jsonlines": "^0.1.1",
     "liquidjs": "^10.9.2",
     "mock-fs": "^5.2.0",
     "nanoid": "^4.0.2",
@@ -135,4 +133,4 @@
   "engines": {
     "node": ">=18.0.0"
   }
-}
+}

packages/cli-v3/src/commands/deploy.ts

@@ -55,6 +55,7 @@ import {
   parseNpmInstallError,
 } from "../utilities/deployErrors";
 import { safeJsonParse } from "../utilities/safeJsonParse";
+import { JavascriptProject } from "../utilities/javascriptProject";
 
 const DeployCommandOptions = CommonCommandOptions.extend({
   skipTypecheck: z.boolean().default(false),
@@ -423,7 +424,8 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
         }
 
         const parsedError = finishedDeployment.errorData.stack
-          ? parseBuildErrorStack(finishedDeployment.errorData)
+          ? parseBuildErrorStack(finishedDeployment.errorData) ??
+            finishedDeployment.errorData.message
           : finishedDeployment.errorData.message;
 
         if (typeof parsedError === "string") {
@@ -1118,21 +1120,17 @@ async function compileProject(
       // Get all the required dependencies from the metaOutputs and save them to /tmp/dir/package.json
       const allImports = [...metaOutput.imports, ...entryPointMetaOutput.imports];
 
-      const externalPackageJson = await readJSONFile(join(config.projectDir, "package.json"));
+      const javascriptProject = new JavascriptProject(config.projectDir);
 
-      const dependencies = await gatherRequiredDependencies(
-        allImports,
-        config,
-        externalPackageJson
-      );
+      const dependencies = await gatherRequiredDependencies(allImports, config, javascriptProject);
 
       const packageJsonContents = {
         name: "trigger-worker",
         version: "0.0.0",
         description: "",
         dependencies,
         scripts: {
-          postinstall: externalPackageJson?.scripts?.postinstall,
+          ...javascriptProject.scripts,
         },
       };
 
@@ -1377,7 +1375,7 @@ async function typecheckProject(config: ResolvedConfig, options: DeployCommandOp
 async function gatherRequiredDependencies(
   imports: Metafile["outputs"][string]["imports"],
   config: ResolvedConfig,
-  projectPackageJson: any
+  project: JavascriptProject
 ) {
   const dependencies: Record<string, string> = {};
 
@@ -1392,7 +1390,7 @@ async function gatherRequiredDependencies(
       continue;
     }
 
-    const externalDependencyVersion = (projectPackageJson?.dependencies ?? {})[packageName];
+    const externalDependencyVersion = await project.resolve(packageName);
 
     if (externalDependencyVersion) {
       dependencies[packageName] = stripWorkspaceFromVersion(externalDependencyVersion);
@@ -1420,10 +1418,9 @@ async function gatherRequiredDependencies(
         dependencies[packageParts.name] = packageParts.version;
         continue;
       } else {
-        const externalDependencyVersion = {
-          ...projectPackageJson?.devDependencies,
-          ...projectPackageJson?.dependencies,
-        }[packageName];
+        const externalDependencyVersion = await project.resolve(packageParts.name, {
+          allowDev: true,
+        });
 
         if (externalDependencyVersion) {
           dependencies[packageParts.name] = externalDependencyVersion;

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

@@ -561,7 +561,7 @@ function useDev({
                   } else if (e instanceof UncaughtExceptionError) {
                     const parsedBuildError = parseBuildErrorStack(e.originalError);
 
-                    if (typeof parsedBuildError !== "string") {
+                    if (parsedBuildError && typeof parsedBuildError !== "string") {
                       logESMRequireError(
                         parsedBuildError,
                         configPath

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

@@ -20,7 +20,7 @@ function errorIsErrorLike(error: unknown): error is Error {
   );
 }
 
-export function parseBuildErrorStack(error: unknown): BuildError {
+export function parseBuildErrorStack(error: unknown): BuildError | undefined {
   if (typeof error === "string") {
     return error;
   }
@@ -48,8 +48,6 @@ export function parseBuildErrorStack(error: unknown): BuildError {
       return error.message;
     }
   }
-
-  return "Unknown error";
 }
 
 export function logESMRequireError(parsedError: ESMRequireError, resolvedConfig: ReadConfigResult) {

packages/cli-v3/src/utilities/getUserPackageManager.spec.ts

@@ -1,5 +1,4 @@
-import pathModule from "path";
-import { pathExists } from "./fileSystem.js";
+import { findUp } from "find-up";
 
 export type PackageManager = "npm" | "pnpm" | "yarn";
 
@@ -38,8 +37,8 @@ async function detectPackageManagerFromArtifacts(path: string): Promise<PackageM
   ];
 
   for (const { name, pm } of packageFiles) {
-    const exists = await pathExists(pathModule.join(path, name));
-    if (exists) {
+    const foundPath = await findUp(name, { cwd: path });
+    if (typeof foundPath === "string") {
       return pm;
     }
   }