@nx/cypress 18.1.0-beta.0 → 18.1.0-beta.2

package/package.json

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

package/plugins/cypress-preset.js

@@ -61,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]: {

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

@@ -27,7 +27,7 @@ async function componentConfigurationGeneratorInternal(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
     tasks.push(updateDeps(tree, opts));
     addProjectFiles(tree, projectConfig, opts);
-    if (!hasPlugin) {
+    if (!hasPlugin || opts.addExplicitTargets) {
         addTargetToProject(tree, projectConfig, opts);
     }
     updateNxJsonConfiguration(tree, hasPlugin);

package/src/generators/component-configuration/schema.d.ts

@@ -5,4 +5,9 @@ export interface CypressComponentConfigurationSchema {
   bundler?: 'webpack' | 'vite';
   jsx?: boolean;
   addPlugin?: boolean;
+
+  /**
+   * @internal
+   */
+  addExplicitTargets?: boolean;
 }

package/src/generators/configuration/configuration.js

@@ -12,7 +12,10 @@ const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const base_setup_1 = require("../base-setup/base-setup");
 function configurationGenerator(tree, options) {
-    return configurationGeneratorInternal(tree, { addPlugin: false, ...options });
+    return configurationGeneratorInternal(tree, {
+        addPlugin: false,
+        ...options,
+    });
 }
 exports.configurationGenerator = configurationGenerator;
 async function configurationGeneratorInternal(tree, options) {
@@ -38,6 +41,7 @@ async function configurationGeneratorInternal(tree, options) {
     const linterTask = await (0, add_linter_1.addLinterToCyProject)(tree, {
         ...opts,
         cypressDir: opts.directory,
+        addPlugin: opts.addPlugin,
     });
     tasks.push(linterTask);
     if (!opts.skipPackageJson) {
@@ -128,11 +132,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 +170,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/add-linter.d.ts

@@ -17,5 +17,6 @@ export interface CyLinterOptions {
      * This is useful when adding linting to a brand new project vs an existing one
      **/
     overwriteExisting?: boolean;
+    addPlugin?: boolean;
 }
 export declare function addLinterToCyProject(tree: Tree, options: CyLinterOptions): Promise<() => void>;

package/src/utils/add-linter.js

@@ -23,6 +23,7 @@ async function addLinterToCyProject(tree, options) {
             setParserOptionsProject: options.setParserOptionsProject,
             skipPackageJson: options.skipPackageJson,
             rootProject: options.rootProject,
+            addPlugin: options.addPlugin,
         }));
     }
     if (!options.linter || options.linter !== eslint_1.Linter.EsLint) {