[cli] Use getNodeBinPaths() in vc dev (#10225)

This allows for the "dev command" of a Project to work better in monorepos, where the dev server might live up the node_modules hierarchy within the repo.
vercel · Jul 19, 2023 · 7b01a07 · 7b01a07
1 parent ce4633f
commit 7b01a07
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.changeset/late-bobcats-behave.md b/.changeset/late-bobcats-behave.md
@@ -0,0 +1,5 @@
+---
+'vercel': patch
+---
+
+Use `getNodeBinPaths()` in `vc dev`
diff --git a/packages/cli/src/commands/dev/dev.ts b/packages/cli/src/commands/dev/dev.ts
@@ -57,12 +57,13 @@ export default async function dev(
 
   let projectSettings: ProjectSettings | undefined;
   let envValues: Record<string, string> = {};
+  let repoRoot: string | undefined;
   if (link.status === 'linked') {
-    const { project, org, repoRoot } = link;
+    const { project, org } = link;
 
     // If repo linked, update `cwd` to the repo root
-    if (repoRoot) {
-      cwd = repoRoot;
+    if (link.repoRoot) {
+      repoRoot = cwd = link.repoRoot;
     }
 
     client.config.currentTeam = org.type === 'team' ? org.id : undefined;
@@ -82,6 +83,7 @@ export default async function dev(
     output,
     projectSettings,
     envValues,
+    repoRoot,
   });
 
   // listen to SIGTERM for graceful shutdown

diff --git a/packages/cli/src/util/dev/server.ts b/packages/cli/src/util/dev/server.ts
@@ -32,7 +32,7 @@ import {
   Builder,
   cloneEnv,
   Env,
-  getNodeBinPath,
+  getNodeBinPaths,
   StartDevServerResult,
   FileFsRef,
   PackageJson,
@@ -124,6 +124,7 @@ function sortBuilders(buildA: Builder, buildB: Builder) {
 
 export default class DevServer {
   public cwd: string;
+  public repoRoot: string;
   public output: Output;
   public proxy: httpProxy;
   public envConfigs: EnvConfigs;
@@ -169,6 +170,7 @@ export default class DevServer {
 
   constructor(cwd: string, options: DevServerOptions) {
     this.cwd = cwd;
+    this.repoRoot = options.repoRoot ?? cwd;
     this.output = options.output;
     this.envConfigs = { buildEnv: {}, runEnv: {}, allEnv: {} };
     this.envValues = options.envValues || {};
@@ -1412,7 +1414,7 @@ export default class DevServer {
             files,
             entrypoint: middleware.entrypoint,
             workPath,
-            repoRootPath: this.cwd,
+            repoRootPath: this.repoRoot,
             config: middleware.config || {},
             meta: {
               isDev: true,
@@ -1849,7 +1851,7 @@ export default class DevServer {
           entrypoint: match.entrypoint,
           workPath,
           config: match.config || {},
-          repoRootPath: this.cwd,
+          repoRootPath: this.repoRoot,
           meta: {
             isDev: true,
             requestPath,
@@ -2237,7 +2239,8 @@ export default class DevServer {
     );
 
     // add the node_modules/.bin directory to the PATH
-    const nodeBinPath = await getNodeBinPath({ cwd });
+    const nodeBinPaths = getNodeBinPaths({ base: this.repoRoot, start: cwd });
+    const nodeBinPath = nodeBinPaths.join(path.delimiter);
     env.PATH = `${nodeBinPath}${path.delimiter}${env.PATH}`;
 
     // This is necesary so that the dev command in the Project

diff --git a/packages/cli/src/util/dev/types.ts b/packages/cli/src/util/dev/types.ts
@@ -25,6 +25,7 @@ export interface DevServerOptions {
   output: Output;
   projectSettings?: ProjectSettings;
   envValues?: Record<string, string>;
+  repoRoot?: string;
 }
 
 export interface EnvConfigs {