@nx/cypress 19.6.0 → 19.6.2

package/README.md

@@ -22,7 +22,7 @@
 
 # Nx: Smart Monorepos · Fast CI
 
-Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
+Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
 
 This package is a [Cypress plugin for Nx](https://nx.dev/cypress/overview).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "19.6.0",
+  "version": "19.6.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": {
@@ -36,13 +36,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.6.0",
-    "@nx/eslint": "19.6.0",
-    "@nx/js": "19.6.0",
+    "@nx/devkit": "19.6.2",
+    "@nx/eslint": "19.6.2",
+    "@nx/js": "19.6.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "19.6.0"
+    "@nrwl/cypress": "19.6.2"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/src/generators/configuration/configuration.d.ts

@@ -1,5 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
-import { Linter } from '@nx/eslint';
+import { Linter, LinterType } from '@nx/eslint';
 export interface CypressE2EConfigSchema {
     project: string;
     baseUrl?: string;
@@ -10,7 +10,7 @@ export interface CypressE2EConfigSchema {
     skipPackageJson?: boolean;
     bundler?: 'webpack' | 'vite' | 'none';
     devServerTarget?: string;
-    linter?: Linter;
+    linter?: Linter | LinterType;
     port?: number | 'cypress-auto';
     jsx?: boolean;
     rootProject?: boolean;

package/src/migrations/update-19-6-0/update-ci-webserver-for-static-serve.js

@@ -10,6 +10,9 @@ async function default_1(tree) {
     const graph = await (0, devkit_1.createProjectGraphAsync)();
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const matchingPluginRegistrations = nxJson.plugins?.filter((p) => typeof p === 'string' ? p === pluginName : p.plugin === pluginName);
+    if (!matchingPluginRegistrations?.length) {
+        return;
+    }
     const { createNodesV2, } = await Promise.resolve(`${pluginName}`).then(s => require(s));
     for (const plugin of matchingPluginRegistrations) {
         let projectConfigs;
@@ -39,13 +42,30 @@ async function default_1(tree) {
                 continue;
             }
             const ciWebServerCommand = nodes[0].getText();
-            const NX_TARGET_REGEX = "(?<=nx run )[^']+";
-            const matches = ciWebServerCommand.match(NX_TARGET_REGEX);
-            if (!matches) {
+            let project;
+            let portFlagValue;
+            if (ciWebServerCommand.includes('nx run')) {
+                const NX_TARGET_REGEX = /(?<=nx run )([^' ]+)(?: [^']*--port[= ](\d+))?/;
+                const matches = ciWebServerCommand.match(NX_TARGET_REGEX);
+                if (!matches) {
+                    continue;
+                }
+                const targetString = matches[1];
+                project = (0, devkit_1.parseTargetString)(targetString, graph).project;
+                portFlagValue = matches[2];
+            }
+            else {
+                const NX_PROJECT_REGEX = /(?<=nx [^ ]+ )([^' ]+)(?: [^']*--port[= ](\d+))?/;
+                const matches = ciWebServerCommand.match(NX_PROJECT_REGEX);
+                if (!matches) {
+                    continue;
+                }
+                project = matches[1];
+                portFlagValue = matches[2];
+            }
+            if (!project || !graph.nodes[project]) {
                 continue;
             }
-            const targetString = matches[0];
-            const { project, target, configuration } = (0, devkit_1.parseTargetString)(targetString, graph);
             const pathToViteConfig = [
                 (0, devkit_1.joinPathFragments)(graph.nodes[project].data.root, 'vite.config.ts'),
                 (0, devkit_1.joinPathFragments)(graph.nodes[project].data.root, 'vite.config.js'),
@@ -68,7 +88,7 @@ async function default_1(tree) {
                 if (!serveStaticTargetName) {
                     continue;
                 }
-                const newCommand = ciWebServerCommand.replace(/nx.*[^"']/, `nx run ${project}:${serveStaticTargetName}`);
+                const newCommand = ciWebServerCommand.replace(/nx.*[^"']/, `nx run ${project}:${serveStaticTargetName}${portFlagValue ? ` --port=${portFlagValue}` : ''}`);
                 tree.write(configFile, `${configFileContents.slice(0, nodes[0].getStart())}${newCommand}${configFileContents.slice(nodes[0].getEnd())}`);
             }
             else if (pathToViteConfig) {
@@ -86,9 +106,9 @@ async function default_1(tree) {
                 if (!previewTargetName) {
                     continue;
                 }
-                const newCommand = ciWebServerCommand.replace(/nx.*[^"']/, `nx run ${project}:${previewTargetName}`);
+                const newCommand = ciWebServerCommand.replace(/nx.*[^"']/, `nx run ${project}:${previewTargetName}${portFlagValue ? ` --port=${portFlagValue}` : ''}`);
                 tree.write(configFile, `${configFileContents.slice(0, nodes[0].getStart())}${newCommand},
-      ciBaseUrl: "http://localhost:4300"${configFileContents.slice(nodes[0].getEnd())}`);
+      ciBaseUrl: "http://localhost:${portFlagValue ?? '4300'}"${configFileContents.slice(nodes[0].getEnd())}`);
             }
         }
     }

package/src/utils/add-linter.d.ts

@@ -1,8 +1,8 @@
 import { Tree } from '@nx/devkit';
-import { Linter } from '@nx/eslint';
+import { Linter, LinterType } from '@nx/eslint';
 export interface CyLinterOptions {
     project: string;
-    linter: Linter;
+    linter: Linter | LinterType;
     setParserOptionsProject?: boolean;
     skipPackageJson?: boolean;
     rootProject?: boolean;