@nx/storybook 20.0.0-beta.1 → 20.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "20.0.0-beta.1",
+  "version": "20.0.0-beta.2",
   "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,14 +33,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.0.0-beta.1",
+    "@nx/devkit": "20.0.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "20.0.0-beta.1",
-    "@nx/js": "20.0.0-beta.1",
-    "@nx/eslint": "20.0.0-beta.1",
-    "@nrwl/storybook": "20.0.0-beta.1"
+    "@nx/cypress": "20.0.0-beta.2",
+    "@nx/js": "20.0.0-beta.2",
+    "@nx/eslint": "20.0.0-beta.2",
+    "@nrwl/storybook": "20.0.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/configuration.js

@@ -4,7 +4,6 @@ exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const cypress_project_1 = require("../cypress-project/cypress-project");
 const init_1 = require("../init/init");
 const util_functions_1 = require("./lib/util-functions");
 const eslint_1 = require("@nx/eslint");
@@ -97,27 +96,6 @@ async function configurationGeneratorInternal(tree, rawSchema) {
     else {
         devDeps['storybook'] = versions_1.storybookVersion;
     }
-    // TODO(katerina): Nx 19 -> remove Cypress
-    if (schema.configureCypress) {
-        const e2eProject = await (0, util_functions_1.getE2EProjectName)(tree, schema.project);
-        if (!e2eProject) {
-            const cypressTask = await (0, cypress_project_1.cypressProjectGenerator)(tree, {
-                name: schema.project,
-                js: schema.js,
-                linter: schema.linter,
-                directory: schema.cypressDirectory,
-                standaloneConfig: schema.standaloneConfig,
-                ciTargetName: schema.configureStaticServe
-                    ? 'static-storybook'
-                    : undefined,
-                skipFormat: true,
-            });
-            tasks.push(cypressTask);
-        }
-        else {
-            devkit_1.logger.warn(`There is already an e2e project setup for ${schema.project}, called ${e2eProject}.`);
-        }
-    }
     if (schema.tsConfiguration) {
         devDeps['ts-node'] = versions_1.tsNodeVersion;
     }

package/src/generators/configuration/lib/util-functions.d.ts

@@ -25,7 +25,6 @@ export declare function addBuildStorybookToCacheableOperations(tree: Tree): void
 export declare function projectIsRootProjectInStandaloneWorkspace(projectRoot: string): boolean;
 export declare function workspaceHasRootProject(tree: Tree): boolean;
 export declare function rootFileIsTs(tree: Tree, rootFileName: string, tsConfiguration: boolean): boolean;
-export declare function getE2EProjectName(tree: Tree, mainProject: string): Promise<string | undefined>;
 export declare function findViteConfig(tree: Tree, projectRoot: string): {
     fullConfigPath: string | undefined;
     viteConfigFileName: string | undefined;

package/src/generators/configuration/lib/util-functions.js

@@ -17,13 +17,11 @@ exports.addBuildStorybookToCacheableOperations = addBuildStorybookToCacheableOpe
 exports.projectIsRootProjectInStandaloneWorkspace = projectIsRootProjectInStandaloneWorkspace;
 exports.workspaceHasRootProject = workspaceHasRootProject;
 exports.rootFileIsTs = rootFileIsTs;
-exports.getE2EProjectName = getE2EProjectName;
 exports.findViteConfig = findViteConfig;
 exports.findNextConfig = findNextConfig;
 exports.findMetroConfig = findMetroConfig;
 exports.renameAndMoveOldTsConfig = renameAndMoveOldTsConfig;
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
 const utilities_1 = require("../../../utils/utilities");
@@ -464,23 +462,6 @@ function rootFileIsTs(tree, rootFileName, tsConfiguration) {
         return tsConfiguration;
     }
 }
-async function getE2EProjectName(tree, mainProject) {
-    let e2eProject;
-    const graph = await (0, devkit_1.createProjectGraphAsync)();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/cypress:cypress', (options, projectName) => {
-        if (e2eProject) {
-            return;
-        }
-        if (options['devServerTarget']) {
-            const { project, target } = (0, devkit_1.parseTargetString)(options['devServerTarget'], graph);
-            if ((project === mainProject && target === 'serve') ||
-                (project === mainProject && target === 'storybook')) {
-                e2eProject = projectName;
-            }
-        }
-    });
-    return e2eProject;
-}
 function findViteConfig(tree, projectRoot) {
     const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];
     for (const ext of allowsExt) {

package/src/generators/configuration/schema.d.ts

@@ -11,14 +11,6 @@ export interface StorybookConfigureSchema {
   standaloneConfig?: boolean;
   configureStaticServe?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Use interactionTests instead. This option will be removed in v20.
-   */
-  configureCypress?: boolean;
-  /**
-   * @deprecated Use interactionTests instead. This option will be removed in v20.
-   */
-  cypressDirectory?: string;
   addPlugin?: boolean;
 
   /**

package/src/generators/configuration/schema.json

@@ -25,16 +25,6 @@
       "alias": ["configureTestRunner"],
       "default": true
     },
-    "configureCypress": {
-      "type": "boolean",
-      "description": "Run the cypress-configure generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
-    "cypressDirectory": {
-      "type": "string",
-      "description": "A directory where the Cypress project will be placed. Added at root by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",

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

@@ -17,6 +17,7 @@ function callUpgrade(schema) {
         });
         (0, child_process_1.execSync)(`${pm.dlx} storybook@latest upgrade ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
             stdio: [0, 1, 2],
+            windowsHide: true,
         });
         devkit_1.output.log({
             title: `Storybook packages upgraded.`,
@@ -65,6 +66,7 @@ function callAutomigrate(allStorybookProjects, schema) {
             });
             (0, child_process_1.execSync)(`${commandToRun}  ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
                 stdio: 'inherit',
+                windowsHide: true,
             });
             resultOfMigration.successfulProjects[projectName] = commandToRun;
         }

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

@@ -17,6 +17,7 @@ function callUpgrade(schema) {
         });
         (0, child_process_1.execSync)(`${pm.dlx} storybook@latest upgrade ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
             stdio: [0, 1, 2],
+            windowsHide: true,
         });
         devkit_1.output.log({
             title: `Storybook packages upgraded.`,
@@ -65,6 +66,7 @@ function callAutomigrate(allStorybookProjects, schema) {
             });
             (0, child_process_1.execSync)(`${commandToRun}  ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
                 stdio: 'inherit',
+                windowsHide: true,
             });
             resultOfMigration.successfulProjects[projectName] = commandToRun;
         }