@nx/cypress 18.0.4 → 18.0.6

package/package.json

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

package/plugins/cypress-preset.js

@@ -61,12 +61,21 @@ function startWebServer(webServerCommand) {
  */
 function nxE2EPreset(pathToConfig, options) {
     const basePath = options?.cypressDir || 'src';
+    const dir = (0, path_1.dirname)(pathToConfig);
+    let supportFile = undefined;
+    for (const f of ['e2e.ts', 'e2e.js']) {
+        const candidate = (0, path_1.join)(dir, basePath, 'support', f);
+        if ((0, fs_1.existsSync)(candidate)) {
+            supportFile = candidate;
+            break;
+        }
+    }
     const baseConfig /*Cypress.EndToEndConfigOptions & {
       [NX_PLUGIN_OPTIONS]: unknown;
     }*/ = {
         ...nxBaseCypressPreset(pathToConfig),
         fileServerFolder: '.',
-        supportFile: `${basePath}/support/e2e.{js,ts}`,
+        supportFile,
         specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`,
         fixturesFolder: `${basePath}/fixtures`,
         [constants_1.NX_PLUGIN_OPTIONS]: {

package/src/generators/configuration/configuration.js

@@ -17,15 +17,18 @@ function configurationGenerator(tree, options) {
 exports.configurationGenerator = configurationGenerator;
 async function configurationGeneratorInternal(tree, options) {
     const opts = normalizeOptions(tree, options);
+    opts.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const tasks = [];
     if (!(0, cypress_version_1.installedCypressVersion)()) {
         tasks.push(await (0, js_1.initGenerator)(tree, { ...options, skipFormat: true }));
         tasks.push(await (0, init_1.default)(tree, {
             ...opts,
             skipFormat: true,
-            addPlugin: options.addPlugin,
         }));
     }
+    else if (opts.addPlugin) {
+        (0, init_1.addPlugin)(tree);
+    }
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -78,7 +81,6 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
     }
     return {
         ...options,
-        addPlugin: options.addPlugin ?? process.env.NX_ADD_PLUGINS !== 'false',
         bundler: options.bundler ?? 'webpack',
         rootProject: options.rootProject ?? projectConfig.root === '.',
         linter: options.linter ?? eslint_1.Linter.EsLint,
@@ -128,11 +130,12 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
             const devServerProjectConfig = (0, devkit_1.readProjectConfiguration)(tree, parsedTarget.project);
             // Add production e2e target if serve target is found
             if (parsedTarget.configuration !== 'production' &&
-                devServerProjectConfig.targets[parsedTarget.target]?.configurations?.['production']) {
+                devServerProjectConfig?.targets?.[parsedTarget.target]
+                    ?.configurations?.['production']) {
                 webServerCommands.production = `nx run ${parsedTarget.project}:${parsedTarget.target}:production`;
             }
             // Add ci/static e2e target if serve target is found
-            if (devServerProjectConfig.targets?.['serve-static']) {
+            if (devServerProjectConfig?.targets?.['serve-static']) {
                 ciWebServerCommand = `nx run ${parsedTarget.project}:serve-static`;
             }
         }
@@ -165,6 +168,7 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
 function addTarget(tree, opts) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();
+    projectConfig.targets ??= {};
     projectConfig.targets.e2e = {
         executor: '@nx/cypress:cypress',
         options: {

package/src/generators/cypress-project/cypress-project.js

@@ -201,6 +201,7 @@ async function normalizeOptions(host, options) {
     });
     options.linter = options.linter || eslint_1.Linter.EsLint;
     options.bundler = options.bundler || 'webpack';
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     return {
         ...options,
         // other generators depend on the rootProject flag down stream

package/src/generators/init/init.d.ts

@@ -1,5 +1,6 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
+export declare function addPlugin(tree: Tree): void;
 export declare function cypressInitGenerator(tree: Tree, options: Schema): Promise<GeneratorCallback>;
 export declare function cypressInitGeneratorInternal(tree: Tree, options: Schema): Promise<GeneratorCallback>;
 export default cypressInitGenerator;

package/src/generators/init/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressInitGeneratorInternal = exports.cypressInitGenerator = void 0;
+exports.cypressInitGeneratorInternal = exports.cypressInitGenerator = exports.addPlugin = void 0;
 const devkit_1 = require("@nx/devkit");
 const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const plugin_1 = require("../../plugins/plugin");
@@ -49,6 +49,7 @@ function addPlugin(tree) {
     });
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
+exports.addPlugin = addPlugin;
 function updateProductionFileset(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const productionFileset = nxJson.namedInputs?.production;

package/src/utils/versions.d.ts

@@ -2,7 +2,7 @@ export declare const nxVersion: any;
 export declare const eslintPluginCypressVersion = "^2.13.4";
 export declare const typesNodeVersion = "18.16.9";
 export declare const cypressViteDevServerVersion = "^2.2.1";
-export declare const cypressVersion = "^13.0.0";
+export declare const cypressVersion = "13.6.4";
 export declare const cypressWebpackVersion = "^2.0.0";
 export declare const webpackHttpPluginVersion = "^5.5.0";
 export declare const viteVersion = "~5.0.0";

package/src/utils/versions.js

@@ -5,7 +5,7 @@ exports.nxVersion = require('../../package.json').version;
 exports.eslintPluginCypressVersion = '^2.13.4';
 exports.typesNodeVersion = '18.16.9';
 exports.cypressViteDevServerVersion = '^2.2.1';
-exports.cypressVersion = '^13.0.0';
+exports.cypressVersion = '13.6.4';
 exports.cypressWebpackVersion = '^2.0.0';
 exports.webpackHttpPluginVersion = '^5.5.0';
 exports.viteVersion = '~5.0.0';