@nx/cypress 23.0.0-beta.8 → 23.0.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "23.0.0-beta.8",
+  "version": "23.0.0-beta.9",
   "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,9 +37,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.8",
-    "@nx/eslint": "23.0.0-beta.8",
-    "@nx/js": "23.0.0-beta.8",
+    "@nx/devkit": "23.0.0-beta.9",
+    "@nx/eslint": "23.0.0-beta.9",
+    "@nx/js": "23.0.0-beta.9",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "detect-port": "^2.1.0",
     "semver": "^7.6.3",
@@ -47,7 +47,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.8"
+    "nx": "23.0.0-beta.9"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"

package/src/generators/component-configuration/component-configuration.js

@@ -48,7 +48,7 @@ async function componentConfigurationGeneratorInternal(tree, options) {
     }
     addProjectFiles(tree, projectConfig, opts);
     if (!hasPlugin || opts.addExplicitTargets) {
-        (0, deprecation_1.warnCypressExecutorScaffolding)();
+        (0, deprecation_1.warnCypressExecutorGenerating)();
         addTargetToProject(tree, projectConfig, opts);
     }
     updateNxJsonConfiguration(tree, hasPlugin);

package/src/generators/configuration/configuration.js

@@ -42,7 +42,7 @@ async function configurationGeneratorInternal(tree, options) {
         : p.plugin === '@nx/cypress/plugin');
     await addFiles(tree, opts, projectGraph, hasPlugin);
     if (!hasPlugin) {
-        (0, deprecation_1.warnCypressExecutorScaffolding)();
+        (0, deprecation_1.warnCypressExecutorGenerating)();
         addTarget(tree, opts, projectGraph);
     }
     const projectTsConfigPath = (0, devkit_1.joinPathFragments)(opts.projectRoot, 'tsconfig.json');

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 },

package/src/utils/deprecation.d.ts

@@ -1,4 +1,4 @@
 export declare const CYPRESS_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/cypress:cypress` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/cypress:convert-to-inferred` to migrate to the `@nx/cypress/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
 export declare function warnCypressExecutorDeprecation(): void;
-export declare function warnCypressExecutorScaffolding(): void;
+export declare function warnCypressExecutorGenerating(): void;
 //# sourceMappingURL=deprecation.d.ts.map

package/src/utils/deprecation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/deprecation.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oCAAoC,uQACqN,CAAC;AAEvQ,wBAAgB,8BAA8B,IAAI,IAAI,CAErD;AAOD,wBAAgB,8BAA8B,IAAI,IAAI,CAIrD"}
+{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/deprecation.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oCAAoC,uQACqN,CAAC;AAEvQ,wBAAgB,8BAA8B,IAAI,IAAI,CAErD;AAOD,wBAAgB,6BAA6B,IAAI,IAAI,CAIpD"}

package/src/utils/deprecation.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CYPRESS_EXECUTOR_DEPRECATION_MESSAGE = void 0;
 exports.warnCypressExecutorDeprecation = warnCypressExecutorDeprecation;
-exports.warnCypressExecutorScaffolding = warnCypressExecutorScaffolding;
+exports.warnCypressExecutorGenerating = warnCypressExecutorGenerating;
 const devkit_1 = require("@nx/devkit");
 // TODO(v24): Remove the @nx/cypress:cypress executor. The inferred plugin
 // (@nx/cypress/plugin) and the convert-to-inferred generator stay supported.
@@ -11,10 +11,10 @@ function warnCypressExecutorDeprecation() {
     devkit_1.logger.warn(exports.CYPRESS_EXECUTOR_DEPRECATION_MESSAGE);
 }
 // Fired when the @nx/cypress:configuration or :component-configuration
-// generator is about to scaffold a target that uses the deprecated executor —
+// generator is about to generate a target that uses the deprecated executor —
 // i.e. when @nx/cypress/plugin isn't registered in nx.json. Surfaces the
-// deprecation at scaffold time rather than only when the user later runs the
+// deprecation at generation time rather than only when the user later runs the
 // generated target.
-function warnCypressExecutorScaffolding() {
-    devkit_1.logger.warn('Scaffolding a target that uses the deprecated `@nx/cypress:cypress` executor. The executor will be removed in Nx v24. Run `nx g @nx/cypress:convert-to-inferred` after this scaffold to migrate the generated target to the `@nx/cypress/plugin` inferred plugin. To skip emitting executor targets entirely on future scaffolds, register `@nx/cypress/plugin` in `nx.json` first (`nx add @nx/cypress` or a manual plugin entry). See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
+function warnCypressExecutorGenerating() {
+    devkit_1.logger.warn('Generating a target that uses the deprecated `@nx/cypress:cypress` executor. The executor will be removed in Nx v24. Run `nx g @nx/cypress:convert-to-inferred` next to migrate this target to the `@nx/cypress/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
 }

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 import { type Tree } from '@nx/devkit';
 export declare const nxVersion: any;
 export declare const eslintPluginCypressVersion = "^3.5.0";
-export declare const typesNodeVersion = "20.19.9";
+export declare const typesNodeVersion = "^22.0.0";
 export declare const cypressViteDevServerVersion = "^7.0.1";
 export declare const cypressVersion = "^15.8.0";
 export declare const cypressWebpackVersion = "^5.4.1";

package/src/utils/versions.js

@@ -9,7 +9,7 @@ const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 exports.nxVersion = require('../../package.json').version;
 exports.eslintPluginCypressVersion = '^3.5.0';
-exports.typesNodeVersion = '20.19.9';
+exports.typesNodeVersion = '^22.0.0';
 exports.cypressViteDevServerVersion = '^7.0.1';
 exports.cypressVersion = '^15.8.0';
 exports.cypressWebpackVersion = '^5.4.1';
@@ -27,7 +27,7 @@ const latestVersions = {
 const versionMap = {
     13: {
         eslintPluginCypressVersion: '^3.5.0',
-        typesNodeVersion: '20.19.9',
+        typesNodeVersion: '^22.0.0',
         cypressViteDevServerVersion: '^2.2.1',
         cypressVersion: '^13.13.0',
         cypressWebpackVersion: '^3.8.0',
@@ -36,7 +36,7 @@ const versionMap = {
     },
     14: {
         eslintPluginCypressVersion: '^3.5.0',
-        typesNodeVersion: '20.19.9',
+        typesNodeVersion: '^22.0.0',
         cypressViteDevServerVersion: '^6.0.3',
         cypressVersion: '^14.2.1',
         cypressWebpackVersion: '^4.0.2',