use run instead of exec in npm/pnpm proxies

storybookjs · Jun 21, 2023 · 9f12f5c · 9f12f5c
1 parent 83e84dd
commit 9f12f5c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
@@ -327,7 +327,7 @@ async function doInitiate(options: CommandOptions, pkg: PackageJson): Promise<vo
     const storybookCommand =
       projectType === ProjectType.ANGULAR
         ? `ng run ${installResult.projectName}:storybook`
-        : packageManager.getRunStorybookCommand();
+        : 'storybook';
     logger.log(
       boxen(
         dedent`
@@ -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,
           ['--quiet'],
           undefined,
           'inherit'

diff --git a/code/lib/cli/src/js-package-manager/NPMProxy.ts b/code/lib/cli/src/js-package-manager/NPMProxy.ts
@@ -121,7 +121,7 @@ export class NPMProxy extends JsPackageManager {
   ): string {
     return this.executeCommandSync({
       command: 'npm',
-      args: ['exec', '--', command, ...args],
+      args: ['run', command, '--', ...args],
       cwd,
       stdio,
     });
@@ -130,7 +130,7 @@ export class NPMProxy extends JsPackageManager {
   public async runPackageCommand(command: string, args: string[], cwd?: string): Promise<string> {
     return this.executeCommand({
       command: 'npm',
-      args: ['exec', '--', command, ...args],
+      args: ['run', command, '--', ...args],
       cwd,
     });
   }

diff --git a/code/lib/cli/src/js-package-manager/PNPMProxy.ts b/code/lib/cli/src/js-package-manager/PNPMProxy.ts
@@ -83,7 +83,7 @@ export class PNPMProxy extends JsPackageManager {
   ): string {
     return this.executeCommandSync({
       command: 'pnpm',
-      args: ['exec', command, ...args],
+      args: ['run', command, ...args],
       cwd,
       stdio,
     });
@@ -92,7 +92,7 @@ export class PNPMProxy extends JsPackageManager {
   async runPackageCommand(command: string, args: string[], cwd?: string): Promise<string> {
     return this.executeCommand({
       command: 'pnpm',
-      args: ['exec', command, ...args],
+      args: ['run', command, ...args],
       cwd,
     });
   }