@nx/cypress 18.0.2 → 18.0.4

package/package.json

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

package/plugins/cypress-preset.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const preprocessor_vite_1 = require("../src/plugins/preprocessor-vite");
-const symbols_1 = require("../src/utils/symbols");
+const constants_1 = require("../src/utils/constants");
 const child_process_1 = require("child_process");
 const http_1 = require("http");
 const https_1 = require("https");
@@ -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');
     };
 }
 /**
@@ -64,7 +69,7 @@ function nxE2EPreset(pathToConfig, options) {
         supportFile: `${basePath}/support/e2e.{js,ts}`,
         specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`,
         fixturesFolder: `${basePath}/fixtures`,
-        [symbols_1.NX_PLUGIN_OPTIONS]: {
+        [constants_1.NX_PLUGIN_OPTIONS]: {
             webServerCommand: options?.webServerCommands?.default,
             webServerCommands: options?.webServerCommands,
             ciWebServerCommand: options?.ciWebServerCommand,
@@ -108,7 +113,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/plugins/plugin.js

@@ -9,7 +9,7 @@ const fs_1 = require("fs");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 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 symbols_1 = require("../utils/symbols");
+const constants_1 = require("../utils/constants");
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'cypress.hash');
 const targetsCache = (0, fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
@@ -95,7 +95,7 @@ function getOutputs(projectRoot, cypressConfig, testingType) {
 async function buildCypressTargets(configFilePath, projectRoot, options, context) {
     const cypressConfig = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(context.workspaceRoot, configFilePath));
     const pluginPresetOptions = {
-        ...cypressConfig.e2e?.[symbols_1.NX_PLUGIN_OPTIONS],
+        ...cypressConfig.e2e?.[constants_1.NX_PLUGIN_OPTIONS],
         ...cypressConfig.env,
         ...cypressConfig.e2e?.env,
     };

package/src/utils/{symbols.d.ts → constants.d.ts}

@@ -1,4 +1,4 @@
 /**
  * Key used to store options used by the nx plugin for @nx/cypress.
  */
-export declare const NX_PLUGIN_OPTIONS: unique symbol;
+export declare const NX_PLUGIN_OPTIONS = "__NxPluginOptions__";

package/src/utils/{symbols.js → constants.js}

@@ -4,4 +4,4 @@ exports.NX_PLUGIN_OPTIONS = void 0;
 /**
  * Key used to store options used by the nx plugin for @nx/cypress.
  */
-exports.NX_PLUGIN_OPTIONS = Symbol('Nx Plugin Options');
+exports.NX_PLUGIN_OPTIONS = '__NxPluginOptions__';

package/src/utils/versions.d.ts

@@ -5,5 +5,5 @@ export declare const cypressViteDevServerVersion = "^2.2.1";
 export declare const cypressVersion = "^13.0.0";
 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

@@ -8,5 +8,5 @@ exports.cypressViteDevServerVersion = '^2.2.1';
 exports.cypressVersion = '^13.0.0';
 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';