Merge pull request #23144 from storybookjs/fix/init-after-dev

CLI: Fix storybook dev after storybook init via subprocess
storybookjs · Jun 20, 2023 · c739d02 · c739d02
2 parents 5b30336 + 39820ec
commit c739d02
Showing 1 changed file with 13 additions and 29 deletions.
diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
@@ -38,7 +38,6 @@ import { JsPackageManagerFactory, useNpmWarning } from './js-package-manager';
 import type { NpmOptions } from './NpmOptions';
 import type { CommandOptions } from './generators/types';
 import { HandledError } from './HandledError';
-import { dev } from './dev';
 
 const logger = console;
 
@@ -348,34 +347,19 @@ async function doInitiate(options: CommandOptions, pkg: PackageJson): Promise<vo
     if (shouldRunDev) {
       logger.log('\nRunning Storybook');
 
-      switch (projectType) {
-        case ProjectType.ANGULAR: {
-          try {
-            // for angular specifically, we have to run the `ng` command, and to stream the output
-            // it has to be a sync command.
-            packageManager.runPackageCommandSync(
-              `ng run ${installResult.projectName}:storybook`,
-              ['--quiet'],
-              undefined,
-              'inherit'
-            );
-          } catch (e) {
-            if (e.message.includes('Command failed with exit code 129')) {
-              // catch ctrl + c error
-            } else {
-              throw e;
-            }
-          }
-          break;
-        }
-
-        default: {
-          await dev({
-            ...options,
-            port: 6006,
-            open: true,
-            quiet: true,
-          });
+      try {
+        // 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');
+      } catch (e) {
+        const isCtrlC =
+          e.message.includes('Command failed with exit code 129') &&
+          e.message.includes('CTRL+C') &&
+          e.message.includes('SIGINT');
+        if (!isCtrlC) {
+          // only throw if it's not ctrl + c
+          throw e;
         }
       }
     }