Merge pull request #48 from Djaler/fix-pnpm

fix and simplify project root detection in pnpm
toplenboren · Apr 24, 2021 · 1f06c3b · 1f06c3b
2 parents ab996b9 + b47fa42
commit 1f06c3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/simple-git-hooks.js b/simple-git-hooks.js
@@ -2,8 +2,6 @@ const fs = require('fs')
 const os = require("os");
 const path = require('path');
 
-const { packageVersion } = require('./package.json');
-
 const VALID_GIT_HOOKS = [
  'applypatch-msg',
  'pre-applypatch',
@@ -85,14 +83,9 @@ function getProjectRootDirectoryFromNodeModules(projectPath) {
 
  const projDir = projectPath.split(/[\\/]/) // <- would split both on '/' and '\'
 
- if (projDir.includes('.pnpm')
- && projDir.length > 3
- && _arraysAreEqual(projDir.slice(projDir.length - 3), [
- 'node_modules',
- '.pnpm',
- `simple-git-hooks@${packageVersion}`,
- ])) {
- return projDir.slice(0, projDir.length - 3).join('/');
+ const indexOfPnpmDir = projDir.indexOf('.pnpm')
+ if (indexOfPnpmDir > -1) {
+ return projDir.slice(0, indexOfPnpmDir - 1).join('/');
  }
 
  // A yarn2 STAB

diff --git a/simple-git-hooks.test.js b/simple-git-hooks.test.js
@@ -3,7 +3,7 @@ const os = require('os')
 const spc = require("./simple-git-hooks");
 const path = require("path")
 
-const { packageVersion } = require('./package.json');
+const { version: packageVersion } = require('./package.json');
 
 
 // Get project root directory
@@ -22,6 +22,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}`)).toBe('var/my-project')
+ expect(spc.getProjectRootDirectoryFromNodeModules(`var/my-project/node_modules/.pnpm/simple-git-hooks@${packageVersion}/node_modules/simple-git-hooks`)).toBe('var/my-project')
 })