fix: add support for yarn v4

favware · Nov 14, 2023 · 35af4dc · 35af4dc
1 parent 844d89f
commit 35af4dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/commands/install-dependencies.ts b/src/commands/install-dependencies.ts
@@ -20,7 +20,9 @@ function packageManager(packageManagerUsed: ReturnType<typeof resolveUsedPackage
     case 'pnpm':
       return 'pnpm';
     case 'yarn-v1':
+    case 'yarn-v2':
     case 'yarn-v3':
+    case 'yarn-v4':
       return 'yarn';
   }
 }
diff --git a/src/commands/stage-files.ts b/src/commands/stage-files.ts
@@ -43,7 +43,8 @@ function resolveLockfile(
   if (!options.install) return '';
 
   if (packageManagerUsed === 'pnpm') return 'pnpm-lock.yaml';
-  if (packageManagerUsed === 'yarn-v1' || packageManagerUsed === 'yarn-v3') return 'yarn.lock';
+  if (packageManagerUsed === 'yarn-v1' || packageManagerUsed === 'yarn-v2' || packageManagerUsed === 'yarn-v3' || packageManagerUsed === 'yarn-v4')
+    return 'yarn.lock';
 
   return 'package-lock.json';
 }
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -17,17 +17,17 @@ import type { ReleaseType } from 'semver';
  *
  * @returns The package manager used
  */
-export function resolveUsedPackageManager(): 'yarn-v1' | 'yarn-v3' | 'npm' | 'pnpm' {
+export function resolveUsedPackageManager(): 'yarn-v1' | 'yarn-v2' | 'yarn-v3' | 'yarn-v4' | 'npm' | 'pnpm' {
   const npmConfigUserAgentEnvVar = process.env.npm_config_user_agent;
 
   if (!npmConfigUserAgentEnvVar || npmConfigUserAgentEnvVar.startsWith('npm/')) return 'npm';
   if (npmConfigUserAgentEnvVar.startsWith('pnpm/')) return 'pnpm';
 
   if (npmConfigUserAgentEnvVar.startsWith('yarn/')) {
     if (npmConfigUserAgentEnvVar.startsWith('yarn/1')) return 'yarn-v1';
-    if (npmConfigUserAgentEnvVar.startsWith('yarn/2') || npmConfigUserAgentEnvVar.startsWith('yarn/3')) {
-      return 'yarn-v3';
-    }
+    if (npmConfigUserAgentEnvVar.startsWith('yarn/2')) return 'yarn-v2';
+    if (npmConfigUserAgentEnvVar.startsWith('yarn/3')) return 'yarn-v3';
+    if (npmConfigUserAgentEnvVar.startsWith('yarn/4')) return 'yarn-v4';
   }
 
   return 'npm';