Merge pull request #28950 from storybookjs/kasper/add-cli-pacakge

Core: Make sure local `@storybook/cli` is used in linked mode
storybookjs · Aug 22, 2024 · accf304 · accf304
2 parents 039f2e8 + 9c82d82
commit accf304
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts
@@ -545,10 +545,11 @@ export async function addExtraDependencies({
   await packageManager.addDependencies({ installAsDevDependencies: true }, extraDevDeps);
 
   if (extraDeps) {
+    const versionedExtraDeps = await packageManager.getVersionedPackages(extraDeps);
     if (debug) {
-      logger.log('\uD83C\uDF81 Adding extra deps', extraDeps);
+      logger.log('\uD83C\uDF81 Adding extra deps', versionedExtraDeps);
     }
-    await packageManager.addDependencies({ installAsDevDependencies: true }, extraDeps);
+    await packageManager.addDependencies({ installAsDevDependencies: true }, versionedExtraDeps);
   }
   await packageManager.installDependencies();
 }

diff --git a/scripts/tasks/sandbox.ts b/scripts/tasks/sandbox.ts
@@ -81,7 +81,12 @@ export const sandbox: Task = {
       await addStories(details, options);
     }
 
-    const extraDeps = details.template.modifications?.extraDependencies ?? [];
+    const extraDeps = [
+      ...(details.template.modifications?.extraDependencies ?? []),
+      // The storybook package forwards some CLI commands to @storybook/cli with npx.
+      // Adding the dep makes sure that even npx will use the linked workspace version.
+      '@storybook/cli',
+    ];
     if (!details.template.skipTasks?.includes('vitest-integration')) {
       extraDeps.push(
         'happy-dom',