From 3f21012edb28bb8981faff42380c48f1a02be54c Mon Sep 17 00:00:00 2001
From: Yann Braga <yannbf@gmail.com>
Date: Wed, 21 Jun 2023 11:17:37 +0200
Subject: [PATCH 1/3] fix storybook command in init

---
 code/lib/cli/src/initiate.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
index bdcfa300cef0..c3822233bfcf 100644
--- a/code/lib/cli/src/initiate.ts
+++ b/code/lib/cli/src/initiate.ts
@@ -351,7 +351,12 @@ async function doInitiate(options: CommandOptions, pkg: PackageJson): Promise<vo
         // instead of calling 'dev' automatically, we spawn a subprocess so that it gets
         // executed directly in the user's project directory. This avoid potential issues
         // with packages running in npxs' node_modules
-        packageManager.runPackageCommandSync(storybookCommand, ['--quiet'], undefined, 'inherit');
+        packageManager.runPackageCommandSync(
+          storybookCommand.replace(/yarn|pnpm|npm/, ''),
+          ['--quiet'],
+          undefined,
+          'inherit'
+        );
       } catch (e) {
         const isCtrlC =
           e.message.includes('Command failed with exit code 129') &&

From 83e84dd108afba7c4f66da9e61d7e770222cafb6 Mon Sep 17 00:00:00 2001
From: Yann Braga <yannbf@gmail.com>
Date: Wed, 21 Jun 2023 12:06:35 +0200
Subject: [PATCH 2/3] Update code/lib/cli/src/initiate.ts

Co-authored-by: Valentin Palkovic <valentin@chromatic.com>
---
 code/lib/cli/src/initiate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
index c3822233bfcf..f66c49492d30 100644
--- a/code/lib/cli/src/initiate.ts
+++ b/code/lib/cli/src/initiate.ts
@@ -352,7 +352,7 @@ async function doInitiate(options: CommandOptions, pkg: PackageJson): Promise<vo
         // executed directly in the user's project directory. This avoid potential issues
         // with packages running in npxs' node_modules
         packageManager.runPackageCommandSync(
-          storybookCommand.replace(/yarn|pnpm|npm/, ''),
+          storybookCommand.replace(/^(yarn|pnpm|npm) /, ''),
           ['--quiet'],
           undefined,
           'inherit'

From 78aa280cfea6bb19a10bb7b4589c668f73211a4b Mon Sep 17 00:00:00 2001
From: Yann Braga <yannbf@gmail.com>
Date: Wed, 21 Jun 2023 12:49:10 +0200
Subject: [PATCH 3/3] only replace yarn in storybook command

---
 code/lib/cli/src/initiate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
index f66c49492d30..b25fe3852a8d 100644
--- a/code/lib/cli/src/initiate.ts
+++ b/code/lib/cli/src/initiate.ts
@@ -352,7 +352,7 @@ async function doInitiate(options: CommandOptions, pkg: PackageJson): Promise<vo
         // executed directly in the user's project directory. This avoid potential issues
         // with packages running in npxs' node_modules
         packageManager.runPackageCommandSync(
-          storybookCommand.replace(/^(yarn|pnpm|npm) /, ''),
+          storybookCommand.replace(/^yarn /, ''),
           ['--quiet'],
           undefined,
           'inherit'