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

package/migrations.json

@@ -52,11 +52,6 @@
       "version": "17.2.0-beta.0",
       "description": "Add devServerTargets into cypress.config.ts files for @nx/cypress/plugin",
       "implementation": "./src/migrations/update-17-2-0/add-dev-server-targets-to-cypress-configs"
-    },
-    "add-nx-cypress-plugin": {
-      "version": "17.2.0-beta.0",
-      "description": "Add the @nx/cypress/plugin to nx.json plugins",
-      "implementation": "./src/migrations/update-17-2-0/add-nx-cypress-plugin"
     }
   },
   "packageJsonUpdates": {

package/package.json

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

package/src/plugins/plugin.js

@@ -61,7 +61,7 @@ function getOutputs(projectRoot, cypressConfig, testingType) {
         }
     }
     const { screenshotsFolder, videosFolder, e2e, component } = cypressConfig;
-    const outputs = ['{options.videosFolder}', '{options.screenshotsFolder}'];
+    const outputs = [];
     if (videosFolder) {
         outputs.push(getOutput(videosFolder));
     }
@@ -92,50 +92,39 @@ function getOutputs(projectRoot, cypressConfig, testingType) {
 }
 function buildCypressTargets(configFilePath, projectRoot, options, context) {
     const cypressConfig = getCypressConfig(configFilePath, context);
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
-    const baseTargetConfig = {
-        executor: '@nx/cypress:cypress',
-        options: {
-            cypressConfig: configFilePath,
-        },
+    const cypressEnv = {
+        ...cypressConfig.env,
+        ...cypressConfig.e2e?.env,
     };
+    const devServerTargets = cypressEnv?.devServerTargets;
+    const relativeConfigPath = (0, path_1.relative)(projectRoot, configFilePath);
+    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
     if ('e2e' in cypressConfig) {
-        const e2eTargetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.targetName, context.nxJsonConfiguration.targetDefaults, '@nx/cypress:cypress');
         targets[options.targetName] = {
-            ...baseTargetConfig,
+            command: `cypress run --config-file ${relativeConfigPath} --e2e`,
             options: {
-                ...baseTargetConfig.options,
-                testingType: 'e2e',
+                cwd: projectRoot,
             },
         };
+        const e2eTargetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.targetName, context.nxJsonConfiguration.targetDefaults, 'run-commands');
         if (e2eTargetDefaults?.cache === undefined) {
             targets[options.targetName].cache = true;
         }
         if (e2eTargetDefaults?.inputs === undefined) {
-            targets[options.targetName].inputs =
-                'production' in namedInputs
-                    ? ['default', '^production']
-                    : ['default', '^default'];
+            targets[options.targetName].inputs = getInputs(namedInputs);
         }
         if (e2eTargetDefaults?.outputs === undefined) {
             targets[options.targetName].outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
         }
-        const cypressEnv = {
-            ...cypressConfig.env,
-            ...cypressConfig.e2e?.env,
-        };
-        const devServerTargets = cypressEnv?.devServerTargets;
         if (devServerTargets?.default) {
-            targets[options.targetName].options.devServerTarget =
-                devServerTargets.default;
             delete devServerTargets.default;
         }
         if (Object.keys(devServerTargets ?? {}).length > 0) {
             targets[options.targetName].configurations ??= {};
             for (const [configuration, devServerTarget] of Object.entries(devServerTargets ?? {})) {
                 targets[options.targetName].configurations[configuration] = {
-                    devServerTarget,
+                    command: `cypress run --config-file ${relativeConfigPath} --e2e --env.devServerTarget ${devServerTarget}`,
                 };
             }
         }
@@ -153,22 +142,15 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
             const specFiles = (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, specPatterns, excludeSpecPatterns);
             const dependsOn = [];
             const outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
-            const inputs = 'production' in namedInputs
-                ? ['default', '^production']
-                : ['default', '^default'];
+            const inputs = getInputs(namedInputs);
             for (const file of specFiles) {
-                const targetName = options.ciTargetName + '--' + file;
+                const relativeSpecFilePath = (0, path_1.relative)(projectRoot, file);
+                const targetName = options.ciTargetName + '--' + relativeSpecFilePath;
                 targets[targetName] = {
-                    ...targets[options.targetName],
                     outputs,
                     inputs,
                     cache: true,
-                    configurations: undefined,
-                    options: {
-                        ...targets[options.targetName].options,
-                        devServerTarget: ciDevServerTarget,
-                        spec: file,
-                    },
+                    command: `cypress run --config-file ${relativeConfigPath} --e2e --env.devServerTarget ${ciDevServerTarget} --spec ${relativeSpecFilePath}`,
                 };
                 dependsOn.push({
                     target: targetName,
@@ -190,10 +172,9 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
         const componentTestingTargetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.componentTestingTargetName, context.nxJsonConfiguration.targetDefaults, '@nx/cypress:cypress');
         // This will not override the e2e target if it is the same
         targets[options.componentTestingTargetName] ??= {
-            ...baseTargetConfig,
+            command: `cypress open --config-file ${relativeConfigPath} --component`,
             options: {
-                ...baseTargetConfig.options,
-                testingType: 'component',
+                cwd: projectRoot,
             },
         };
         if (componentTestingTargetDefaults?.cache === undefined) {
@@ -201,9 +182,7 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
         }
         if (componentTestingTargetDefaults?.inputs === undefined) {
             targets[options.componentTestingTargetName].inputs =
-                'production' in namedInputs
-                    ? ['default', '^production']
-                    : ['default', '^default'];
+                getInputs(namedInputs);
         }
         if (componentTestingTargetDefaults?.outputs === undefined) {
             targets[options.componentTestingTargetName].outputs = getOutputs(projectRoot, cypressConfig, 'component');
@@ -241,3 +220,13 @@ function normalizeOptions(options) {
     options.ciTargetName ??= 'e2e-ci';
     return options;
 }
+function getInputs(namedInputs) {
+    return [
+        ...('production' in namedInputs
+            ? ['default', '^production']
+            : ['default', '^default']),
+        {
+            externalDependencies: ['cypress'],
+        },
+    ];
+}

package/src/migrations/update-17-2-0/add-nx-cypress-plugin.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-17-2-0/add-nx-cypress-plugin.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const plugin_1 = require("../../plugins/plugin");
-const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
-const replace_project_configuration_with_plugin_1 = require("@nx/devkit/src/utils/replace-project-configuration-with-plugin");
-async function update(tree) {
-    const proj = Object.fromEntries((0, devkit_1.getProjects)(tree).entries());
-    const rootMappings = (0, find_project_for_path_1.createProjectRootMappingsFromProjectConfigurations)(proj);
-    await (0, replace_project_configuration_with_plugin_1.replaceProjectConfigurationsWithPlugin)(tree, rootMappings, '@nx/cypress/plugin', plugin_1.createNodes, {
-        targetName: 'e2e',
-        componentTestingTargetName: 'component-test',
-    });
-    await (0, devkit_1.formatFiles)(tree);
-}
-exports.default = update;