From f71cd46525dbabb6401b4c117f62ea19654b24d5 Mon Sep 17 00:00:00 2001 From: szymonrybczak Date: Thu, 26 Oct 2023 14:50:23 +0200 Subject: [PATCH 1/2] fix: fallback first to `yarn` when `bun` not available --- packages/cli/src/tools/packageManager.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/tools/packageManager.ts b/packages/cli/src/tools/packageManager.ts index b465f1858..731c52823 100644 --- a/packages/cli/src/tools/packageManager.ts +++ b/packages/cli/src/tools/packageManager.ts @@ -41,9 +41,21 @@ function configurePackageManager( action: 'init' | 'install' | 'installDev' | 'installAll' | 'uninstall', options: Options, ) { - let pm: PackageManager = shouldUseYarn(options) ? 'yarn' : 'npm'; + let yarnAvailable = shouldUseYarn(options); + let bunAvailable = shouldUseBun(options); + + let pm: PackageManager = 'npm'; + if (options.packageManager === 'bun') { - pm = shouldUseBun(options) ? 'bun' : 'npm'; + if (bunAvailable) { + pm = 'bun'; + } else { + pm = yarnAvailable ? 'yarn' : 'npm'; + } + } + + if (options.packageManager === 'yarn' && yarnAvailable) { + pm = 'yarn'; } const [executable, ...flags] = packageManagers[pm][action]; From 9de27c5265e474a4e270ee51af883443e7f9faef Mon Sep 17 00:00:00 2001 From: Szymon Rybczak Date: Thu, 26 Oct 2023 23:04:14 +0200 Subject: [PATCH 2/2] Update packages/cli/src/tools/packageManager.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michał Pierzchała --- packages/cli/src/tools/packageManager.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/tools/packageManager.ts b/packages/cli/src/tools/packageManager.ts index 731c52823..f11aad968 100644 --- a/packages/cli/src/tools/packageManager.ts +++ b/packages/cli/src/tools/packageManager.ts @@ -49,8 +49,10 @@ function configurePackageManager( if (options.packageManager === 'bun') { if (bunAvailable) { pm = 'bun'; + } else if (yarnAvailable) { + pm = 'yarn'; } else { - pm = yarnAvailable ? 'yarn' : 'npm'; + pm = 'npm'; } }