@nx/cypress 17.0.1 → 17.1.0-beta.0

package/index.d.ts

@@ -1,9 +1,11 @@
 import { configurationGenerator } from './src/generators/configuration/configuration';
 import { componentConfigurationGenerator } from './src/generators/component-configuration/component-configuration';
+import { cypressProjectGenerator as _cypressProjectGenerator } from './src/generators/cypress-project/cypress-project';
 export { configurationGenerator, componentConfigurationGenerator };
-/** @deprecated Use `configurationGenerator` instead. */
+/** @deprecated Use `configurationGenerator` instead. It will be removed in Nx 18. */
 export declare const cypressComponentConfiguration: typeof componentConfigurationGenerator;
 export { configurationGenerator as cypressE2EConfigurationGenerator };
-export { cypressProjectGenerator } from './src/generators/cypress-project/cypress-project';
+/** @deprecated Add a new project and call `configurationGenerator` instead. It will be removed in Nx 18. */
+export declare const cypressProjectGenerator: typeof _cypressProjectGenerator;
 export { cypressInitGenerator } from './src/generators/init/init';
 export { migrateCypressProject } from './src/generators/migrate-to-cypress-11/migrate-to-cypress-11';

package/index.js

@@ -6,11 +6,14 @@ Object.defineProperty(exports, "configurationGenerator", { enumerable: true, get
 Object.defineProperty(exports, "cypressE2EConfigurationGenerator", { enumerable: true, get: function () { return configuration_1.configurationGenerator; } });
 const component_configuration_1 = require("./src/generators/component-configuration/component-configuration");
 Object.defineProperty(exports, "componentConfigurationGenerator", { enumerable: true, get: function () { return component_configuration_1.componentConfigurationGenerator; } });
+const cypress_project_1 = require("./src/generators/cypress-project/cypress-project");
 // Maintain backwards compatibility with the old names in case community plugins used them.
-/** @deprecated Use `configurationGenerator` instead. */
+// TODO(v18): Remove old name
+/** @deprecated Use `configurationGenerator` instead. It will be removed in Nx 18. */
 exports.cypressComponentConfiguration = component_configuration_1.componentConfigurationGenerator;
-var cypress_project_1 = require("./src/generators/cypress-project/cypress-project");
-Object.defineProperty(exports, "cypressProjectGenerator", { enumerable: true, get: function () { return cypress_project_1.cypressProjectGenerator; } });
+// TODO(v18): Remove project generator
+/** @deprecated Add a new project and call `configurationGenerator` instead. It will be removed in Nx 18. */
+exports.cypressProjectGenerator = cypress_project_1.cypressProjectGenerator;
 var init_1 = require("./src/generators/init/init");
 Object.defineProperty(exports, "cypressInitGenerator", { enumerable: true, get: function () { return init_1.cypressInitGenerator; } });
 var migrate_to_cypress_11_1 = require("./src/generators/migrate-to-cypress-11/migrate-to-cypress-11");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "17.0.1",
+  "version": "17.1.0-beta.0",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -38,10 +38,10 @@
     "detect-port": "^1.5.1",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.1",
-    "@nx/js": "17.0.1",
-    "@nx/eslint": "17.0.1",
-    "@nrwl/cypress": "17.0.1"
+    "@nx/devkit": "17.1.0-beta.0",
+    "@nx/js": "17.1.0-beta.0",
+    "@nx/eslint": "17.1.0-beta.0",
+    "@nrwl/cypress": "17.1.0-beta.0"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/src/generators/base-setup/base-setup.d.ts

@@ -6,5 +6,6 @@ export interface CypressBaseSetupSchema {
      * default is `cypress`
      * */
     directory?: string;
+    jsx?: boolean;
 }
 export declare function addBaseCypressSetup(tree: Tree, options: CypressBaseSetupSchema): void;

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

@@ -12,6 +12,7 @@ function addBaseCypressSetup(tree, options) {
     const opts = normalizeOptions(tree, projectConfig, options);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectConfig.root, {
         ...opts,
+        jsx: !!opts.jsx,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
         offsetFromProjectRoot: opts.hasTsConfig ? opts.offsetFromProjectRoot : '',
         tsConfigPath: opts.hasTsConfig

package/src/generators/base-setup/files/__directory__/{tsconfig.json → tsconfig.json__ext__}

@@ -12,9 +12,9 @@
     "**/*.js",
     "<%= offsetFromProjectRoot %>cypress.config.ts",
     "<%= offsetFromProjectRoot %>**/*.cy.ts",
-    "<%= offsetFromProjectRoot %>**/*.cy.tsx",
+    <% if (jsx) { %> "<%= offsetFromProjectRoot %>**/*.cy.tsx",<% } %>
     "<%= offsetFromProjectRoot %>**/*.cy.js",
-    "<%= offsetFromProjectRoot %>**/*.cy.jsx",
+    <% if (jsx) { %>"<%= offsetFromProjectRoot %>**/*.cy.jsx",<% } %>
     "<%= offsetFromProjectRoot %>**/*.d.ts"
   ]
 }

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

@@ -48,6 +48,7 @@ function addProjectFiles(tree, projectConfig, opts) {
     (0, base_setup_1.addBaseCypressSetup)(tree, {
         project: opts.project,
         directory: opts.directory,
+        jsx: opts.jsx,
     });
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), projectConfig.root, {
         ...opts,

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

@@ -3,4 +3,5 @@ export interface CypressComponentConfigurationSchema {
   skipFormat: boolean;
   directory?: string;
   bundler?: 'webpack' | 'vite';
+  jsx?: boolean;
 }

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

@@ -31,6 +31,11 @@
       "type": "string",
       "description": "A directory where the project is placed relative from the project root",
       "default": "cypress"
+    },
+    "jsx": {
+      "description": "Whether or not this project uses JSX.",
+      "type": "boolean",
+      "default": true
     }
   },
   "required": ["project"],

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

@@ -12,6 +12,8 @@ export interface CypressE2EConfigSchema {
     devServerTarget?: string;
     linter?: Linter;
     port?: number | 'cypress-auto';
+    jsx?: boolean;
+    rootProject?: boolean;
 }
 export declare function configurationGenerator(tree: Tree, options: CypressE2EConfigSchema): Promise<GeneratorCallback>;
 export default configurationGenerator;

package/src/generators/configuration/configuration.js

@@ -22,10 +22,11 @@ async function configurationGenerator(tree, options) {
     }
     await addFiles(tree, opts);
     addTarget(tree, opts);
-    (0, add_linter_1.addLinterToCyProject)(tree, {
+    const linterTask = await (0, add_linter_1.addLinterToCyProject)(tree, {
         ...opts,
         cypressDir: opts.directory,
     });
+    tasks.push(linterTask);
     if (!opts.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -48,7 +49,7 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
     return {
         ...options,
         bundler: options.bundler ?? 'webpack',
-        rootProject: projectConfig.root === '.',
+        rootProject: options.rootProject ?? projectConfig.root === '.',
         linter: options.linter ?? eslint_1.Linter.EsLint,
         devServerTarget: options.devServerTarget ??
             (projectConfig.targets.serve ? `${options.project}:serve` : undefined),
@@ -69,6 +70,7 @@ async function addFiles(tree, options) {
         ext: options.js ? 'js' : 'ts',
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
         offsetFromProjectRoot,
+        projectRoot: projectConfig.root,
         tsConfigPath: hasTsConfig
             ? `${offsetFromProjectRoot}/tsconfig.json`
             : (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
@@ -79,6 +81,7 @@ async function addFiles(tree, options) {
         (0, base_setup_1.addBaseCypressSetup)(tree, {
             project: options.project,
             directory: options.directory,
+            jsx: options.jsx,
         });
         const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
         const updatedCyConfig = await (0, config_1.addDefaultE2EConfig)(tree.read(cyFile, 'utf-8'), {
@@ -128,13 +131,18 @@ function addTarget(tree, opts) {
             devServerTarget: opts.devServerTarget,
             port: opts.port,
         };
-        projectConfig.targets.e2e.configurations = {
-            [parsedTarget.configuration || 'production']: {
-                devServerTarget: `${opts.devServerTarget}${parsedTarget.configuration ? '' : ':production'}`,
-            },
-        };
         const devServerProjectConfig = (0, devkit_1.readProjectConfiguration)(tree, parsedTarget.project);
+        // Add production e2e target if serve target is found
+        if (parsedTarget.configuration !== 'production' &&
+            devServerProjectConfig.targets?.[parsedTarget.target]?.configurations?.['production']) {
+            projectConfig.targets.e2e.configurations ??= {};
+            projectConfig.targets.e2e.configurations['production'] = {
+                devServerTarget: `${parsedTarget.project}:${parsedTarget.target}:production`,
+            };
+        }
+        // Add ci/static e2e target if serve target is found
         if (devServerProjectConfig.targets?.['serve-static']) {
+            projectConfig.targets.e2e.configurations ??= {};
             projectConfig.targets.e2e.configurations.ci = {
                 devServerTarget: `${parsedTarget.project}:serve-static`,
             };

package/src/generators/configuration/schema.json

@@ -84,6 +84,11 @@
       "enum": ["vite", "webpack", "none"],
       "x-prompt": "Which Cypress bundler do you want to use?",
       "default": "webpack"
+    },
+    "jsx": {
+      "description": "Whether or not this project uses JSX.",
+      "type": "boolean",
+      "default": true
     }
   },
   "required": ["project"],

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

@@ -11,7 +11,6 @@ export interface Schema {
   js?: boolean;
   skipFormat?: boolean;
   setParserOptionsProject?: boolean;
-  standaloneConfig?: boolean;
   skipPackageJson?: boolean;
   bundler?: 'webpack' | 'vite' | 'none';
 }

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

@@ -59,12 +59,6 @@
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
       "default": false
     },
-    "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"
-    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,