Merge pull request #47 from Djaler/fix-pnpm

fix project root detection in pnpm
toplenboren · Apr 2, 2021 · 173ca0b · 173ca0b
2 parents 349ee17 + 8d4bb00
commit 173ca0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/simple-git-hooks.js b/simple-git-hooks.js
@@ -84,15 +84,13 @@ function getProjectRootDirectoryFromNodeModules(projectPath) {
     const projDir = projectPath.split(/[\\/]/) // <- would split both on '/' and '\'
 
     if (projDir.includes('.pnpm')
-        && projDir.length > 5
-        && _arraysAreEqual(projDir.slice(projDir.length - 5), [
+        && projDir.length > 3
+        && _arraysAreEqual(projDir.slice(projDir.length - 3), [
             'node_modules',
             '.pnpm',
             `simple-git-hooks@${packageVersion}`,
-            'node_modules',
-            'simple-git-hooks'
         ])) {
-        return projDir.slice(0, projDir.length - 5).join('/');
+        return projDir.slice(0, projDir.length - 3).join('/');
     }
 
     // A yarn2 STAB

diff --git a/simple-git-hooks.test.js b/simple-git-hooks.test.js
@@ -21,7 +21,7 @@ test('getProjectRootDirectory falls back to undefined when we are not in node_mo
 })
 
 test('getProjectRootDirectory return correct dir when installed using pnpm:', () => {
-    expect(spc.getProjectRootDirectoryFromNodeModules(`var/my-project/node_modules/.pnpm/simple-git-hooks@${packageVersion}/node_modules/simple-git-hooks`)).toBe('var/my-project')
+    expect(spc.getProjectRootDirectoryFromNodeModules(`var/my-project/node_modules/.pnpm/simple-git-hooks@${packageVersion}`)).toBe('var/my-project')
 })