@nx/storybook 20.0.4 → 20.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "20.0.4",
+  "version": "20.0.6",
   "private": false,
   "description": "The Nx Plugin for Storybook contains executors and generators for allowing your workspace to use the powerful Storybook integration testing & documenting capabilities.",
   "repository": {
@@ -33,13 +33,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.0.4",
+    "@nx/devkit": "20.0.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "20.0.4",
-    "@nx/js": "20.0.4",
-    "@nx/eslint": "20.0.4"
+    "@nx/cypress": "20.0.6",
+    "@nx/js": "20.0.6",
+    "@nx/eslint": "20.0.6"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/migrate-8/calling-storybook-cli.js

@@ -5,7 +5,8 @@ exports.callAutomigrate = callAutomigrate;
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
 function callUpgrade(schema) {
-    const pm = (0, devkit_1.getPackageManagerCommand)();
+    const packageManager = (0, devkit_1.detectPackageManager)();
+    const pm = (0, devkit_1.getPackageManagerCommand)(packageManager);
     try {
         devkit_1.output.log({
             title: `Calling sb upgrade`,
@@ -15,7 +16,7 @@ function callUpgrade(schema) {
             ],
             color: 'blue',
         });
-        (0, child_process_1.execSync)(`${pm.dlx} storybook@latest upgrade ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
+        (0, child_process_1.execSync)(`${pm.dlx} ${packageManager === 'yarn' ? 'storybook' : 'storybook@latest'} upgrade ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
             stdio: [0, 1, 2],
             windowsHide: false,
         });
@@ -34,7 +35,7 @@ function callUpgrade(schema) {
             bodyLines: [
                 `🚨 The Storybook CLI failed to upgrade your @storybook/* packages to the latest version.`,
                 `Please try running the sb upgrade command manually:`,
-                `${pm.exec} storybook@latest upgrade`,
+                `${pm.exec} ${packageManager === 'yarn' ? 'storybook' : 'storybook@latest'} upgrade`,
             ],
             color: 'red',
         });
@@ -56,8 +57,9 @@ function callAutomigrate(allStorybookProjects, schema) {
         failedProjects: {},
     };
     Object.entries(allStorybookProjects).forEach(([projectName, storybookProjectInfo]) => {
-        const pm = (0, devkit_1.getPackageManagerCommand)();
-        const commandToRun = `${pm.dlx} storybook@latest automigrate --config-dir ${storybookProjectInfo.configDir}`;
+        const packageManager = (0, devkit_1.detectPackageManager)();
+        const pm = (0, devkit_1.getPackageManagerCommand)(packageManager);
+        const commandToRun = `${pm.dlx} ${packageManager === 'yarn' ? 'storybook' : 'storybook@latest'} automigrate --config-dir ${storybookProjectInfo.configDir}`;
         try {
             devkit_1.output.log({
                 title: `Calling sb automigrate for ${projectName}`,

package/src/generators/migrate-8/helper-functions.js

@@ -10,19 +10,20 @@ const fileutils_1 = require("nx/src/utils/fileutils");
 const fs_1 = require("fs");
 const path_1 = require("path");
 function onlyShowGuide(storybookProjects) {
-    const pm = (0, devkit_1.getPackageManagerCommand)();
+    const packageManager = (0, devkit_1.detectPackageManager)();
+    const pm = (0, devkit_1.getPackageManagerCommand)(packageManager);
     devkit_1.output.log({
         title: 'Storybook 8 Migration Guide',
         bodyLines: [
             `You can run the following commands manually to upgrade your Storybook projects to Storybook 8:`,
             ``,
             `1. Call the Storybook upgrade script:`,
-            `${pm.exec} storybook@latest upgrade`,
+            `${pm.exec} ${packageManager === 'yarn' ? 'storybook' : 'storybook@latest'} upgrade`,
             ``,
             `2. Call the Storybook automigrate scripts:`,
             `Run the following commands for each Storybook project:`,
             ...Object.entries(storybookProjects).map(([_projectName, storybookProjectInfo]) => {
-                return `${pm.exec} storybook@latest automigrate --config-dir ${storybookProjectInfo.configDir}`;
+                return `${pm.exec} ${packageManager === 'yarn' ? 'storybook' : 'storybook@latest'} automigrate --config-dir ${storybookProjectInfo.configDir}`;
             }),
             ``,
         ],

package/src/plugins/plugin.js

@@ -101,7 +101,7 @@ function buildTarget(namedInputs, outputs, projectRoot, frameworkIsAngular, proj
                         isStorybookTestRunnerInstalled()
                             ? '@storybook/test-runner'
                             : undefined,
-                    ],
+                    ].filter(Boolean),
                 },
             ],
         };
@@ -122,7 +122,7 @@ function buildTarget(namedInputs, outputs, projectRoot, frameworkIsAngular, proj
                         isStorybookTestRunnerInstalled()
                             ? '@storybook/test-runner'
                             : undefined,
-                    ],
+                    ].filter(Boolean),
                 },
             ],
         };
@@ -153,12 +153,7 @@ function testTarget(projectRoot) {
         options: { cwd: projectRoot },
         inputs: [
             {
-                externalDependencies: [
-                    'storybook',
-                    isStorybookTestRunnerInstalled()
-                        ? '@storybook/test-runner'
-                        : undefined,
-                ],
+                externalDependencies: ['storybook', '@storybook/test-runner'],
             },
         ],
     };