trigger.dev 0.0.0-v3-pnpm-fix-20240404110601 → 0.0.0-v3-pnpm-fix-20240404122439

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-20240404110601";
+var version = "0.0.0-v3-pnpm-fix-20240404122439";
 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-20240404110601",
+  "@trigger.dev/core": "workspace:0.0.0-v3-pnpm-fix-20240404122439",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -4360,7 +4360,11 @@ var BackgroundWorker = class {
     }
     let resolved = false;
     const cwd = dirname2(this.path);
-    logger.debug("Initializing worker", { path: this.path, cwd });
+    const fullEnv = {
+      ...this.params.env,
+      ...this.#readEnvVars()
+    };
+    logger.debug("Initializing worker", { path: this.path, cwd, fullEnv });
     this.tasks = await new Promise((resolve4, reject) => {
       const child = fork(this.path, {
         stdio: [
@@ -4373,10 +4377,7 @@ var BackgroundWorker = class {
           "ipc"
         ],
         cwd,
-        env: {
-          ...this.params.env,
-          ...this.#readEnvVars()
-        }
+        env: fullEnv
       });
       const timeout = setTimeout(() => {
         if (resolved) {
@@ -4750,6 +4751,7 @@ function runtimeCheck(minimumMajor, minimumMinor) {
 }
 
 // src/commands/dev.tsx
+import { findUp as findUp2, pathExists as pathExists2 } from "find-up";
 var apiClient;
 var DevCommandOptions = CommonCommandOptions.extend({
   debugger: z5.boolean().default(false),
@@ -5071,7 +5073,7 @@ function useDev({
                   await fs7.promises.writeFile(sourceMapPath2, sourceMapFile.text);
                 }
                 const environmentVariablesResponse = await environmentClient.getEnvironmentVariables(config.project);
-                const processEnv = gatherProcessEnv();
+                const processEnv = await gatherProcessEnv();
                 const backgroundWorker = new BackgroundWorker(fullPath, {
                   projectConfig: config,
                   dependencies: dependencies2,
@@ -5302,7 +5304,7 @@ ${task.filePath} -> ${task.exportName}`).join("")}`;
   }).join("");
   return `Duplicate ${chalkTask("task id")} detected:${duplicateTable}`;
 }
-function gatherProcessEnv() {
+async function gatherProcessEnv() {
   const env = {
     NODE_ENV: process.env.NODE_ENV ?? "development",
     PATH: process.env.PATH,
@@ -5313,12 +5315,37 @@ function gatherProcessEnv() {
     NVM_BIN: process.env.NVM_BIN,
     LANG: process.env.LANG,
     TERM: process.env.TERM,
-    NODE_PATH: process.env.NODE_PATH,
+    NODE_PATH: await amendNodePathWithPnpmNodeModules(process.env.NODE_PATH),
     HOME: process.env.HOME,
     BUN_INSTALL: process.env.BUN_INSTALL
   };
   return Object.fromEntries(Object.entries(env).filter(([key, value]) => value !== void 0));
 }
+async function amendNodePathWithPnpmNodeModules(nodePath) {
+  const pnpmModulesPath = await findPnpmNodeModulesPath();
+  if (!pnpmModulesPath) {
+    return nodePath;
+  }
+  if (nodePath) {
+    if (nodePath.includes(pnpmModulesPath)) {
+      return nodePath;
+    }
+    return `${nodePath}:${pnpmModulesPath}`;
+  }
+  return pnpmModulesPath;
+}
+async function findPnpmNodeModulesPath() {
+  return await findUp2(
+    async (directory) => {
+      const pnpmModules = join5(directory, "node_modules", ".pnpm", "node_modules");
+      const hasPnpmNodeModules = await pathExists2(pnpmModules);
+      if (hasPnpmNodeModules) {
+        return pnpmModules;
+      }
+    },
+    { type: "directory" }
+  );
+}
 
 // src/commands/init.ts
 import { intro as intro4, isCancel, log as log3, outro as outro4, select as select2, spinner as spinner5, text } from "@clack/prompts";