@nx/storybook 17.0.1 → 17.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/storybook",
-  "version": "17.0.1",
+  "version": "17.0.3",
   "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,11 +33,11 @@
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
-    "@nx/cypress": "17.0.1",
-    "@nx/devkit": "17.0.1",
-    "@nx/js": "17.0.1",
-    "@nx/eslint": "17.0.1",
-    "@nrwl/storybook": "17.0.1"
+    "@nx/cypress": "17.0.3",
+    "@nx/devkit": "17.0.3",
+    "@nx/js": "17.0.3",
+    "@nx/eslint": "17.0.3",
+    "@nrwl/storybook": "17.0.3"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/cypress-project/cypress-project.d.ts

@@ -8,6 +8,8 @@ export interface CypressConfigureSchema {
     standaloneConfig?: boolean;
     ciTargetName?: string;
     skipFormat?: boolean;
+    projectNameAndRootFormat?: 'as-provided' | 'derived';
 }
 export declare function cypressProjectGenerator(tree: Tree, schema: CypressConfigureSchema): Promise<GeneratorCallback>;
+export declare function cypressProjectGeneratorInternal(tree: Tree, schema: CypressConfigureSchema): Promise<GeneratorCallback>;
 export default cypressProjectGenerator;

package/src/generators/cypress-project/cypress-project.js

@@ -1,26 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressProjectGenerator = void 0;
-const cypress_1 = require("@nx/cypress");
+exports.cypressProjectGeneratorInternal = exports.cypressProjectGenerator = void 0;
 const project_name_1 = require("@nx/cypress/src/utils/project-name");
 const devkit_1 = require("@nx/devkit");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const path_1 = require("path");
 const utilities_1 = require("../../utils/utilities");
+const versions_1 = require("../../utils/versions");
 async function cypressProjectGenerator(tree, schema) {
+    return await cypressProjectGeneratorInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
+    });
+}
+exports.cypressProjectGenerator = cypressProjectGenerator;
+async function cypressProjectGeneratorInternal(tree, schema) {
+    const { configurationGenerator, cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    const e2eName = schema.name ? `${schema.name}-e2e` : undefined;
+    const { projectName, projectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        name: e2eName,
+        projectType: 'application',
+        directory: schema.directory,
+        projectNameAndRootFormat: schema.projectNameAndRootFormat,
+        callingGenerator: '@nx/storybook:cypress-project',
+    });
     const libConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.name);
     const libRoot = libConfig.root;
-    const cypressProjectName = `${schema.directory ? (0, project_name_1.getUnscopedLibName)(libRoot) : schema.name}-e2e`;
     const tasks = [];
     if (!projectAlreadyHasCypress(tree)) {
-        tasks.push(await (0, cypress_1.cypressInitGenerator)(tree, {}));
+        tasks.push(await cypressInitGenerator(tree, {}));
     }
-    const installTask = await (0, cypress_1.cypressProjectGenerator)(tree, {
-        name: cypressProjectName,
-        project: schema.name,
+    (0, devkit_1.addProjectConfiguration)(tree, projectName, {
+        root: projectRoot,
+        projectType: 'application',
+        sourceRoot: (0, devkit_1.joinPathFragments)(projectRoot, 'src'),
+        targets: {},
+        implicitDependencies: [projectName],
+    });
+    const installTask = await configurationGenerator(tree, {
+        project: projectName,
         js: schema.js,
         linter: schema.linter,
-        directory: schema.directory,
-        standaloneConfig: schema.standaloneConfig,
+        directory: projectRoot,
+        devServerTarget: `${schema.name}:storybook`,
         skipFormat: true,
     });
     tasks.push(installTask);
@@ -37,7 +59,7 @@ async function cypressProjectGenerator(tree, schema) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.cypressProjectGenerator = cypressProjectGenerator;
+exports.cypressProjectGeneratorInternal = cypressProjectGeneratorInternal;
 function removeUnneededFiles(tree, projectName, js) {
     const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const fileType = js ? 'js' : 'ts';

package/src/generators/cypress-project/schema.json

@@ -33,12 +33,6 @@
       "enum": ["eslint", "none"],
       "default": "eslint"
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "ciTargetName": {
       "type": "string",
       "description": "The name of the devServerTarget to use for the Cypress CI configuration. Used to control if using <storybook-project>:static-storybook:ci or <storybook-project>:storybook:ci",
@@ -49,6 +43,11 @@
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
+    },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
     }
   },
   "required": ["name"]

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

@@ -14,7 +14,7 @@ function callUpgrade(schema) {
             ],
             color: 'blue',
         });
-        (0, child_process_1.execSync)(`${pm.exec} storybook@latest upgrade ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
+        (0, child_process_1.execSync)(`${pm.dlx} storybook@latest upgrade ${schema.autoAcceptAllPrompts ? '--yes' : ''}`, {
             stdio: [0, 1, 2],
         });
         devkit_1.output.log({
@@ -56,7 +56,7 @@ function callAutomigrate(allStorybookProjects, schema) {
     };
     Object.entries(allStorybookProjects).forEach(([projectName, storybookProjectInfo]) => {
         const pm = (0, devkit_1.getPackageManagerCommand)();
-        const commandToRun = `${pm.exec} storybook@latest automigrate --config-dir ${storybookProjectInfo.configDir} --renderer ${storybookProjectInfo.uiFramework}`;
+        const commandToRun = `${pm.dlx} storybook@latest automigrate --config-dir ${storybookProjectInfo.configDir} --renderer ${storybookProjectInfo.uiFramework}`;
         try {
             devkit_1.output.log({
                 title: `Calling sb automigrate for ${projectName}`,