@nx/storybook 17.0.4 → 17.0.6

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renameAndMoveOldTsConfig = exports.findMetroConfig = exports.findNextConfig = exports.findViteConfig = exports.getE2EProjectName = exports.rootFileIsTs = exports.workspaceHasRootProject = exports.projectIsRootProjectInStandaloneWorkspace = exports.addBuildStorybookToCacheableOperations = exports.getTsConfigPath = exports.createProjectStorybookDir = exports.addStorybookToTargetDefaults = exports.addStorybookToNamedInputs = exports.normalizeSchema = exports.updateLintConfig = exports.configureTsSolutionConfig = exports.configureTsProjectConfig = exports.editTsconfigBaseJson = exports.createStorybookTsconfigFile = exports.addStaticTarget = exports.addAngularStorybookTarget = exports.addStorybookTarget = void 0;
+exports.renameAndMoveOldTsConfig = exports.getViteConfigFilePath = exports.getE2EProjectName = exports.rootFileIsTs = exports.workspaceHasRootProject = exports.projectIsRootProjectInStandaloneWorkspace = exports.addBuildStorybookToCacheableOperations = exports.getTsConfigPath = exports.createProjectStorybookDir = exports.addStorybookToNamedInputs = exports.normalizeSchema = exports.updateLintConfig = exports.configureTsSolutionConfig = exports.configureTsProjectConfig = exports.editTsconfigBaseJson = exports.createStorybookTsconfigFile = exports.addStaticTarget = exports.addAngularStorybookTask = exports.addStorybookTask = void 0;
 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");
@@ -10,7 +10,10 @@ const versions_1 = require("../../../utils/versions");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 const DEFAULT_PORT = 4400;
-function addStorybookTarget(tree, projectName, uiFramework, interactionTests) {
+function addStorybookTask(tree, projectName, uiFramework, interactionTests) {
+    if (uiFramework === '@storybook/react-native') {
+        return;
+    }
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     projectConfig.targets['storybook'] = {
         executor: '@nx/storybook:storybook',
@@ -47,8 +50,8 @@ function addStorybookTarget(tree, projectName, uiFramework, interactionTests) {
     }
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
 }
-exports.addStorybookTarget = addStorybookTarget;
-function addAngularStorybookTarget(tree, projectName, interactionTests) {
+exports.addStorybookTask = addStorybookTask;
+function addAngularStorybookTask(tree, projectName, interactionTests) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const { ngBuildTarget } = (0, utilities_1.findStorybookAndBuildTargetsAndCompiler)(projectConfig.targets);
     projectConfig.targets['storybook'] = {
@@ -90,21 +93,21 @@ function addAngularStorybookTarget(tree, projectName, interactionTests) {
     }
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
 }
-exports.addAngularStorybookTarget = addAngularStorybookTarget;
-async function addStaticTarget(tree, opts) {
-    const { webStaticServeGenerator } = (0, devkit_1.ensurePackage)('@nx/web', versions_1.nxVersion);
-    await webStaticServeGenerator(tree, {
-        buildTarget: `${opts.project}:build-storybook`,
-        outputPath: (0, devkit_1.joinPathFragments)('dist/storybook', opts.project),
+exports.addAngularStorybookTask = addAngularStorybookTask;
+function addStaticTarget(tree, opts) {
+    const nrwlWeb = (0, devkit_1.ensurePackage)('@nx/web', versions_1.nxVersion);
+    nrwlWeb.webStaticServeGenerator(tree, {
+        buildTarget: `${opts.name}:build-storybook`,
+        outputPath: (0, devkit_1.joinPathFragments)('dist/storybook', opts.name),
         targetName: 'static-storybook',
     });
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.name);
     projectConfig.targets['static-storybook'].configurations = {
         ci: {
-            buildTarget: `${opts.project}:build-storybook:ci`,
+            buildTarget: `${opts.name}:build-storybook:ci`,
         },
     };
-    (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
+    (0, devkit_1.updateProjectConfiguration)(tree, opts.name, projectConfig);
 }
 exports.addStaticTarget = addStaticTarget;
 function createStorybookTsconfigFile(tree, projectRoot, uiFramework, isRootProject, mainDir) {
@@ -149,6 +152,9 @@ function createStorybookTsconfigFile(tree, projectRoot, uiFramework, isRootProje
         '.storybook/*.js',
         '.storybook/*.ts',
     ];
+    if (uiFramework === '@storybook/react-native') {
+        include.push('*.ts', '*.tsx');
+    }
     const storybookTsConfig = {
         extends: './tsconfig.json',
         compilerOptions: {
@@ -180,7 +186,7 @@ function editTsconfigBaseJson(tree) {
 }
 exports.editTsconfigBaseJson = editTsconfigBaseJson;
 function configureTsProjectConfig(tree, schema) {
-    const { project: projectName } = schema;
+    const { name: projectName } = schema;
     let tsConfigPath;
     let tsConfigContent;
     try {
@@ -202,7 +208,8 @@ function configureTsProjectConfig(tree, schema) {
             ...(tsConfigContent.exclude || []),
             '**/*.stories.ts',
             '**/*.stories.js',
-            ...(schema.uiFramework?.startsWith('@storybook/react')
+            ...(schema.uiFramework === '@storybook/react-native' ||
+                schema.uiFramework?.startsWith('@storybook/react')
                 ? ['**/*.stories.jsx', '**/*.stories.tsx']
                 : []),
         ];
@@ -211,7 +218,7 @@ function configureTsProjectConfig(tree, schema) {
 }
 exports.configureTsProjectConfig = configureTsProjectConfig;
 function configureTsSolutionConfig(tree, schema) {
-    const { project: projectName } = schema;
+    const { name: projectName } = schema;
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const tsConfigPath = (0, path_1.join)(root, 'tsconfig.json');
     const tsConfigContent = (0, devkit_1.readJson)(tree, tsConfigPath);
@@ -250,7 +257,7 @@ exports.configureTsSolutionConfig = configureTsSolutionConfig;
  * This is done within the eslint config file.
  */
 function updateLintConfig(tree, schema) {
-    const { project: projectName } = schema;
+    const { name: projectName } = schema;
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree, root);
     if (!eslintFile) {
@@ -299,10 +306,6 @@ function updateLintConfig(tree, schema) {
                     ]);
                 }
             }
-            const ignorePatterns = json.ignorePatterns || [];
-            if (!ignorePatterns.includes('storybook-static')) {
-                ignorePatterns.push('storybook-static');
-            }
             return json;
         });
     }
@@ -335,39 +338,29 @@ function addStorybookToNamedInputs(tree) {
                 nxJson.namedInputs.production.push('!{projectRoot}/tsconfig.storybook.json');
             }
         }
+        nxJson.targetDefaults ??= {};
+        nxJson.targetDefaults['build-storybook'] ??= {};
+        nxJson.targetDefaults['build-storybook'].inputs ??= [
+            'default',
+            hasProductionFileset ? '^production' : '^default',
+        ];
+        if (!nxJson.targetDefaults['build-storybook'].inputs.includes('{projectRoot}/.storybook/**/*')) {
+            nxJson.targetDefaults['build-storybook'].inputs.push('{projectRoot}/.storybook/**/*');
+        }
+        // Delete the !{projectRoot}/.storybook/**/* glob from build-storybook
+        // because we want to rebuild Storybook if the .storybook folder changes
+        const index = nxJson.targetDefaults['build-storybook'].inputs.indexOf('!{projectRoot}/.storybook/**/*');
+        if (index !== -1) {
+            nxJson.targetDefaults['build-storybook'].inputs.splice(index, 1);
+        }
+        if (!nxJson.targetDefaults['build-storybook'].inputs.includes('{projectRoot}/tsconfig.storybook.json')) {
+            nxJson.targetDefaults['build-storybook'].inputs.push('{projectRoot}/tsconfig.storybook.json');
+        }
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
 }
 exports.addStorybookToNamedInputs = addStorybookToNamedInputs;
-function addStorybookToTargetDefaults(tree, setCache = true) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults['build-storybook'] ??= {};
-    if (setCache) {
-        nxJson.targetDefaults['build-storybook'].cache ??= true;
-    }
-    nxJson.targetDefaults['build-storybook'].inputs ??= [
-        'default',
-        nxJson.namedInputs && 'production' in nxJson.namedInputs
-            ? '^production'
-            : '^default',
-    ];
-    if (!nxJson.targetDefaults['build-storybook'].inputs.includes('{projectRoot}/.storybook/**/*')) {
-        nxJson.targetDefaults['build-storybook'].inputs.push('{projectRoot}/.storybook/**/*');
-    }
-    // Delete the !{projectRoot}/.storybook/**/* glob from build-storybook
-    // because we want to rebuild Storybook if the .storybook folder changes
-    const index = nxJson.targetDefaults['build-storybook'].inputs.indexOf('!{projectRoot}/.storybook/**/*');
-    if (index !== -1) {
-        nxJson.targetDefaults['build-storybook'].inputs.splice(index, 1);
-    }
-    if (!nxJson.targetDefaults['build-storybook'].inputs.includes('{projectRoot}/tsconfig.storybook.json')) {
-        nxJson.targetDefaults['build-storybook'].inputs.push('{projectRoot}/tsconfig.storybook.json');
-    }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}
-exports.addStorybookToTargetDefaults = addStorybookToTargetDefaults;
-function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfiguration, root, projectType, projectIsRootProjectInStandaloneWorkspace, interactionTests, mainDir, isNextJs, usesSwc, usesVite, viteConfigFilePath, hasPlugin, viteConfigFileName, useReactNative) {
+function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfiguration, root, projectType, projectIsRootProjectInStandaloneWorkspace, interactionTests, mainDir, isNextJs, usesSwc, usesVite, viteConfigFilePath) {
     let projectDirectory = projectType === 'application'
         ? isNextJs
             ? 'components'
@@ -398,9 +391,6 @@ function createProjectStorybookDir(tree, projectName, uiFramework, js, tsConfigu
         usesVite,
         isRootProject: projectIsRootProjectInStandaloneWorkspace,
         viteConfigFilePath,
-        hasPlugin,
-        viteConfigFileName,
-        useReactNative,
     });
     if (js) {
         (0, devkit_1.toJS)(tree);
@@ -426,12 +416,23 @@ function getTsConfigPath(tree, projectName, path) {
 }
 exports.getTsConfigPath = getTsConfigPath;
 function addBuildStorybookToCacheableOperations(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    if (nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations &&
-        !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('build-storybook')) {
-        nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('build-storybook');
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-    }
+    (0, devkit_1.updateJson)(tree, 'nx.json', (json) => ({
+        ...json,
+        tasksRunnerOptions: {
+            ...(json.tasksRunnerOptions ?? {}),
+            default: {
+                ...(json.tasksRunnerOptions?.default ?? {}),
+                options: {
+                    ...(json.tasksRunnerOptions?.default?.options ?? {}),
+                    cacheableOperations: Array.from(new Set([
+                        ...(json.tasksRunnerOptions?.default?.options
+                            ?.cacheableOperations ?? []),
+                        'build-storybook',
+                    ])),
+                },
+            },
+        },
+    }));
 }
 exports.addBuildStorybookToCacheableOperations = addBuildStorybookToCacheableOperations;
 function projectIsRootProjectInStandaloneWorkspace(projectRoot) {
@@ -478,36 +479,16 @@ async function getE2EProjectName(tree, mainProject) {
     return e2eProject;
 }
 exports.getE2EProjectName = getE2EProjectName;
-function findViteConfig(tree, projectRoot) {
-    const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];
-    for (const ext of allowsExt) {
-        const viteConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, `vite.config.${ext}`);
-        if (tree.exists(viteConfigPath)) {
-            return {
-                fullConfigPath: viteConfigPath,
-                viteConfigFileName: `vite.config.${ext}`,
-            };
-        }
-    }
-}
-exports.findViteConfig = findViteConfig;
-function findNextConfig(tree, projectRoot) {
-    const allowsExt = ['js', 'mjs', 'cjs'];
-    for (const ext of allowsExt) {
-        const nextConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, `next.config.${ext}`);
-        if (tree.exists(nextConfigPath)) {
-            return nextConfigPath;
-        }
-    }
-}
-exports.findNextConfig = findNextConfig;
-function findMetroConfig(tree, projectRoot) {
-    const nextConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, `metro.config.js`);
-    if (tree.exists(nextConfigPath)) {
-        return nextConfigPath;
-    }
+function getViteConfigFilePath(tree, projectRoot, configFile) {
+    return configFile && tree.exists(configFile)
+        ? configFile
+        : tree.exists((0, devkit_1.joinPathFragments)(`${projectRoot}/vite.config.ts`))
+            ? (0, devkit_1.joinPathFragments)(`${projectRoot}/vite.config.ts`)
+            : tree.exists((0, devkit_1.joinPathFragments)(`${projectRoot}/vite.config.js`))
+                ? (0, devkit_1.joinPathFragments)(`${projectRoot}/vite.config.js`)
+                : undefined;
 }
-exports.findMetroConfig = findMetroConfig;
+exports.getViteConfigFilePath = getViteConfigFilePath;
 function renameAndMoveOldTsConfig(projectRoot, pathToStorybookConfigFile, tree) {
     if (pathToStorybookConfigFile && tree.exists(pathToStorybookConfigFile)) {
         (0, devkit_1.updateJson)(tree, pathToStorybookConfigFile, (json) => {

package/src/generators/configuration/project-files/.storybook/main.js__tmpl__

@@ -9,38 +9,18 @@ const config = {
     '../**/*.stories.@(js|jsx|ts|tsx|mdx)' <% } else { %>
     '../<%= projectDirectory %>/**/*.stories.@(js|jsx|ts|tsx|mdx)'
   <% } %>],
-  addons: ['@storybook/addon-essentials' <% if(interactionTests) { %>, '@storybook/addon-interactions' <% } %><% if(uiFramework === '@storybook/react-webpack5') { %>, '@nx/react/plugins/storybook' <% } %>],
+  addons: ['@storybook/addon-essentials' <% if(interactionTests) { %>, '@storybook/addon-interactions' <% } %><% if(uiFramework === '@storybook/react-webpack5') { %>, '@nx/react/plugins/storybook' <% } %><% if(uiFramework === '@storybook/react-native') { %>, '@storybook/addon-ondevice-actions',  '@storybook/addon-ondevice-backgrounds', '@storybook/addon-ondevice-controls', '@storybook/addon-ondevice-notes'  <% } %>],
   framework: {
     name: '<%= uiFramework %>',
     options: {
-     <% if (usesVite && viteConfigFilePath && hasPlugin) { %>
-      builder: {
-        viteConfigPath: '<%= viteConfigFileName %>',
-      },
-      <% } %>
-      <% if (usesVite && viteConfigFilePath && !hasPlugin) { %>
+      <% if (usesVite && viteConfigFilePath) { %>
       builder: {
         viteConfigPath: '<%= viteConfigFilePath %>',
       },
       <% } %>
     },
   },
-  <% if (useReactNative && uiFramework === '@storybook/react-webpack5') { %>webpackFinal: async (config) => {
-    if (config.resolve) {
-      config.resolve.alias = {
-        ...config.resolve.alias,
-        'react-native$': 'react-native-web',
-      };
-      config.resolve.extensions = [
-        '.web.tsx',
-        '.web.ts',
-        '.web.jsx',
-        '.web.js',
-        ...(config.resolve.extensions ?? []),
-      ];
-    }
-    return config;
-  },<% } %><% if (usesVite && !viteConfigFilePath) { %>
+  <% if (usesVite && !viteConfigFilePath) { %>
   viteFinal: async (config) =>
     mergeConfig(config, {
       plugins: [nxViteTsPaths()],

package/src/generators/configuration/project-files-ts/.storybook/main.ts__tmpl__

@@ -10,37 +10,18 @@ const config: StorybookConfig = {
     '../**/*.stories.@(js|jsx|ts|tsx|mdx)' <% } else { %>
     '../<%= projectDirectory %>/**/*.stories.@(js|jsx|ts|tsx|mdx)'
   <% } %>],
-  addons: ['@storybook/addon-essentials' <% if(interactionTests) { %>, '@storybook/addon-interactions' <% } %><% if(uiFramework === '@storybook/react-webpack5') { %>, '@nx/react/plugins/storybook' <% } %>],
+  addons: ['@storybook/addon-essentials' <% if(interactionTests) { %>, '@storybook/addon-interactions' <% } %><% if(uiFramework === '@storybook/react-webpack5') { %>, '@nx/react/plugins/storybook' <% } %><% if(uiFramework === '@storybook/react-native') { %>, '@storybook/addon-ondevice-actions',  '@storybook/addon-ondevice-backgrounds', '@storybook/addon-ondevice-controls', '@storybook/addon-ondevice-notes'  <% } %>],
   framework: {
     name: '<%= uiFramework %>',
     options: {
-      <% if (usesVite && viteConfigFilePath && hasPlugin) { %>
-      builder: {
-        viteConfigPath: '<%= viteConfigFileName %>',
-      },
-      <% } %><% if (usesVite && viteConfigFilePath && !hasPlugin) { %>
+      <% if (usesVite && viteConfigFilePath) { %>
       builder: {
         viteConfigPath: '<%= viteConfigFilePath %>',
       },
       <% } %>
     },
   },
-  <% if (useReactNative && uiFramework === '@storybook/react-webpack5') { %>webpackFinal: async (config) => {
-    if (config.resolve) {
-      config.resolve.alias = {
-        ...config.resolve.alias,
-        'react-native$': 'react-native-web',
-      };
-      config.resolve.extensions = [
-        '.web.tsx',
-        '.web.ts',
-        '.web.jsx',
-        '.web.js',
-        ...(config.resolve.extensions ?? []),
-      ];
-    }
-    return config;
-  },<% } %><% if (usesVite && !viteConfigFilePath) { %>
+  <% if (usesVite && !viteConfigFilePath) { %>
   viteFinal: async (config) =>
     mergeConfig(config, {
       plugins: [nxViteTsPaths()],

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

@@ -2,7 +2,7 @@ import { Linter } from '@nx/eslint';
 import { UiFramework } from '../../utils/models';
 
 export interface StorybookConfigureSchema {
-  project: string;
+  name: string;
   uiFramework?: UiFramework;
   linter?: Linter;
   js?: boolean;
@@ -12,17 +12,11 @@ export interface StorybookConfigureSchema {
   configureStaticServe?: boolean;
   skipFormat?: boolean;
   /**
-   * @deprecated Use interactionTests instead. This option will be removed in v19.
+   * @deprecated Use interactionTests instead. This option will be removed in v18.
    */
   configureCypress?: boolean;
   /**
-   * @deprecated Use interactionTests instead. This option will be removed in v19.
+   * @deprecated Use interactionTests instead. This option will be removed in v18.
    */
   cypressDirectory?: string;
-  addPlugin?: boolean;
-
-  /**
-   * @internal
-   */
-  addExplicitTargets?: boolean;
 }

package/src/generators/configuration/schema.json

@@ -1,14 +1,14 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxStorybookConfigure",
   "title": "Storybook Configuration",
   "description": "Add Storybook configuration to a UI library or an application.",
   "type": "object",
   "properties": {
-    "project": {
+    "name": {
       "type": "string",
-      "aliases": ["name", "projectName"],
+      "aliases": ["project", "projectName"],
       "description": "Project for which to generate Storybook configuration.",
       "$default": {
         "$source": "argv",
@@ -28,12 +28,12 @@
     "configureCypress": {
       "type": "boolean",
       "description": "Run the cypress-configure generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
     },
     "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 v19."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
     },
     "linter": {
       "description": "The tool to use for running lint checks.",
@@ -63,6 +63,13 @@
       "description": "Add a static-storybook to serve the static storybook built files.",
       "default": false
     },
+    "bundler": {
+      "description": "The Storybook builder to use.",
+      "type": "string",
+      "enum": ["vite", "webpack"],
+      "default": "webpack",
+      "x-priority": "important"
+    },
     "uiFramework": {
       "type": "string",
       "description": "Storybook UI Framework to use.",
@@ -96,6 +103,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["project", "uiFramework"],
+  "required": ["name", "uiFramework"],
   "examplesFile": "../../../docs/configuration-generator-examples.md"
 }

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

@@ -1,4 +1,4 @@
-import { Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Linter } from '@nx/eslint';
 export interface CypressConfigureSchema {
     name: string;
@@ -10,6 +10,6 @@ export interface CypressConfigureSchema {
     skipFormat?: boolean;
     projectNameAndRootFormat?: 'as-provided' | 'derived';
 }
-export declare function cypressProjectGenerator(tree: Tree, schema: CypressConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function cypressProjectGeneratorInternal(tree: Tree, schema: CypressConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+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

@@ -15,7 +15,7 @@ async function cypressProjectGenerator(tree, schema) {
 }
 exports.cypressProjectGenerator = cypressProjectGenerator;
 async function cypressProjectGeneratorInternal(tree, schema) {
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    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,
@@ -26,6 +26,10 @@ async function cypressProjectGeneratorInternal(tree, schema) {
     });
     const libConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.name);
     const libRoot = libConfig.root;
+    const tasks = [];
+    if (!projectAlreadyHasCypress(tree)) {
+        tasks.push(await cypressInitGenerator(tree, {}));
+    }
     (0, devkit_1.addProjectConfiguration)(tree, projectName, {
         root: projectRoot,
         projectType: 'application',
@@ -33,7 +37,7 @@ async function cypressProjectGeneratorInternal(tree, schema) {
         targets: {},
         implicitDependencies: [projectName],
     });
-    const cypressTask = await configurationGenerator(tree, {
+    const installTask = await configurationGenerator(tree, {
         project: projectName,
         js: schema.js,
         linter: schema.linter,
@@ -41,6 +45,7 @@ async function cypressProjectGeneratorInternal(tree, schema) {
         devServerTarget: `${schema.name}:storybook`,
         skipFormat: true,
     });
+    tasks.push(installTask);
     const generatedCypressProjectName = (0, project_name_1.getE2eProjectName)(schema.name, libRoot, schema.directory);
     removeUnneededFiles(tree, generatedCypressProjectName, schema.js);
     addBaseUrlToCypressConfig(tree, generatedCypressProjectName);
@@ -52,7 +57,7 @@ async function cypressProjectGeneratorInternal(tree, schema) {
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return cypressTask;
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.cypressProjectGeneratorInternal = cypressProjectGeneratorInternal;
 function removeUnneededFiles(tree, projectName, js) {

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "cypress-configure",
   "title": "Cypress Configuration",

package/src/generators/init/init.d.ts

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function initGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function initGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default initGenerator;