@nx/cypress 21.6.1-beta.1 → 21.6.1-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "21.6.1-beta.1",
+  "version": "21.6.1-beta.3",
   "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,9 +36,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.6.1-beta.1",
-    "@nx/eslint": "21.6.1-beta.1",
-    "@nx/js": "21.6.1-beta.1",
+    "@nx/devkit": "21.6.1-beta.3",
+    "@nx/eslint": "21.6.1-beta.3",
+    "@nx/js": "21.6.1-beta.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "semver": "^7.6.3",
@@ -46,7 +46,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "21.6.1-beta.1"
+    "nx": "21.6.1-beta.3"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 15"

package/src/plugins/plugin.d.ts

@@ -1,9 +1,10 @@
-import { CreateNodes, CreateNodesV2 } from '@nx/devkit';
+import { type CreateNodes, type CreateNodesV2 } from '@nx/devkit';
 export interface CypressPluginOptions {
     ciTargetName?: string;
     targetName?: string;
     openTargetName?: string;
     componentTestingTargetName?: string;
+    ciComponentTestingTargetName?: string;
 }
 export declare const createNodesV2: CreateNodesV2<CypressPluginOptions>;
 /**

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAGX,aAAa,EAWd,MAAM,YAAY,CAAC;AAepB,MAAM,WAAW,oBAAoB;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC;AAoBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAqB7D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,oBAAoB,CAQzD,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,aAAa,EAWnB,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,oBAAoB;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACvC;AA8BD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAqB7D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,oBAAoB,CAQzD,CAAC"}

package/src/plugins/plugin.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodes = exports.createNodesV2 = void 0;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const js_1 = require("@nx/js");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const fs_1 = require("fs");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
-const constants_1 = require("../utils/constants");
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const js_1 = require("@nx/js");
+const fs_1 = require("fs");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const cache_directory_1 = require("nx/src/utils/cache-directory");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
+const path_1 = require("path");
+const constants_1 = require("../utils/constants");
 function readTargetsCache(cachePath) {
     try {
         return process.env.NX_CACHE_PROJECT_GRAPH !== 'false'
@@ -26,6 +26,16 @@ function writeTargetsToCache(cachePath, results) {
     (0, devkit_1.writeJsonFile)(cachePath, results);
 }
 const cypressConfigGlob = '**/cypress.config.{js,ts,mjs,cjs}';
+const defaultPatterns = {
+    e2e: {
+        specPattern: 'cypress/e2e/**/*.cy.{js,jsx,ts,tsx}',
+        excludeSpecPattern: '*.hot-update.js',
+    },
+    component: {
+        specPattern: '**/*.cy.{js,jsx,ts,tsx}',
+        excludeSpecPattern: ['/snapshots/*', '/image_snapshots/*'],
+    },
+};
 const pmc = (0, devkit_1.getPackageManagerCommand)();
 exports.createNodesV2 = [
     cypressConfigGlob,
@@ -214,16 +224,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
         }
         const ciWebServerCommand = pluginPresetOptions?.ciWebServerCommand;
         if (ciWebServerCommand) {
-            const specPatterns = Array.isArray(cypressConfig.e2e.specPattern)
-                ? cypressConfig.e2e.specPattern.map((p) => (0, path_1.join)(projectRoot, p))
-                : [(0, path_1.join)(projectRoot, cypressConfig.e2e.specPattern)];
-            const excludeSpecPatterns = !cypressConfig.e2e
-                .excludeSpecPattern
-                ? cypressConfig.e2e.excludeSpecPattern
-                : Array.isArray(cypressConfig.e2e.excludeSpecPattern)
-                    ? cypressConfig.e2e.excludeSpecPattern.map((p) => (0, path_1.join)(projectRoot, p))
-                    : [(0, path_1.join)(projectRoot, cypressConfig.e2e.excludeSpecPattern)];
-            const specFiles = await (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, specPatterns, excludeSpecPatterns);
+            const { specFiles, specPatterns, excludeSpecPatterns } = await getSpecFilesAndPatternsForTestType(cypressConfig, 'e2e', context.workspaceRoot, projectRoot);
             const ciBaseUrl = pluginPresetOptions?.ciBaseUrl;
             const dependsOn = [];
             const outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
@@ -276,6 +277,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                     target: targetName,
                     projects: 'self',
                     params: 'forward',
+                    options: 'forward',
                 });
                 if (ciWebServerCommandTask) {
                     targets[targetName].dependsOn = [
@@ -314,6 +316,8 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
         }
     }
     if ('component' in cypressConfig) {
+        const inputs = getInputs(namedInputs);
+        const outputs = getOutputs(projectRoot, cypressConfig, 'component');
         // This will not override the e2e target if it is the same
         targets[options.componentTestingTargetName] ??= {
             command: `cypress run --component`,
@@ -322,8 +326,8 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                 env: { TS_NODE_COMPILER_OPTIONS: tsNodeCompilerOptions },
             },
             cache: true,
-            inputs: getInputs(namedInputs),
-            outputs: getOutputs(projectRoot, cypressConfig, 'component'),
+            inputs,
+            outputs,
             metadata: {
                 technologies: ['cypress'],
                 description: 'Runs Cypress Component Tests',
@@ -335,6 +339,83 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                 },
             },
         };
+        if (options.ciComponentTestingTargetName) {
+            const { specFiles, specPatterns, excludeSpecPatterns } = await getSpecFilesAndPatternsForTestType(cypressConfig, 'component', context.workspaceRoot, projectRoot);
+            const dependsOn = [];
+            const groupName = 'Component Testing (CI)';
+            metadata ??= {};
+            metadata.targetGroups ??= {};
+            metadata.targetGroups[groupName] ??= [];
+            const ctCiTargetGroup = metadata.targetGroups[groupName];
+            for (const file of specFiles) {
+                const relativeSpecFilePath = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, file));
+                if (relativeSpecFilePath.includes('../')) {
+                    throw new Error('@nx/cypress/plugin attempted to run tests outside of the project root. This is not supported and should not happen. Please open an issue at https://github.com/nrwl/nx/issues/new/choose with the following information:\n\n' +
+                        `\n\n${JSON.stringify({
+                            projectRoot,
+                            relativeSpecFilePath,
+                            specFiles,
+                            context,
+                            excludeSpecPatterns,
+                            specPatterns,
+                        }, null, 2)}`);
+                }
+                const targetName = options.ciComponentTestingTargetName + '--' + relativeSpecFilePath;
+                const outputSubfolder = relativeSpecFilePath
+                    .replace(/[\/\\]/g, '-')
+                    .replace(/\./g, '-');
+                ctCiTargetGroup.push(targetName);
+                targets[targetName] = {
+                    outputs: getTargetOutputs(outputs, outputSubfolder),
+                    inputs,
+                    cache: true,
+                    command: `cypress run --component --spec ${relativeSpecFilePath} --config=${getTargetConfig(cypressConfig, outputSubfolder)}`,
+                    options: {
+                        cwd: projectRoot,
+                        env: { TS_NODE_COMPILER_OPTIONS: tsNodeCompilerOptions },
+                    },
+                    // Cypress handles starting the server, there's no separate server
+                    // target we can use as continuous, so we need to disable parallelism
+                    // to avoid port conflicts
+                    parallelism: false,
+                    metadata: {
+                        technologies: ['cypress'],
+                        description: `Runs Cypress Component Tests for ${relativeSpecFilePath} in CI`,
+                        help: {
+                            command: `${pmc.exec} cypress run --help`,
+                            example: {
+                                args: ['--dev', '--headed'],
+                            },
+                        },
+                    },
+                };
+                dependsOn.push({
+                    target: targetName,
+                    projects: 'self',
+                    params: 'forward',
+                    options: 'forward',
+                });
+            }
+            targets[options.ciComponentTestingTargetName] = {
+                executor: 'nx:noop',
+                cache: true,
+                inputs,
+                outputs,
+                dependsOn,
+                metadata: {
+                    technologies: ['cypress'],
+                    description: 'Runs Cypress Component Tests in CI',
+                    nonAtomizedTarget: options.componentTestingTargetName,
+                    help: {
+                        command: `${pmc.exec} cypress run --help`,
+                        example: {
+                            args: ['--dev', '--headed'],
+                        },
+                    },
+                },
+            };
+            ctCiTargetGroup.push(options.ciComponentTestingTargetName);
+        }
     }
     targets[options.openTargetName] = {
         command: `cypress open`,
@@ -361,6 +442,8 @@ function normalizeOptions(options) {
     options.openTargetName ??= 'open-cypress';
     options.componentTestingTargetName ??= 'component-test';
     options.ciTargetName ??= 'e2e-ci';
+    // must be explicitly provided to opt-in to atomized component testing
+    options.ciComponentTestingTargetName;
     return options;
 }
 function getInputs(namedInputs) {
@@ -388,3 +471,17 @@ function parseTaskFromCommand(command) {
     }
     return null;
 }
+async function getSpecFilesAndPatternsForTestType(cypressConfig, testType, workspaceRoot, projectRoot) {
+    const specPattern = cypressConfig[testType].specPattern ??
+        defaultPatterns[testType].specPattern;
+    const specPatterns = Array.isArray(specPattern)
+        ? specPattern.map((p) => (0, path_1.join)(projectRoot, p))
+        : [(0, path_1.join)(projectRoot, specPattern)];
+    const excludeSpecPattern = cypressConfig[testType].excludeSpecPattern ??
+        defaultPatterns[testType].excludeSpecPattern;
+    const excludeSpecPatterns = Array.isArray(excludeSpecPattern)
+        ? excludeSpecPattern.map((p) => (0, path_1.join)(projectRoot, p))
+        : [(0, path_1.join)(projectRoot, excludeSpecPattern)];
+    const specFiles = await (0, workspace_context_1.globWithWorkspaceContext)(workspaceRoot, specPatterns, excludeSpecPatterns);
+    return { specFiles, specPatterns, excludeSpecPatterns };
+}