@nx/cypress 19.4.0-beta.1 → 19.4.0-beta.2

package/generators.json

@@ -5,7 +5,7 @@
     "init": {
       "factory": "./src/generators/init/init#cypressInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
-      "description": "Initialize the `@nrwl/cypress` plugin.",
+      "description": "Initialize the `@nx/cypress` plugin.",
       "aliases": ["ng-add"],
       "hidden": true
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "19.4.0-beta.1",
+  "version": "19.4.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -36,13 +36,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.4.0-beta.1",
-    "@nx/eslint": "19.4.0-beta.1",
-    "@nx/js": "19.4.0-beta.1",
+    "@nx/devkit": "19.4.0-beta.2",
+    "@nx/eslint": "19.4.0-beta.2",
+    "@nx/js": "19.4.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "19.4.0-beta.1"
+    "@nrwl/cypress": "19.4.0-beta.2"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -3,23 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = void 0;
 const devkit_1 = require("@nx/devkit");
 const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
+const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
 const plugin_1 = require("../../plugins/plugin");
-const target_options_map_1 = require("./lib/target-options-map");
-const upsert_baseUrl_1 = require("./lib/upsert-baseUrl");
 const add_dev_server_target_to_config_1 = require("./lib/add-dev-server-target-to-config");
 const add_exclude_spec_pattern_1 = require("./lib/add-exclude-spec-pattern");
+const target_options_map_1 = require("./lib/target-options-map");
+const upsert_baseUrl_1 = require("./lib/upsert-baseUrl");
 async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    const migratedProjectsModern = await (0, executor_to_plugin_migrator_1.migrateExecutorToPlugin)(tree, projectGraph, '@nx/cypress:cypress', '@nx/cypress/plugin', (targetName) => ({
-        targetName,
-        ciTargetName: 'e2e-ci',
-    }), postTargetTransformer, plugin_1.createNodesV2, options.project);
-    const migratedProjectsLegacy = await (0, executor_to_plugin_migrator_1.migrateExecutorToPlugin)(tree, projectGraph, '@nrwl/cypress:cypress', '@nx/cypress/plugin', (targetName) => ({
-        targetName,
+    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/cypress/plugin', plugin_1.createNodesV2, {
+        targetName: 'cypress',
         ciTargetName: 'e2e-ci',
-    }), postTargetTransformer, plugin_1.createNodesV2, options.project);
-    const migratedProjects = migratedProjectsModern.size + migratedProjectsLegacy.size;
-    if (migratedProjects === 0) {
+        componentTestingTargetName: 'component-test',
+        openTargetName: 'open-cypress',
+    }, [
+        {
+            executors: ['@nx/cypress:cypress', '@nrwl/cypress:cypress'],
+            postTargetTransformer,
+            targetPluginOptionMapper: (targetName) => ({ targetName }),
+        },
+    ], options.project);
+    if (migratedProjects.size === 0) {
         throw new Error('Could not find any targets to migrate.');
     }
     if (!options.skipFormat) {
@@ -27,58 +31,19 @@ async function convertToInferred(tree, options) {
     }
 }
 exports.convertToInferred = convertToInferred;
-function postTargetTransformer(target, tree) {
+function postTargetTransformer(target, tree, projectDetails, inferredTargetConfiguration) {
     if (target.options) {
-        const configFilePath = target.options.cypressConfig;
-        delete target.options.cypressConfig;
-        delete target.options.copyFiles;
-        delete target.options.skipServe;
-        for (const key in target_options_map_1.targetOptionsToCliMap) {
-            if (target.options[key]) {
-                target.options[target_options_map_1.targetOptionsToCliMap[key]] = target.options[key];
-                delete target.options[key];
-            }
-        }
-        if ('exit' in target.options && !target.options.exit) {
-            delete target.options.exit;
-            target.options['no-exit'] = true;
-        }
-        if (target.options.testingType) {
-            delete target.options.testingType;
-        }
-        if (target.options.watch) {
-            target.options.headed = true;
-            target.options['no-exit'] = true;
-            delete target.options.watch;
-        }
-        if (target.options.baseUrl) {
-            (0, upsert_baseUrl_1.upsertBaseUrl)(tree, configFilePath, target.options.baseUrl);
-            delete target.options.baseUrl;
-        }
-        if (target.options.devServerTarget) {
-            const webServerCommands = {
-                default: `npx nx run ${target.options.devServerTarget}`,
-            };
-            delete target.options.devServerTarget;
-            if (target.configurations) {
-                for (const configuration in target.configurations) {
-                    if (target.configurations[configuration]?.devServerTarget) {
-                        webServerCommands[configuration] = `npx nx run ${target.configurations[configuration].devServerTarget}`;
-                        delete target.configurations[configuration].devServerTarget;
-                    }
-                }
-            }
-            (0, add_dev_server_target_to_config_1.addDevServerTargetToConfig)(tree, configFilePath, webServerCommands, webServerCommands?.['ci']);
-        }
-        if (target.options.ignoreTestFiles) {
-            (0, add_exclude_spec_pattern_1.addExcludeSpecPattern)(tree, configFilePath, target.options.ignoreTestFiles);
-            delete target.options.ignoreTestFiles;
-        }
+        handlePropertiesInOptions(tree, target.options, projectDetails.root, target);
         if (Object.keys(target.options).length === 0) {
             delete target.options;
         }
-        if (target.configurations &&
-            Object.keys(target.configurations).length !== 0) {
+    }
+    if (target.configurations) {
+        for (const configurationName in target.configurations) {
+            const configuration = target.configurations[configurationName];
+            handlePropertiesInOptions(tree, configuration, projectDetails.root, target);
+        }
+        if (Object.keys(target.configurations).length !== 0) {
             for (const configuration in target.configurations) {
                 if (Object.keys(target.configurations[configuration]).length === 0) {
                     delete target.configurations[configuration];
@@ -89,6 +54,68 @@ function postTargetTransformer(target, tree) {
             }
         }
     }
+    if (target.outputs) {
+        (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
+            projectName: projectDetails.projectName,
+            projectRoot: projectDetails.root,
+        });
+    }
     return target;
 }
+function handlePropertiesInOptions(tree, options, projectRoot, target) {
+    let configFilePath;
+    if ('cypressConfig' in options) {
+        configFilePath = options.cypressConfig;
+        options['config-file'] = (0, plugin_migration_utils_1.toProjectRelativePath)(configFilePath, projectRoot);
+        delete options.cypressConfig;
+    }
+    if ('copyFiles' in options) {
+        delete options.copyFiles;
+    }
+    if ('skipServe' in options) {
+        delete options.skipServe;
+    }
+    for (const key in target_options_map_1.targetOptionsToCliMap) {
+        if (options[key]) {
+            const prevValue = options[key];
+            delete options[key];
+            options[target_options_map_1.targetOptionsToCliMap[key]] = prevValue;
+        }
+    }
+    if ('exit' in options && !options.exit) {
+        delete options.exit;
+        options['no-exit'] = true;
+    }
+    if ('testingType' in options) {
+        delete options.testingType;
+    }
+    if ('watch' in options) {
+        options.headed = true;
+        options['no-exit'] = true;
+        delete options.watch;
+    }
+    if (options.baseUrl && configFilePath) {
+        (0, upsert_baseUrl_1.upsertBaseUrl)(tree, configFilePath, options.baseUrl);
+        delete options.baseUrl;
+    }
+    if (options.devServerTarget && configFilePath) {
+        const webServerCommands = {
+            default: `npx nx run ${options.devServerTarget}`,
+        };
+        delete options.devServerTarget;
+        if (target.configurations && configFilePath) {
+            for (const configuration in target.configurations) {
+                if (target.configurations[configuration]?.devServerTarget) {
+                    webServerCommands[configuration] = `npx nx run ${target.configurations[configuration].devServerTarget}`;
+                    delete target.configurations[configuration].devServerTarget;
+                }
+            }
+        }
+        (0, add_dev_server_target_to_config_1.addDevServerTargetToConfig)(tree, configFilePath, webServerCommands, webServerCommands?.['ci']);
+    }
+    if ('ignoreTestFiles' in options) {
+        (0, add_exclude_spec_pattern_1.addExcludeSpecPattern)(tree, configFilePath, options.ignoreTestFiles);
+        delete options.ignoreTestFiles;
+    }
+}
 exports.default = convertToInferred;

package/src/plugins/plugin.js

@@ -173,6 +173,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                     metadata: {
                         technologies: ['cypress'],
                         description: `Runs Cypress Tests in ${relativeSpecFilePath} in CI`,
+                        nonAtomizedTarget: options.targetName,
                     },
                 };
                 dependsOn.push({
@@ -190,6 +191,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                 metadata: {
                     technologies: ['cypress'],
                     description: 'Runs Cypress Tests in CI',
+                    nonAtomizedTarget: options.targetName,
                 },
             };
             ciTargetGroup.push(options.ciTargetName);