@nx/cypress 18.2.0-beta.0 → 18.2.0-beta.2

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "18.2.0-beta.0",
+  "version": "18.2.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": {
@@ -34,14 +34,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "18.2.0-beta.0",
-    "@nx/eslint": "18.2.0-beta.0",
-    "@nx/js": "18.2.0-beta.0",
+    "@nx/devkit": "18.2.0-beta.2",
+    "@nx/eslint": "18.2.0-beta.2",
+    "@nx/js": "18.2.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "18.2.0-beta.0"
+    "@nrwl/cypress": "18.2.0-beta.2"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/src/plugins/plugin.js

@@ -39,10 +39,10 @@ exports.createNodes = [
         const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
             (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
         ]);
-        const { targets, ciTestingGroup } = targetsCache[hash]
+        const { targets, targetGroups } = targetsCache[hash]
             ? targetsCache[hash]
             : await buildCypressTargets(configFilePath, projectRoot, options, context);
-        calculatedTargets[hash] = { targets, ciTestingGroup };
+        calculatedTargets[hash] = { targets, targetGroups };
         const project = {
             projectType: 'application',
             targets,
@@ -50,10 +50,8 @@ exports.createNodes = [
                 technologies: ['cypress'],
             },
         };
-        if (ciTestingGroup) {
-            project.metadata.targetGroups = {
-                [`${projectRoot}:e2e-ci`]: ciTestingGroup,
-            };
+        if (targetGroups) {
+            project.metadata.targetGroups = targetGroups;
         }
         return {
             projects: {
@@ -111,7 +109,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
     const webServerCommands = pluginPresetOptions?.webServerCommands;
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
-    let ciTestingGroup = [];
+    let targetGroups;
     if ('e2e' in cypressConfig) {
         targets[options.targetName] = {
             command: `cypress run`,
@@ -146,10 +144,13 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
             const dependsOn = [];
             const outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
             const inputs = getInputs(namedInputs);
+            const groupName = 'E2E (CI)';
+            targetGroups = { [groupName]: [] };
+            const ciTargetGroup = targetGroups[groupName];
             for (const file of specFiles) {
                 const relativeSpecFilePath = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, file));
                 const targetName = options.ciTargetName + '--' + relativeSpecFilePath;
-                ciTestingGroup.push(targetName);
+                ciTargetGroup.push(targetName);
                 targets[targetName] = {
                     outputs,
                     inputs,
@@ -165,7 +166,6 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                     params: 'forward',
                 });
             }
-            targets[options.ciTargetName] ??= {};
             targets[options.ciTargetName] = {
                 executor: 'nx:noop',
                 cache: true,
@@ -173,7 +173,10 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                 outputs,
                 dependsOn,
             };
-            ciTestingGroup.push(options.ciTargetName);
+            ciTargetGroup.push(options.ciTargetName);
+        }
+        else {
+            targetGroups = null;
         }
     }
     if ('component' in cypressConfig) {
@@ -186,10 +189,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
             outputs: getOutputs(projectRoot, cypressConfig, 'component'),
         };
     }
-    if (ciTestingGroup.length === 0) {
-        ciTestingGroup = null;
-    }
-    return { targets, ciTestingGroup };
+    return { targets, targetGroups };
 }
 function normalizeOptions(options) {
     options ??= {};