@nx/react 0.0.0-pr-27957-a99d5ea → 0.0.0-pr-28229-afe192c

package/src/generators/redux/schema.json

@@ -6,36 +6,21 @@
   "description": "Create a Redux state slice for a React project.",
   "type": "object",
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "Redux slice name.",
+      "description": "Path where the Redux slice will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "x-prompt": "Where should the Redux slice be generated?",
       "x-priority": "important"
     },
-    "project": {
-      "type": "string",
-      "description": "The name of the project to add the slice to. If it is an application, then the store configuration will be updated too.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
-    "directory": {
+    "name": {
       "type": "string",
-      "alias": "dir",
-      "default": "",
-      "description": "The directory at which to create the Redux files. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the project root.",
+      "description": "Redux slice name.",
       "x-priority": "important"
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "appProject": {
       "type": "string",
       "description": "The application project to add the slice to.",
@@ -47,5 +32,5 @@
       "default": false
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/remote/lib/setup-tspath-for-remote.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function setupTspathForRemote(tree: Tree, options: Schema): void;
+import { NormalizedSchema } from '../../application/schema';
+export declare function setupTspathForRemote(tree: Tree, options: NormalizedSchema): void;

package/src/generators/remote/lib/setup-tspath-for-remote.js

@@ -5,10 +5,10 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const maybe_js_1 = require("../../../utils/maybe-js");
 function setupTspathForRemote(tree, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
     const exportPath = (0, maybe_js_1.maybeJs)(options, './src/remote-entry.ts');
     const exportName = 'Module';
-    (0, js_1.addTsConfigPath)(tree, `${options.name}/${exportName}`, [
+    (0, js_1.addTsConfigPath)(tree, `${options.projectName}/${exportName}`, [
         (0, devkit_1.joinPathFragments)(project.root, exportPath),
     ]);
 }

package/src/generators/remote/remote.d.ts

@@ -3,5 +3,4 @@ import { NormalizedSchema } from '../application/schema';
 import { Schema } from './schema';
 export declare function addModuleFederationFiles(host: Tree, options: NormalizedSchema<Schema>): void;
 export declare function remoteGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function remoteGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default remoteGenerator;

package/src/generators/remote/remote.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = addModuleFederationFiles;
 exports.remoteGenerator = remoteGenerator;
-exports.remoteGeneratorInternal = remoteGeneratorInternal;
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("../application/lib/normalize-options");
@@ -17,9 +16,10 @@ const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 const maybe_js_1 = require("../../utils/maybe-js");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 function addModuleFederationFiles(host, options) {
     const templateVariables = {
-        ...(0, devkit_1.names)(options.name),
+        ...(0, devkit_1.names)(options.projectName),
         ...options,
         tmpl: '',
     };
@@ -46,15 +46,9 @@ function addModuleFederationFiles(host, options) {
     }
 }
 async function remoteGenerator(host, schema) {
-    return await remoteGeneratorInternal(host, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function remoteGeneratorInternal(host, schema) {
     const tasks = [];
     const options = {
-        ...(await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:remote')),
+        ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
         // when js is set to true, we want to use the js configuration
         js: schema.js ?? false,
         typescriptConfiguration: schema.js
@@ -68,13 +62,15 @@ async function remoteGeneratorInternal(host, schema) {
     if (options.dynamic) {
         // Dynamic remotes generate with library { type: 'var' } by default.
         // We need to ensure that the remote name is a valid variable name.
-        const isValidRemote = (0, js_1.isValidVariable)(options.name);
+        const isValidRemote = (0, js_1.isValidVariable)(options.projectName);
         if (!isValidRemote.isValid) {
-            throw new Error(`Invalid remote name provided: ${options.name}. ${isValidRemote.message}`);
+            throw new Error(`Invalid remote name provided: ${options.projectName}. ${isValidRemote.message}`);
         }
     }
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
     const initAppTask = await (0, application_1.default)(host, {
         ...options,
+        name: options.projectName,
         skipFormat: true,
     });
     tasks.push(initAppTask);
@@ -115,7 +111,7 @@ async function remoteGeneratorInternal(host, schema) {
     if (options.host && options.dynamic) {
         const hostConfig = (0, devkit_1.readProjectConfiguration)(host, schema.host);
         const pathToMFManifest = (0, devkit_1.joinPathFragments)(hostConfig.sourceRoot, 'assets/module-federation.manifest.json');
-        (0, add_remote_to_dynamic_host_1.addRemoteToDynamicHost)(host, options.name, options.devServerPort, pathToMFManifest);
+        (0, add_remote_to_dynamic_host_1.addRemoteToDynamicHost)(host, options.projectName, options.devServerPort, pathToMFManifest);
     }
     (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host);
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion });

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

@@ -1,4 +1,3 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { SupportedStyles } from '../../../typings/style';
 import type { NormalizedSchema as ApplicationNormalizedSchema } from '../application/schema';
@@ -7,15 +6,13 @@ export interface Schema {
   classComponent?: boolean;
   compiler?: 'babel' | 'swc';
   devServerPort?: number;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
   globalCss?: boolean;
   host?: string;
   js?: boolean;
   linter: Linter | LinterType;
-  name: string;
-  pascalCaseFiles?: boolean;
+  name?: string;
   routing?: boolean;
   setParserOptionsProject?: boolean;
   skipFormat: boolean;

package/src/generators/remote/schema.json

@@ -6,28 +6,22 @@
   "description": "Create Module Federation configuration files for given React Remote Application.",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
-      "description": "The name of the remote application to generate the Module Federation configuration",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use as the remote application?",
-      "pattern": "^[a-zA-Z][^:]*$",
-      "x-priority": "important"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
       "type": "string",
-      "alias": "dir",
+      "description": "The name of the remote application to generate the Module Federation configuration",
+      "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
-    "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"]
-    },
     "dynamic": {
       "type": "boolean",
       "description": "Should the host application use dynamic federation?",
@@ -119,12 +113,6 @@
       "description": "Add tags to the application (used for linting).",
       "alias": "t"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. App.tsx).",
-      "alias": "P",
-      "default": false
-    },
     "classComponent": {
       "type": "boolean",
       "description": "Use class components instead of functional component.",
@@ -192,6 +180,6 @@
       "x-priority": "important"
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "additionalProperties": false
 }

package/src/generators/setup-ssr/setup-ssr.js

@@ -65,6 +65,12 @@ async function setupSsrGenerator(tree, options) {
     if (projectConfig.targets.build.options?.outputPath) {
         projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
     }
+    if (projectConfig.targets.build.executor === '@nx/rspack:rspack') {
+        options.bundler = 'rspack';
+    }
+    else if (projectConfig.targets.build.executor === '@nx/webpack:webpack') {
+        options.bundler = 'webpack';
+    }
     projectConfig.targets = {
         ...projectConfig.targets,
         server: {

package/src/generators/setup-tailwind/lib/update-project.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProject = updateProject;
 const devkit_1 = require("@nx/devkit");
 function updateProject(tree, config, options) {
-    if (config?.targets?.build?.executor === '@nx/webpack:webpack' ||
-        config?.targets?.build?.executor === '@nrwl/webpack:webpack') {
+    if (config?.targets?.build?.executor === '@nx/webpack:webpack') {
         config.targets.build.options ??= {};
         config.targets.build.options.postcssConfig = (0, devkit_1.joinPathFragments)(config.root, 'postcss.config.js');
         (0, devkit_1.updateProjectConfiguration)(tree, options.project, config);

package/src/generators/stories/schema.json

@@ -17,16 +17,6 @@
       "x-prompt": "For which project do you want to generate stories?",
       "x-priority": "important"
     },
-    "generateCypressSpecs": {
-      "type": "boolean",
-      "description": "Automatically generate `*.spec.ts` files in the cypress e2e app generated by the cypress-configure generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
-    "cypressProject": {
-      "type": "string",
-      "description": "The Cypress project to generate the stories under. This is inferred from `project` by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "interactionTests": {
       "type": "boolean",
       "description": "Set up Storybook interaction tests.",

package/src/generators/stories/stories.d.ts

@@ -5,11 +5,9 @@ export interface StorybookStoriesSchema {
     js?: boolean;
     ignorePaths?: string[];
     skipFormat?: boolean;
-    cypressProject?: string;
-    generateCypressSpecs?: boolean;
 }
 export declare function projectRootPath(tree: Tree, config: ProjectConfiguration): Promise<string>;
 export declare function containsComponentDeclaration(tree: Tree, componentPath: string): boolean;
-export declare function createAllStories(tree: Tree, projectName: string, interactionTests: boolean, js: boolean, projects: Map<string, ProjectConfiguration>, projectConfiguration: ProjectConfiguration, generateCypressSpecs?: boolean, cypressProject?: string, ignorePaths?: string[]): Promise<void>;
+export declare function createAllStories(tree: Tree, projectName: string, interactionTests: boolean, js: boolean, projects: Map<string, ProjectConfiguration>, projectConfiguration: ProjectConfiguration, ignorePaths?: string[]): Promise<void>;
 export declare function storiesGenerator(host: Tree, schema: StorybookStoriesSchema): Promise<GeneratorCallback>;
 export default storiesGenerator;

package/src/generators/stories/stories.js

@@ -5,7 +5,6 @@ exports.containsComponentDeclaration = containsComponentDeclaration;
 exports.createAllStories = createAllStories;
 exports.storiesGenerator = storiesGenerator;
 const component_story_1 = require("../component-story/component-story");
-const component_cypress_spec_1 = require("../component-cypress-spec/component-cypress-spec");
 const ast_utils_1 = require("../../utils/ast-utils");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
@@ -44,7 +43,7 @@ function containsComponentDeclaration(tree, componentPath) {
     return !!((0, ast_utils_1.getComponentNode)(sourceFile) ||
         (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile)?.length);
 }
-async function createAllStories(tree, projectName, interactionTests, js, projects, projectConfiguration, generateCypressSpecs, cypressProject, ignorePaths) {
+async function createAllStories(tree, projectName, interactionTests, js, projects, projectConfiguration, ignorePaths) {
     const { isTheFileAStory } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
     const { sourceRoot, root } = projectConfiguration;
     let componentPaths = [];
@@ -70,11 +69,6 @@ async function createAllStories(tree, projectName, interactionTests, js, project
             }
         }
     });
-    const e2eProjectName = cypressProject || `${projectName}-e2e`;
-    const e2eProject = projects.get(e2eProjectName);
-    if (generateCypressSpecs && !e2eProject) {
-        devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name`);
-    }
     await Promise.all(componentPaths.map(async (componentPath) => {
         const relativeCmpDir = componentPath.replace((0, path_1.join)(sourceRoot, '/'), '');
         if (!containsComponentDeclaration(tree, componentPath)) {
@@ -86,22 +80,13 @@ async function createAllStories(tree, projectName, interactionTests, js, project
             skipFormat: true,
             interactionTests,
         });
-        if (generateCypressSpecs && e2eProject) {
-            await (0, component_cypress_spec_1.default)(tree, {
-                project: projectName,
-                componentPath: relativeCmpDir,
-                js,
-                cypressProject,
-                skipFormat: true,
-            });
-        }
     }));
 }
 async function storiesGenerator(host, schema) {
     const projects = (0, devkit_1.getProjects)(host);
     const projectConfiguration = projects.get(schema.project);
     schema.interactionTests = schema.interactionTests ?? true;
-    await createAllStories(host, schema.project, schema.interactionTests, schema.js, projects, projectConfiguration, schema.generateCypressSpecs, schema.cypressProject, schema.ignorePaths);
+    await createAllStories(host, schema.project, schema.interactionTests, schema.js, projects, projectConfiguration, schema.ignorePaths);
     const tasks = [];
     if (schema.interactionTests) {
         const { interactionTestsDependencies, addInteractionsInAddons } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);

package/src/generators/storybook-configuration/configuration.js

@@ -7,16 +7,10 @@ const stories_1 = require("../stories/stories");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 async function generateStories(host, schema) {
-    // TODO(katerina): Nx 19 -> remove Cypress
-    (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { getE2eProjectName } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/project-name'));
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
-    const cypressProject = getE2eProjectName(schema.project, projectConfig.root, schema.cypressDirectory);
     await (0, stories_1.default)(host, {
         project: schema.project,
-        generateCypressSpecs: schema.configureCypress && schema.generateCypressSpecs,
         js: schema.js,
-        cypressProject,
         ignorePaths: schema.ignorePaths,
         skipFormat: true,
         interactionTests: schema.interactionTests ?? true,
@@ -39,7 +33,6 @@ async function storybookConfigurationGeneratorInternal(host, schema) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
     if (findWebpackConfig(host, projectConfig.root) ||
         projectConfig.targets['build']?.executor === '@nx/rollup:rollup' ||
-        projectConfig.targets['build']?.executor === '@nrwl/rollup:rollup' ||
         projectConfig.targets['build']?.executor === '@nx/expo:build') {
         uiFramework = '@storybook/react-webpack5';
     }
@@ -48,10 +41,8 @@ async function storybookConfigurationGeneratorInternal(host, schema) {
     }
     const installTask = await configurationGenerator(host, {
         project: schema.project,
-        configureCypress: schema.configureCypress,
         js: schema.js,
         linter: schema.linter,
-        cypressDirectory: schema.cypressDirectory,
         tsConfiguration: schema.tsConfiguration ?? true, // default is true
         interactionTests: schema.interactionTests ?? true, // default is true
         configureStaticServe: schema.configureStaticServe,

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

@@ -9,8 +9,5 @@ export interface StorybookConfigureSchema {
   linter?: Linter | LinterType;
   ignorePaths?: string[];
   configureStaticServe?: boolean;
-  configureCypress?: boolean;
-  generateCypressSpecs?: boolean;
-  cypressDirectory?: string;
   addPlugin?: boolean;
 }

package/src/generators/storybook-configuration/schema.json

@@ -26,11 +26,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."
-    },
     "generateStories": {
       "type": "boolean",
       "description": "Automatically generate `*.stories.ts` files for components declared in this project?",
@@ -38,11 +33,6 @@
       "default": true,
       "x-priority": "important"
     },
-    "generateCypressSpecs": {
-      "type": "boolean",
-      "description": "Automatically generate test files in the Cypress E2E app generated by the `cypress-configure` generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "configureStaticServe": {
       "type": "boolean",
       "description": "Specifies whether to configure a static file server target for serving storybook. Helpful for speeding up CI build/test times.",
@@ -50,11 +40,6 @@
       "default": true,
       "x-priority": "important"
     },
-    "cypressDirectory": {
-      "type": "string",
-      "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript story files rather than TypeScript story files.",

package/src/utils/ct-utils.js

@@ -60,17 +60,12 @@ function assertValidConfig(config) {
 }
 async function getBundlerFromTarget(found, tree) {
     if (found.target && found.config?.executor) {
-        return found.config.executor === '@nrwl/vite:build' ||
-            found.config.executor === '@nx/vite:build'
-            ? 'vite'
-            : 'webpack';
+        return found.config.executor === '@nx/vite:build' ? 'vite' : 'webpack';
     }
     const { target, project } = (0, devkit_1.parseTargetString)(found.target, await (0, devkit_1.createProjectGraphAsync)());
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
     const executor = projectConfig?.targets?.[target]?.executor;
-    return executor === '@nrwl/vite:build' || executor === '@nx/vite:build'
-        ? 'vite'
-        : 'webpack';
+    return executor === '@nx/vite:build' ? 'vite' : 'webpack';
 }
 async function getActualBundler(tree, options, found) {
     // Specifically undefined to allow Remix workaround of passing an empty string

package/src/utils/testing-generators.js

@@ -12,8 +12,7 @@ async function createApp(tree, appName) {
         skipFormat: true,
         style: 'css',
         unitTestRunner: 'none',
-        name: appName,
-        projectNameAndRootFormat: 'as-provided',
+        directory: appName,
     });
 }
 async function createLib(tree, libName) {

package/src/utils/versions.d.ts

@@ -37,7 +37,7 @@ export declare const isbotVersion = "^3.6.5";
 export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.12";
 export declare const moduleFederationNodeVersion = "~2.5.0";
-export declare const moduleFederationEnhancedVersion = "~0.6.0";
+export declare const moduleFederationEnhancedVersion = "0.6.6";
 export declare const lessVersion = "3.12.2";
 export declare const sassVersion = "^1.55.0";
 export declare const rollupPluginUrlVersion = "^8.0.2";

package/src/utils/versions.js

@@ -43,7 +43,7 @@ exports.isbotVersion = '^3.6.5';
 exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.12';
 exports.moduleFederationNodeVersion = '~2.5.0';
-exports.moduleFederationEnhancedVersion = '~0.6.0';
+exports.moduleFederationEnhancedVersion = '0.6.6';
 // style preprocessors
 exports.lessVersion = '3.12.2';
 exports.sassVersion = '^1.55.0';

package/src/generators/component-cypress-spec/component-cypress-spec.d.ts

@@ -1,13 +0,0 @@
-import { Tree } from '@nx/devkit';
-import type * as ts from 'typescript';
-export interface CreateComponentSpecFileSchema {
-    project: string;
-    componentPath: string;
-    js?: boolean;
-    cypressProject?: string;
-    skipFormat?: boolean;
-}
-export declare function componentCypressGenerator(host: Tree, schema: CreateComponentSpecFileSchema): Promise<void>;
-export declare function getArgsDefaultValue(property: ts.SyntaxKind): string;
-export declare function createComponentSpecFile(tree: Tree, { project, componentPath, js, cypressProject }: CreateComponentSpecFileSchema): void;
-export default componentCypressGenerator;

package/src/generators/component-cypress-spec/component-cypress-spec.js

@@ -1,104 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.componentCypressGenerator = componentCypressGenerator;
-exports.getArgsDefaultValue = getArgsDefaultValue;
-exports.createComponentSpecFile = createComponentSpecFile;
-const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const ast_utils_1 = require("../../utils/ast-utils");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-let tsModule;
-async function componentCypressGenerator(host, schema) {
-    createComponentSpecFile(host, schema);
-    if (!schema.skipFormat) {
-        await (0, devkit_1.formatFiles)(host);
-    }
-}
-// TODO: candidate to refactor with the angular component story
-function getArgsDefaultValue(property) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
-    const typeNameToDefault = {
-        [tsModule.SyntaxKind.StringKeyword]: '',
-        [tsModule.SyntaxKind.NumberKeyword]: 0,
-        [tsModule.SyntaxKind.BooleanKeyword]: false,
-    };
-    const resolvedValue = typeNameToDefault[property];
-    if (resolvedValue === undefined) {
-        return '';
-    }
-    else if (typeof resolvedValue === 'string') {
-        return resolvedValue.replace(/\s/g, '+');
-    }
-    else {
-        return resolvedValue;
-    }
-}
-function createComponentSpecFile(tree, { project, componentPath, js, cypressProject }) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
-    const e2eProjectName = cypressProject || `${project}-e2e`;
-    const projects = (0, devkit_1.getProjects)(tree);
-    const e2eProject = projects.get(e2eProjectName);
-    // cypress >= v10 will have a cypress.config.ts < v10 will have a cypress.json
-    const isCypressV10 = tree.exists((0, path_1.join)(e2eProject.root, 'cypress.config.ts'));
-    const e2eLibIntegrationFolderPath = (0, path_1.join)(e2eProject.sourceRoot, isCypressV10 ? 'e2e' : 'integration');
-    const proj = projects.get(project);
-    const componentFilePath = (0, devkit_1.joinPathFragments)(proj.sourceRoot, componentPath);
-    const componentName = componentFilePath
-        .slice(componentFilePath.lastIndexOf('/') + 1)
-        .replace('.tsx', '')
-        .replace('.jsx', '')
-        .replace('.js', '');
-    const contents = tree.read(componentFilePath, 'utf-8');
-    if (contents === null) {
-        throw new Error(`Failed to read ${componentFilePath}`);
-    }
-    const sourceFile = tsModule.createSourceFile(componentFilePath, contents, tsModule.ScriptTarget.Latest, true);
-    const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
-    if (!cmpDeclaration) {
-        const componentNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);
-        if (componentNodes?.length) {
-            componentNodes.forEach((declaration) => {
-                findPropsAndGenerateFileForCypress(tree, sourceFile, declaration, e2eLibIntegrationFolderPath, componentName, project, js, true);
-            });
-        }
-        else {
-            throw new Error(`Could not find any React component in file ${componentFilePath}`);
-        }
-    }
-    else {
-        findPropsAndGenerateFileForCypress(tree, sourceFile, cmpDeclaration, e2eLibIntegrationFolderPath, componentName, project, js);
-    }
-}
-function findPropsAndGenerateFileForCypress(tree, sourceFile, cmpDeclaration, e2eLibIntegrationFolderPath, componentName, project, js, fromNodeArray) {
-    const info = (0, ast_utils_1.parseComponentPropsInfo)(sourceFile, cmpDeclaration);
-    let props = [];
-    if (info) {
-        if (!tsModule) {
-            tsModule = (0, ensure_typescript_1.ensureTypescript)();
-        }
-        props = info.props.map((member) => {
-            return {
-                name: member.name.text,
-                defaultValue: tsModule.isBindingElement(member)
-                    ? getArgsDefaultValue(member.kind)
-                    : getArgsDefaultValue(member.type.kind),
-            };
-        });
-    }
-    const isCypressV10 = (0, path_1.basename)(e2eLibIntegrationFolderPath) === 'e2e';
-    const cyFilePrefix = isCypressV10 ? 'cy' : 'spec';
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files'), `${e2eLibIntegrationFolderPath}/${fromNodeArray
-        ? componentName + '--' + cmpDeclaration.name.text
-        : componentName}`, {
-        projectName: project,
-        componentName,
-        componentSelector: cmpDeclaration.name.text,
-        props,
-        fileExt: js ? `${cyFilePrefix}.js` : `${cyFilePrefix}.ts`,
-    });
-}
-exports.default = componentCypressGenerator;

package/src/generators/component-cypress-spec/files/__componentName__.__fileExt__

@@ -1,13 +0,0 @@
-describe('<%=projectName%>: <%= componentSelector %> component', () => {
-  beforeEach(() => cy.visit('/iframe.html?id=<%= componentSelector.toLowerCase() %>--primary<% if ( props && props.length > 0 ) { %>&args=<% } %><%
-    for(let prop of props) {
-      %><%=prop.name%><%
-      if(prop.defaultValue !== undefined && (prop.defaultValue || prop.defaultValue === false)) {
-        %>:<%=prop.defaultValue%><%
-      } %>;<%
-    }%>'));
-    
-    it('should render the component', () => {
-      cy.get('h1').should('contain', 'Welcome to <%=componentSelector%>!');
-    });
-});

package/src/generators/component-cypress-spec/schema.json

@@ -1,45 +0,0 @@
-{
-  "$schema": "https://json-schema.org/schema",
-  "cli": "nx",
-  "$id": "NxReactComponentCypressSpec",
-  "title": "Create component Cypress spec",
-  "description": "Create a Storybook Cypress spec for a UI component that has a story.",
-  "x-deprecated": "Use interactionTests instead. This option will be removed in v20.",
-  "type": "object",
-  "properties": {
-    "project": {
-      "type": "string",
-      "description": "The project name for which to generate tests.",
-      "examples": ["shared-ui-component"],
-      "$default": {
-        "$source": "projectName",
-        "index": 0
-      },
-      "x-prompt": "What's name of the project for which to generate tests?",
-      "x-priority": "important"
-    },
-    "componentPath": {
-      "type": "string",
-      "description": "Relative path to the component file from the library root?",
-      "examples": ["lib/components"],
-      "x-prompt": "What's path of the component relative to the project's lib root for which to generate a test?",
-      "x-priority": "important"
-    },
-    "js": {
-      "type": "boolean",
-      "description": "Generate JavaScript files rather than TypeScript files.",
-      "default": false
-    },
-    "cypressProject": {
-      "type": "string",
-      "description": "The Cypress project to generate the stories under. By default, inferred from `project`."
-    },
-    "skipFormat": {
-      "description": "Skip formatting files.",
-      "type": "boolean",
-      "default": false,
-      "x-priority": "internal"
-    }
-  },
-  "required": ["project", "componentPath"]
-}