@nx/cypress 18.0.3 → 18.0.5

package/package.json

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

package/plugins/cypress-preset.js

@@ -30,13 +30,18 @@ function nxBaseCypressPreset(pathToConfig, options) {
 }
 exports.nxBaseCypressPreset = nxBaseCypressPreset;
 function startWebServer(webServerCommand) {
-    const serverProcess = (0, child_process_1.exec)(webServerCommand, {
+    const serverProcess = (0, child_process_1.spawn)(webServerCommand, {
         cwd: devkit_1.workspaceRoot,
+        shell: true,
+        // Detaching the process on unix will create a process group, allowing us to kill it later
+        // Windows is fine so we leave it attached to this process
+        detached: process.platform !== 'win32',
+        stdio: 'inherit',
     });
-    serverProcess.stdout.pipe(process.stdout);
-    serverProcess.stderr.pipe(process.stderr);
     return () => {
-        serverProcess.kill();
+        // child.kill() does not work on linux
+        // process.kill will kill the whole process group on unix
+        process.kill(-serverProcess.pid, 'SIGKILL');
     };
 }
 /**
@@ -56,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]: {
@@ -108,7 +122,7 @@ function waitForServer(url, webServerConfig) {
     return new Promise((resolve, reject) => {
         let pollTimeout;
         const { protocol } = new URL(url);
-        const timeoutDuration = webServerConfig?.timeout ?? 10 * 1000;
+        const timeoutDuration = webServerConfig?.timeout ?? 15 * 1000;
         const timeout = setTimeout(() => {
             clearTimeout(pollTimeout);
             reject(new Error(`Web server failed to start in ${timeoutDuration}ms. This can be configured in cypress.config.ts.`));

package/src/generators/configuration/configuration.js

@@ -128,11 +128,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 +166,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/utils/versions.d.ts

@@ -2,8 +2,8 @@ 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";
+export declare const viteVersion = "~5.0.0";
 export declare const htmlWebpackPluginVersion = "^5.5.0";

package/src/utils/versions.js

@@ -5,8 +5,8 @@ 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';
+exports.viteVersion = '~5.0.0';
 exports.htmlWebpackPluginVersion = '^5.5.0';