feat(semver): support pnpm or npx or yarn with husky

jscutlery · Nov 19, 2023 · e253c7b · e253c7b
1 parent e786dfe
commit e253c7b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/packages/semver/src/generators/install/index.spec.ts b/packages/semver/src/generators/install/index.spec.ts
@@ -4,6 +4,7 @@ import {
   writeJson,
   type Tree,
   logger,
+  detectPackageManager,
 } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import * as inquirer from 'inquirer';
@@ -13,6 +14,14 @@ import install from '.';
 import type { SchemaOptions } from './schema';
 
 jest.mock('inquirer');
+jest.mock('@nx/devkit', () => ({
+  ...jest.requireActual('@nx/devkit'),
+  detectPackageManager: jest.fn().mockReturnValue('npm'),
+}));
+
+const detectPackageManagerMock = detectPackageManager as jest.MockedFunction<
+  typeof detectPackageManager
+>;
 
 const defaultOptions: SchemaOptions = {
   syncVersions: false,
@@ -369,6 +378,31 @@ describe('@jscutlery/semver:install', () => {
       expect(findProjectFile(tree, 'lib3', 'CHANGELOG.md')).toBeFalse();
     });
   });
+
+  it('use corresponding package manager (npx)', async () => {
+    await install(tree, defaultOptions);
+
+    const commitlintConfig = tree.read('.husky/commit-msg')?.toString();
+    expect(commitlintConfig).toContain('npx --no commitlint');
+  });
+
+  it('use corresponding package manager (yarn)', async () => {
+    detectPackageManagerMock.mockReturnValue('yarn');
+
+    await install(tree, defaultOptions);
+
+    const commitlintConfig = tree.read('.husky/commit-msg')?.toString();
+    expect(commitlintConfig).toContain('yarn commitlint');
+  });
+
+  it('use corresponding package manager (pnpm)', async () => {
+    detectPackageManagerMock.mockReturnValue('pnpm');
+
+    await install(tree, defaultOptions);
+
+    const commitlintConfig = tree.read('.husky/commit-msg')?.toString();
+    expect(commitlintConfig).toContain('pnpm commitlint');
+  });
 });
 
 function createProjectNames() {

diff --git a/packages/semver/src/generators/install/utils/dependencies.ts b/packages/semver/src/generators/install/utils/dependencies.ts
@@ -4,6 +4,7 @@ import {
   updateJson,
   type Tree,
   logger,
+  detectPackageManager,
 } from '@nx/devkit';
 import { constants } from 'fs';
 import type { SchemaOptions } from '../schema';
@@ -103,9 +104,16 @@ function _addHuskyConfig(tree: Tree) {
 
 function _addHuskyConfigMsg(tree: Tree) {
   const hasConfigFile: boolean = tree.exists('.husky/commit-msg');
+  const packageManager = detectPackageManager(tree.root);
+  const command =
+    packageManager === 'npm'
+      ? 'npx --no'
+      : packageManager === 'yarn'
+        ? 'yarn'
+        : 'pnpm';
 
   if (!hasConfigFile) {
-    const commitMsg = `#!/bin/sh\n. "$(dirname "$0")/_/husky.sh"\n\nnpx --no-install commitlint --edit $1\n`;
+    const commitMsg = `#!/bin/sh\n. "$(dirname "$0")/_/husky.sh"\n\n${command} commitlint --edit $1\n`;
 
     tree.write('.husky/commit-msg', commitMsg, {
       /* File mode indicating readable, writable, and executable by owner. */