From 94dbab759440588f98820d600476c97a6935785f Mon Sep 17 00:00:00 2001 From: szymonrybczak Date: Tue, 18 Jun 2024 10:07:44 +0200 Subject: [PATCH 1/3] fix: correctly check Yarn version --- packages/cli/src/commands/init/init.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/commands/init/init.ts b/packages/cli/src/commands/init/init.ts index baa9b4233..eb8cdf6b0 100644 --- a/packages/cli/src/commands/init/init.ts +++ b/packages/cli/src/commands/init/init.ts @@ -90,7 +90,8 @@ const bumpYarnVersion = async (silent: boolean, root: string) => { if (yarnVersion) { // `yarn set` is unsupported until 1.22, however it's a alias (yarnpkg/yarn/pull/7862) calling `policies set-version`. const setVersionArgs = - yarnVersion.major > 1 && yarnVersion.minor >= 22 + (yarnVersion.major > 1 && yarnVersion.minor >= 22) || + yarnVersion.major >= 2 ? ['set', 'version', YARN_VERSION] : ['policies', 'set-version', YARN_VERSION]; From 764e6b455f903e2b62b8e12af5c475ec4539d647 Mon Sep 17 00:00:00 2001 From: szymonrybczak Date: Wed, 19 Jun 2024 16:41:49 +0200 Subject: [PATCH 2/3] fix: apply reviewers comment --- packages/cli/src/commands/init/init.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/cli/src/commands/init/init.ts b/packages/cli/src/commands/init/init.ts index eb8cdf6b0..2a1109558 100644 --- a/packages/cli/src/commands/init/init.ts +++ b/packages/cli/src/commands/init/init.ts @@ -89,12 +89,10 @@ const bumpYarnVersion = async (silent: boolean, root: string) => { if (yarnVersion) { // `yarn set` is unsupported until 1.22, however it's a alias (yarnpkg/yarn/pull/7862) calling `policies set-version`. - const setVersionArgs = - (yarnVersion.major > 1 && yarnVersion.minor >= 22) || - yarnVersion.major >= 2 - ? ['set', 'version', YARN_VERSION] - : ['policies', 'set-version', YARN_VERSION]; - + let setVersionArgs = ['set', 'version', YARN_VERSION]; + if (yarnVersion.major === 1 && yarnVersion.minor <= 22) { + setVersionArgs = ['policies', 'set-version', YARN_VERSION]; + } await executeCommand('yarn', setVersionArgs, { root, silent, From 951b8160d76114454d001a0949ca649ef41cfc36 Mon Sep 17 00:00:00 2001 From: Szymon Rybczak Date: Wed, 19 Jun 2024 17:08:26 +0200 Subject: [PATCH 3/3] Update packages/cli/src/commands/init/init.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/commands/init/init.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/commands/init/init.ts b/packages/cli/src/commands/init/init.ts index 2a1109558..fb1c85b41 100644 --- a/packages/cli/src/commands/init/init.ts +++ b/packages/cli/src/commands/init/init.ts @@ -90,7 +90,7 @@ const bumpYarnVersion = async (silent: boolean, root: string) => { if (yarnVersion) { // `yarn set` is unsupported until 1.22, however it's a alias (yarnpkg/yarn/pull/7862) calling `policies set-version`. let setVersionArgs = ['set', 'version', YARN_VERSION]; - if (yarnVersion.major === 1 && yarnVersion.minor <= 22) { + if (yarnVersion.major === 1 && yarnVersion.minor < 22) { setVersionArgs = ['policies', 'set-version', YARN_VERSION]; } await executeCommand('yarn', setVersionArgs, {