@nx/cypress 22.7.1 → 22.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "22.7.1",
+  "version": "22.7.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": {
@@ -37,17 +37,17 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.1",
-    "@nx/eslint": "22.7.1",
-    "@nx/js": "22.7.1",
-    "@phenomnomnominal/tsquery": "~6.1.4",
-    "detect-port": "^1.5.1",
+    "@nx/devkit": "22.7.2",
+    "@nx/eslint": "22.7.2",
+    "@nx/js": "22.7.2",
+    "@phenomnomnominal/tsquery": "~6.2.0",
+    "detect-port": "^2.1.0",
     "semver": "^7.6.3",
     "tree-kill": "1.2.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.1"
+    "nx": "22.7.2"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"

package/src/plugins/plugin.js

@@ -70,47 +70,63 @@ async function createNodesInternal(configFilePath, options, context, pluginCache
 function getTargetOutputs(outputs, subfolder) {
     return outputs.map((output) => subfolder ? (0, path_1.join)(output, subfolder) : output);
 }
-function getTargetConfig(cypressConfig, outputSubfolder, ciBaseUrl) {
+// Normalize a Cypress config folder (e.g. videosFolder, screenshotsFolder) to a
+// project-root-relative path, then append the per-spec subfolder. Cypress
+// resolves relative folders against the project root (cwd), so this keeps the
+// path Cypress writes to in lockstep with what Nx declares as the target's
+// outputs — regardless of whether the user wrote a relative path or computed
+// an absolute one (e.g. via `path.resolve` / `__dirname`).
+function serializeConfigPath(configPath, projectRoot, workspaceRoot, outputSubfolder) {
+    if (!configPath) {
+        return configPath;
+    }
+    const fullProjectRoot = (0, path_1.resolve)(workspaceRoot, projectRoot);
+    const fullConfigPath = (0, path_1.resolve)(fullProjectRoot, configPath);
+    const relativeConfigPath = (0, devkit_1.normalizePath)((0, path_1.relative)(fullProjectRoot, fullConfigPath));
+    return (0, devkit_1.normalizePath)((0, path_1.join)(relativeConfigPath, outputSubfolder));
+}
+function getTargetConfig(cypressConfig, projectRoot, workspaceRoot, outputSubfolder, ciBaseUrl) {
     const config = {};
     if (ciBaseUrl) {
         config['baseUrl'] = ciBaseUrl;
     }
     const { screenshotsFolder, videosFolder, e2e, component } = cypressConfig;
     if (videosFolder) {
-        config['videosFolder'] = (0, path_1.join)(videosFolder, outputSubfolder);
+        config['videosFolder'] = serializeConfigPath(videosFolder, projectRoot, workspaceRoot, outputSubfolder);
     }
     if (screenshotsFolder) {
-        config['screenshotsFolder'] = (0, path_1.join)(screenshotsFolder, outputSubfolder);
+        config['screenshotsFolder'] = serializeConfigPath(screenshotsFolder, projectRoot, workspaceRoot, outputSubfolder);
     }
     if (e2e) {
         config['e2e'] = {};
         if (e2e.videosFolder) {
-            config['e2e']['videosFolder'] = (0, path_1.join)(e2e.videosFolder, outputSubfolder);
+            config['e2e']['videosFolder'] = serializeConfigPath(e2e.videosFolder, projectRoot, workspaceRoot, outputSubfolder);
         }
         if (e2e.screenshotsFolder) {
-            config['e2e']['screenshotsFolder'] = (0, path_1.join)(e2e.screenshotsFolder, outputSubfolder);
+            config['e2e']['screenshotsFolder'] = serializeConfigPath(e2e.screenshotsFolder, projectRoot, workspaceRoot, outputSubfolder);
         }
     }
     if (component) {
         config['component'] = {};
         if (component.videosFolder) {
-            config['component']['videosFolder'] = (0, path_1.join)(component.videosFolder, outputSubfolder);
+            config['component']['videosFolder'] = serializeConfigPath(component.videosFolder, projectRoot, workspaceRoot, outputSubfolder);
         }
         if (component.screenshotsFolder) {
-            config['component']['screenshotsFolder'] = (0, path_1.join)(component.screenshotsFolder, outputSubfolder);
+            config['component']['screenshotsFolder'] = serializeConfigPath(component.screenshotsFolder, projectRoot, workspaceRoot, outputSubfolder);
         }
     }
     // Stringify twice to escape the quotes.
     return JSON.stringify(JSON.stringify(config));
 }
-function getOutputs(projectRoot, cypressConfig, testingType) {
-    function getOutput(path) {
-        if (path.startsWith('..')) {
-            return (0, devkit_1.joinPathFragments)('{workspaceRoot}', projectRoot, path);
-        }
-        else {
-            return (0, devkit_1.joinPathFragments)('{projectRoot}', path);
+function getOutputs(projectRoot, cypressConfig, testingType, workspaceRoot) {
+    const fullProjectRoot = (0, path_1.resolve)(workspaceRoot, projectRoot);
+    function getOutput(outputPath) {
+        const fullPath = (0, path_1.resolve)(fullProjectRoot, outputPath);
+        const relativeToProjectRoot = (0, devkit_1.normalizePath)((0, path_1.relative)(fullProjectRoot, fullPath));
+        if (relativeToProjectRoot.startsWith('..')) {
+            return (0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, path_1.relative)(workspaceRoot, fullPath));
         }
+        return (0, devkit_1.joinPathFragments)('{projectRoot}', relativeToProjectRoot);
     }
     const { screenshotsFolder, videosFolder, e2e, component } = cypressConfig;
     const outputs = [];
@@ -164,7 +180,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
             },
             cache: true,
             inputs: getInputs(namedInputs),
-            outputs: getOutputs(projectRoot, cypressConfig, 'e2e'),
+            outputs: getOutputs(projectRoot, cypressConfig, 'e2e', context.workspaceRoot),
             metadata: {
                 technologies: ['cypress'],
                 description: 'Runs Cypress Tests',
@@ -209,7 +225,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
             const { specFiles, specPatterns, excludeSpecPatterns } = await getSpecFilesAndPatternsForTestType(cypressConfig, 'e2e', context.workspaceRoot, projectRoot);
             const ciBaseUrl = pluginPresetOptions?.ciBaseUrl;
             const dependsOn = [];
-            const outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
+            const outputs = getOutputs(projectRoot, cypressConfig, 'e2e', context.workspaceRoot);
             const inputs = getInputs(namedInputs);
             const groupName = 'E2E (CI)';
             metadata = { targetGroups: { [groupName]: [] } };
@@ -239,7 +255,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                     outputs: getTargetOutputs(outputs, outputSubfolder),
                     inputs,
                     cache: true,
-                    command: `cypress run --env webServerCommand="${ciWebServerCommand}" --spec ${relativeSpecFilePath} --config=${getTargetConfig(cypressConfig, outputSubfolder, ciBaseUrl)}`,
+                    command: `cypress run --env webServerCommand="${ciWebServerCommand}" --spec ${relativeSpecFilePath} --config=${getTargetConfig(cypressConfig, projectRoot, context.workspaceRoot, outputSubfolder, ciBaseUrl)}`,
                     options: {
                         cwd: projectRoot,
                         env: { TS_NODE_COMPILER_OPTIONS: tsNodeCompilerOptions },
@@ -299,7 +315,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
     }
     if ('component' in cypressConfig) {
         const inputs = getInputs(namedInputs);
-        const outputs = getOutputs(projectRoot, cypressConfig, 'component');
+        const outputs = getOutputs(projectRoot, cypressConfig, 'component', context.workspaceRoot);
         // This will not override the e2e target if it is the same
         targets[options.componentTestingTargetName] ??= {
             command: `cypress run --component`,
@@ -351,7 +367,7 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
                     outputs: getTargetOutputs(outputs, outputSubfolder),
                     inputs,
                     cache: true,
-                    command: `cypress run --component --spec ${relativeSpecFilePath} --config=${getTargetConfig(cypressConfig, outputSubfolder)}`,
+                    command: `cypress run --component --spec ${relativeSpecFilePath} --config=${getTargetConfig(cypressConfig, projectRoot, context.workspaceRoot, outputSubfolder)}`,
                     options: {
                         cwd: projectRoot,
                         env: { TS_NODE_COMPILER_OPTIONS: tsNodeCompilerOptions },