From 20810c0a08bbf11a304a5acfde7c48f3ef33e166 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 10 Mar 2020 14:58:48 +0800 Subject: [PATCH 1/2] fix: cnpm fail cause packgeManager not matched close #682 close #676 close cnpm/cnpm#318 --- sh/husky.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sh/husky.sh b/sh/husky.sh index 76671e926..b4a6673df 100644 --- a/sh/husky.sh +++ b/sh/husky.sh @@ -83,7 +83,8 @@ fi # Run husky-run with the package manager used to install Husky case $packageManager in "npm") run_command npx --no-install;; + "npminstall") run_command npx --no-install;; "pnpm") run_command pnpx --no-install;; "yarn") run_command yarn run --silent;; - "*") echo "Unknown package manager: $packageManager"; exit 0;; + *) echo "Unknown package manager: $packageManager"; exit 0;; esac From e97d800bd6ce83db348c2380a7b3d5626fe145a1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 10 Mar 2020 15:14:59 +0800 Subject: [PATCH 2/2] test: fix jest snapshot --- src/installer/__tests__/__snapshots__/scripts.ts.snap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/installer/__tests__/__snapshots__/scripts.ts.snap b/src/installer/__tests__/__snapshots__/scripts.ts.snap index 6b2ec58c2..d4340ed3c 100644 --- a/src/installer/__tests__/__snapshots__/scripts.ts.snap +++ b/src/installer/__tests__/__snapshots__/scripts.ts.snap @@ -112,9 +112,10 @@ fi # Run husky-run with the package manager used to install Husky case $packageManager in \\"npm\\") run_command npx --no-install;; + \\"npminstall\\") run_command npx --no-install;; \\"pnpm\\") run_command pnpx --no-install;; \\"yarn\\") run_command yarn run --silent;; - \\"*\\") echo \\"Unknown package manager: $packageManager\\"; exit 0;; + *) echo \\"Unknown package manager: $packageManager\\"; exit 0;; esac " `;