From 12b3d9ec9fcbe37fe398d017a4534cd9982ef997 Mon Sep 17 00:00:00 2001
From: Felipe Plets <felipe.plets@zensurance.com>
Date: Wed, 27 Dec 2023 16:31:06 -0500
Subject: [PATCH] fix: add root node_modules to import commands when running
 pnpm

---
 packages/cli/src/commands.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands.js b/packages/cli/src/commands.js
index 8cdb972e4..586c2f2af 100644
--- a/packages/cli/src/commands.js
+++ b/packages/cli/src/commands.js
@@ -100,6 +100,23 @@ function formatFilepath(filepath) {
   return filepath;
 }
 
+function getSiblings(root) {
+  const siblings = [path.join(root, '..')];
+
+  // if we're in a pnpm package, add the root of the workspace node_modules to the list of siblings
+  if (root.includes('.pnpm')) {
+    // Find the index of the first occurrence of '.pnpm'
+    const nodeModulesIndex = root.indexOf('.pnpm');
+
+    // If 'node_modules' is found, extract the substring up to that point
+    if (nodeModulesIndex !== -1) {
+      siblings.push(path.join(root.substring(0, nodeModulesIndex), '@percy'));
+    }
+  }
+
+  return siblings;
+}
+
 // Imports and returns compatibile CLI commands from various sources
 export async function importCommands() {
   let root = path.resolve(url.fileURLToPath(import.meta.url), '../..');
@@ -109,7 +126,7 @@ export async function importCommands() {
     // find included dependencies
     root,
     // find potential sibling packages
-    path.join(root, '..'),
+    ...getSiblings(root),
     // find any current project dependencies
     process.cwd()
   ]), async (roots, dir) => {