miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(core): use existing version when calling "yarn set version" (#18669)

Browse Source
This commit is contained in:
Miroslav Jonaš 2023-08-17 16:28:29 +02:00 committed by GitHub
parent 43b802d1cc
commit 7d55f49e7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/create-nx-workspace/src/utils/package-manager.ts
View File

@ -38,17 +38,15 @@ export function getPackageManagerCommand(
exec: string; exec: string;
preInstall?: string; preInstall?: string;
} { } {
const [pmMajor, pmMinor] = const pmVersion = getPackageManagerVersion(packageManager);
getPackageManagerVersion(packageManager).split('.'); const [pmMajor, pmMinor] = pmVersion.split('.');
switch (packageManager) { switch (packageManager) {
case 'yarn': case 'yarn':
const useBerry = +pmMajor >= 2; const useBerry = +pmMajor >= 2;
const installCommand = 'yarn install --silent'; const installCommand = 'yarn install --silent';
return { return {
preInstall: useBerry preInstall: `yarn set version ${pmVersion}`,
? 'yarn set version stable'
: 'yarn set version classic',
install: useBerry install: useBerry
? installCommand ? installCommand
: `${installCommand} --ignore-scripts`, : `${installCommand} --ignore-scripts`,

4
packages/nx/src/utils/package-manager.ts
View File

@ -65,9 +65,7 @@ export function getPackageManagerCommand(
const useBerry = gte(yarnVersion, '2.0.0'); const useBerry = gte(yarnVersion, '2.0.0');
return { return {
preInstall: useBerry preInstall: `yarn set version ${yarnVersion}`,
? 'yarn set version stable'
: 'yarn set version classic',
install: 'yarn', install: 'yarn',
ciInstall: useBerry ciInstall: useBerry
? 'yarn install --immutable' ? 'yarn install --immutable'