@nx/cypress 18.1.2 → 18.2.0-beta.0

package/package.json

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

package/src/plugins/plugin.js

@@ -39,16 +39,25 @@ 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 = targetsCache[hash]
+        const { targets, ciTestingGroup } = targetsCache[hash]
             ? targetsCache[hash]
             : await buildCypressTargets(configFilePath, projectRoot, options, context);
-        calculatedTargets[hash] = targets;
+        calculatedTargets[hash] = { targets, ciTestingGroup };
+        const project = {
+            projectType: 'application',
+            targets,
+            metadata: {
+                technologies: ['cypress'],
+            },
+        };
+        if (ciTestingGroup) {
+            project.metadata.targetGroups = {
+                [`${projectRoot}:e2e-ci`]: ciTestingGroup,
+            };
+        }
         return {
             projects: {
-                [projectRoot]: {
-                    projectType: 'application',
-                    targets,
-                },
+                [projectRoot]: project,
             },
         };
     },
@@ -56,10 +65,10 @@ exports.createNodes = [
 function getOutputs(projectRoot, cypressConfig, testingType) {
     function getOutput(path) {
         if (path.startsWith('..')) {
-            return (0, path_1.join)('{workspaceRoot}', (0, path_1.join)(projectRoot, path));
+            return (0, devkit_1.joinPathFragments)('{workspaceRoot}', projectRoot, path);
         }
         else {
-            return (0, path_1.join)('{projectRoot}', path);
+            return (0, devkit_1.joinPathFragments)('{projectRoot}', path);
         }
     }
     const { screenshotsFolder, videosFolder, e2e, component } = cypressConfig;
@@ -102,6 +111,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 = [];
     if ('e2e' in cypressConfig) {
         targets[options.targetName] = {
             command: `cypress run`,
@@ -137,8 +147,9 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
             const outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
             const inputs = getInputs(namedInputs);
             for (const file of specFiles) {
-                const relativeSpecFilePath = (0, path_1.relative)(projectRoot, file);
+                const relativeSpecFilePath = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, file));
                 const targetName = options.ciTargetName + '--' + relativeSpecFilePath;
+                ciTestingGroup.push(targetName);
                 targets[targetName] = {
                     outputs,
                     inputs,
@@ -162,6 +173,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                 outputs,
                 dependsOn,
             };
+            ciTestingGroup.push(options.ciTargetName);
         }
     }
     if ('component' in cypressConfig) {
@@ -174,7 +186,10 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
             outputs: getOutputs(projectRoot, cypressConfig, 'component'),
         };
     }
-    return targets;
+    if (ciTestingGroup.length === 0) {
+        ciTestingGroup = null;
+    }
+    return { targets, ciTestingGroup };
 }
 function normalizeOptions(options) {
     options ??= {};