@nx/cypress 17.3.0-beta.3 → 17.3.0-beta.5

package/package.json

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

package/src/generators/configuration/configuration.js

@@ -15,16 +15,14 @@ async function configurationGenerator(tree, options) {
     const opts = normalizeOptions(tree, options);
     const tasks = [];
     if (!(0, cypress_version_1.installedCypressVersion)()) {
-        tasks.push(await (0, init_1.default)(tree, opts));
+        tasks.push(await (0, js_1.initGenerator)(tree, { ...options, skipFormat: true }));
+        tasks.push(await (0, init_1.default)(tree, { ...opts, skipFormat: true }));
     }
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
         ? p === '@nx/cypress/plugin'
         : p.plugin === '@nx/cypress/plugin');
-    if (opts.bundler === 'vite') {
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { vite: versions_1.viteVersion }));
-    }
     await addFiles(tree, opts, projectGraph, hasPlugin);
     if (!hasPlugin) {
         addTarget(tree, opts);
@@ -34,12 +32,24 @@ async function configurationGenerator(tree, options) {
         cypressDir: opts.directory,
     });
     tasks.push(linterTask);
+    if (!opts.skipPackageJson) {
+        tasks.push(ensureDependencies(tree, opts));
+    }
     if (!opts.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.configurationGenerator = configurationGenerator;
+function ensureDependencies(tree, options) {
+    const devDependencies = {
+        '@types/node': versions_1.typesNodeVersion,
+    };
+    if (options.bundler === 'vite') {
+        devDependencies['vite'] = versions_1.viteVersion;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
+}
 function normalizeOptions(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (projectConfig?.targets?.e2e) {

package/src/generators/cypress-project/cypress-project.js

@@ -133,12 +133,8 @@ async function cypressProjectGeneratorInternal(host, schema) {
     // if there is an installed cypress version, then we don't call
     // init since we want to keep the existing version that is installed
     if (!cypressVersion) {
-        tasks.push(await (0, init_1.cypressInitGenerator)(host, options));
-    }
-    if (schema.bundler === 'vite') {
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            vite: versions_1.viteVersion,
-        }));
+        tasks.push(await (0, js_1.initGenerator)(host, { ...options, skipFormat: true }));
+        tasks.push(await (0, init_1.cypressInitGenerator)(host, { ...options, skipFormat: true }));
     }
     createFiles(host, options);
     addProject(host, options);
@@ -150,12 +146,24 @@ async function cypressProjectGeneratorInternal(host, schema) {
         overwriteExisting: true,
     });
     tasks.push(installTask);
+    if (!options.skipPackageJson) {
+        tasks.push(ensureDependencies(host, options));
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.cypressProjectGeneratorInternal = cypressProjectGeneratorInternal;
+function ensureDependencies(tree, options) {
+    const devDependencies = {
+        '@types/node': versions_1.typesNodeVersion,
+    };
+    if (options.bundler === 'vite') {
+        devDependencies['vite'] = versions_1.viteVersion;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
+}
 async function normalizeOptions(host, options) {
     let maybeRootProject;
     let isRootProject = false;

package/src/generators/init/init.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
-const js_1 = require("@nx/js");
 function setupE2ETargetDefaults(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (!nxJson.namedInputs) {
@@ -21,12 +20,13 @@ function setupE2ETargetDefaults(tree) {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function updateDependencies(tree) {
-    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/cypress'], []);
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+    const tasks = [];
+    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/cypress'], []));
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         ['@nx/cypress']: versions_1.nxVersion,
         cypress: versions_1.cypressVersion,
-        '@types/node': versions_1.typesNodeVersion,
-    });
+    }));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function addPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -61,23 +61,21 @@ function updateProductionFileset(tree) {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 async function cypressInitGenerator(tree, options) {
-    const addPlugins = process.env.NX_PCV3 === 'true';
     updateProductionFileset(tree);
-    if (!addPlugins) {
-        setupE2ETargetDefaults(tree);
-    }
-    const tasks = [];
-    tasks.push(await (0, js_1.initGenerator)(tree, {
-        ...options,
-        skipFormat: true,
-    }));
-    if (addPlugins) {
+    if (process.env.NX_PCV3 === 'true') {
         addPlugin(tree);
     }
+    else {
+        setupE2ETargetDefaults(tree);
+    }
+    let installTask = () => { };
     if (!options.skipPackageJson) {
-        tasks.push(updateDependencies(tree));
+        installTask = updateDependencies(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return installTask;
 }
 exports.cypressInitGenerator = cypressInitGenerator;
 exports.default = cypressInitGenerator;

package/src/generators/init/schema.d.ts

@@ -1,7 +1,4 @@
 export interface Schema {
-  skipPackageJson?: boolean;
-
   skipFormat?: boolean;
-
-  addPlugins?: boolean;
+  skipPackageJson?: boolean;
 }

package/src/generators/init/schema.json

@@ -6,6 +6,12 @@
   "description": "Add Cypress Configuration to the workspace.",
   "type": "object",
   "properties": {
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,