Merge pull request #90 from AlexPoleschuk/bugfix/yarn3-nodelinker-pnp…

…m-fix fix: using with yarn3 nodeLinker pnpm
toplenboren · Jul 17, 2023 · 2acc134 · 2acc134
2 parents 4a89119 + 10b2830
commit 2acc134
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/simple-git-hooks.js b/simple-git-hooks.js
@@ -93,6 +93,11 @@ function getProjectRootDirectoryFromNodeModules(projectPath) {
         return projDir.slice(0, indexOfPnpmDir - 1).join('/');
     }
 
+    const indexOfStoreDir = projDir.indexOf('.store')
+    if (indexOfStoreDir > -1) {
+        return projDir.slice(0, indexOfStoreDir - 1).join('/');
+    }
+
     // A yarn2 STAB
     if (projDir.includes('.yarn') && projDir.includes('unplugged')) {
         return undefined

diff --git a/simple-git-hooks.test.js b/simple-git-hooks.test.js
@@ -24,6 +24,10 @@ 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')
 })
 
+test('getProjectRootDirectory return correct dir when installed using yarn3 nodeLinker pnpm:', () => {
+    expect(spc.getProjectRootDirectoryFromNodeModules(`var/my-project/node_modules/.store/simple-git-hooks@${packageVersion}/node_modules/simple-git-hooks`)).toBe('var/my-project')
+})
+
 
 // Get git root