@nx/cypress 16.8.0-beta.4 → 16.8.0-beta.5

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressProjectSchematic = exports.cypressProjectGeneratorInternal = exports.cypressProjectGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const semver_1 = require("@nx/devkit/src/utils/semver");
@@ -18,7 +17,15 @@ function createFiles(tree, options) {
     // else use v9 folder
     const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
     const cypressFiles = cypressVersion && cypressVersion < 10 ? 'v9-and-under' : 'v10-and-after';
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files', cypressFiles), options.projectRoot, Object.assign(Object.assign({ tmpl: '' }, options), { project: options.project || 'Project', ext: options.js ? 'js' : 'ts', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.projectRoot), bundler: options.bundler }));
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files', cypressFiles), options.projectRoot, {
+        tmpl: '',
+        ...options,
+        project: options.project || 'Project',
+        ext: options.js ? 'js' : 'ts',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.projectRoot),
+        bundler: options.bundler,
+    });
     if (cypressVersion && cypressVersion < 7) {
         (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'cypress.json'), (json) => {
             json.pluginsFile = './src/plugins/index';
@@ -36,9 +43,9 @@ function createFiles(tree, options) {
     }
 }
 function addProject(tree, options) {
-    var _a, _b, _c, _d, _e;
     let e2eProjectConfig;
-    const detectedCypressVersion = (_a = (0, cypress_version_1.installedCypressVersion)()) !== null && _a !== void 0 ? _a : (0, semver_2.major)((0, semver_1.checkAndCleanWithSemver)('cypress', versions_1.cypressVersion));
+    const detectedCypressVersion = (0, cypress_version_1.installedCypressVersion)() ??
+        (0, semver_2.major)((0, semver_1.checkAndCleanWithSemver)('cypress', versions_1.cypressVersion));
     const cypressConfig = detectedCypressVersion < 10 ? 'cypress.json' : 'cypress.config.ts';
     if (options.baseUrl) {
         e2eProjectConfig = {
@@ -67,7 +74,7 @@ function addProject(tree, options) {
       "${options.project}:serve" as the devServerTarget. But you may need to define this target within the project, "${options.project}".
       `);
         }
-        const devServerTarget = ((_b = project.targets) === null || _b === void 0 ? void 0 : _b.serve) && ((_d = (_c = project.targets) === null || _c === void 0 ? void 0 : _c.serve) === null || _d === void 0 ? void 0 : _d.defaultConfiguration)
+        const devServerTarget = project.targets?.serve && project.targets?.serve?.defaultConfiguration
             ? `${options.project}:serve:${project.targets.serve.defaultConfiguration}`
             : `${options.project}:serve`;
         e2eProjectConfig = {
@@ -92,7 +99,7 @@ function addProject(tree, options) {
             tags: [],
             implicitDependencies: options.project ? [options.project] : undefined,
         };
-        if ((_e = project.targets) === null || _e === void 0 ? void 0 : _e['serve-static']) {
+        if (project.targets?.['serve-static']) {
             e2eProjectConfig.targets.e2e.configurations.ci = {
                 devServerTarget: `${options.project}:serve-static`,
             };
@@ -109,73 +116,79 @@ function addProject(tree, options) {
 /**
  * @deprecated use cypressE2EConfigurationGenerator instead
  **/
-function cypressProjectGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield cypressProjectGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function cypressProjectGenerator(host, schema) {
+    return await cypressProjectGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.cypressProjectGenerator = cypressProjectGenerator;
 /**
  * @deprecated use cypressE2EConfigurationGenerator instead
  **/
-function cypressProjectGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield normalizeOptions(host, schema);
-        const tasks = [];
-        const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
-        // 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(yield (0, init_1.cypressInitGenerator)(host, options));
-        }
-        if (schema.bundler === 'vite') {
-            tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-                vite: versions_1.viteVersion,
-            }));
-        }
-        createFiles(host, options);
-        addProject(host, options);
-        const installTask = yield (0, add_linter_1.addLinterToCyProject)(host, Object.assign(Object.assign({}, options), { cypressDir: 'src', linter: schema.linter, project: options.projectName, overwriteExisting: true }));
-        tasks.push(installTask);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function cypressProjectGeneratorInternal(host, schema) {
+    const options = await normalizeOptions(host, schema);
+    const tasks = [];
+    const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
+    // 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,
+        }));
+    }
+    createFiles(host, options);
+    addProject(host, options);
+    const installTask = await (0, add_linter_1.addLinterToCyProject)(host, {
+        ...options,
+        cypressDir: 'src',
+        linter: schema.linter,
+        project: options.projectName,
+        overwriteExisting: true,
     });
+    tasks.push(installTask);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.cypressProjectGeneratorInternal = cypressProjectGeneratorInternal;
-function normalizeOptions(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let maybeRootProject;
-        let isRootProject = false;
-        const projects = (0, devkit_1.getProjects)(host);
-        // nx will set the project option for generators when ran within a project.
-        // since the root project will always be set for standalone projects we can just check it here.
-        if (options.project) {
-            maybeRootProject = projects.get(options.project);
-        }
-        if ((maybeRootProject === null || maybeRootProject === void 0 ? void 0 : maybeRootProject.root) === '.' ||
-            // should still check to see if we are in a standalone based workspace
-            (!maybeRootProject &&
-                Array.from(projects.values()).some((config) => config.root === '.'))) {
-            isRootProject = true;
-        }
-        let { projectName, projectRoot } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: options.name,
-            projectType: 'application',
-            directory: isRootProject ? options.name : options.directory,
-            projectNameAndRootFormat: isRootProject
-                ? 'as-provided'
-                : options.projectNameAndRootFormat,
-            callingGenerator: '@nx/cypress:cypress-project',
-        });
-        options.linter = options.linter || linter_1.Linter.EsLint;
-        options.bundler = options.bundler || 'webpack';
-        return Object.assign(Object.assign({}, options), { 
-            // other generators depend on the rootProject flag down stream
-            rootProject: isRootProject, projectName,
-            projectRoot });
+async function normalizeOptions(host, options) {
+    let maybeRootProject;
+    let isRootProject = false;
+    const projects = (0, devkit_1.getProjects)(host);
+    // nx will set the project option for generators when ran within a project.
+    // since the root project will always be set for standalone projects we can just check it here.
+    if (options.project) {
+        maybeRootProject = projects.get(options.project);
+    }
+    if (maybeRootProject?.root === '.' ||
+        // should still check to see if we are in a standalone based workspace
+        (!maybeRootProject &&
+            Array.from(projects.values()).some((config) => config.root === '.'))) {
+        isRootProject = true;
+    }
+    let { projectName, projectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: options.name,
+        projectType: 'application',
+        directory: isRootProject ? options.name : options.directory,
+        projectNameAndRootFormat: isRootProject
+            ? 'as-provided'
+            : options.projectNameAndRootFormat,
+        callingGenerator: '@nx/cypress:cypress-project',
     });
+    options.linter = options.linter || linter_1.Linter.EsLint;
+    options.bundler = options.bundler || 'webpack';
+    return {
+        ...options,
+        // other generators depend on the rootProject flag down stream
+        rootProject: isRootProject,
+        projectName,
+        projectRoot,
+    };
 }
 exports.default = cypressProjectGenerator;
 exports.cypressProjectSchematic = (0, devkit_1.convertNxGenerator)(cypressProjectGenerator);

package/src/generators/init/init.js

@@ -1,25 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressInitSchematic = exports.cypressInitGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const js_1 = require("@nx/js");
 function setupE2ETargetDefaults(tree) {
-    var _a, _b, _c, _d;
-    var _e, _f;
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (!nxJson.namedInputs) {
         return;
     }
     // E2e targets depend on all their project's sources + production sources of dependencies
-    (_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : (nxJson.targetDefaults = {});
-    const productionFileSet = !!((_b = nxJson.namedInputs) === null || _b === void 0 ? void 0 : _b.production);
-    (_c = (_e = nxJson.targetDefaults).e2e) !== null && _c !== void 0 ? _c : (_e.e2e = {});
-    (_d = (_f = nxJson.targetDefaults.e2e).inputs) !== null && _d !== void 0 ? _d : (_f.inputs = [
+    nxJson.targetDefaults ??= {};
+    const productionFileSet = !!nxJson.namedInputs?.production;
+    nxJson.targetDefaults.e2e ??= {};
+    nxJson.targetDefaults.e2e.inputs ??= [
         'default',
         productionFileSet ? '^production' : '^default',
-    ]);
+    ];
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function updateDependencies(tree) {
@@ -30,16 +27,17 @@ function updateDependencies(tree) {
         '@types/node': versions_1.typesNodeVersion,
     });
 }
-function cypressInitGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        setupE2ETargetDefaults(tree);
-        const tasks = [];
-        tasks.push(yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true })));
-        if (!options.skipPackageJson) {
-            tasks.push(updateDependencies(tree));
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function cypressInitGenerator(tree, options) {
+    setupE2ETargetDefaults(tree);
+    const tasks = [];
+    tasks.push(await (0, js_1.initGenerator)(tree, {
+        ...options,
+        skipFormat: true,
+    }));
+    if (!options.skipPackageJson) {
+        tasks.push(updateDependencies(tree));
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.cypressInitGenerator = cypressInitGenerator;
 exports.default = cypressInitGenerator;

package/src/generators/migrate-to-cypress-11/conversion.util.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updatePluginFile = exports.addConfigToTsConfig = exports.writeNewConfig = exports.updateImports = exports.updateProjectPaths = exports.createSupportFileImport = exports.createNewCypressConfig = exports.findCypressConfigs = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
@@ -16,9 +15,8 @@ const validFilesEndingsToUpdate = [
     '.cjs',
 ];
 function findCypressConfigs(tree, projectConfig, target, config) {
-    var _a, _b, _c, _d, _e;
-    const cypressConfigPathJson = ((_c = (_b = (_a = projectConfig.targets[target]) === null || _a === void 0 ? void 0 : _a.configurations) === null || _b === void 0 ? void 0 : _b[config]) === null || _c === void 0 ? void 0 : _c.cypressConfig) ||
-        ((_e = (_d = projectConfig.targets[target]) === null || _d === void 0 ? void 0 : _d.options) === null || _e === void 0 ? void 0 : _e.cypressConfig);
+    const cypressConfigPathJson = projectConfig.targets[target]?.configurations?.[config]?.cypressConfig ||
+        projectConfig.targets[target]?.options?.cypressConfig;
     // make sure it's a json file, since it could have been updated to ts file from previous configuration migration
     if (!cypressConfigPathJson || (0, path_1.extname)(cypressConfigPathJson) !== '.json') {
         return {
@@ -28,7 +26,7 @@ function findCypressConfigs(tree, projectConfig, target, config) {
     }
     const cypressConfigPathTs = (0, devkit_1.joinPathFragments)((0, path_1.dirname)(cypressConfigPathJson), 
     // create matching ts config for custom cypress config if present
-    (cypressConfigPathJson === null || cypressConfigPathJson === void 0 ? void 0 : cypressConfigPathJson.endsWith('cypress.json'))
+    cypressConfigPathJson?.endsWith('cypress.json')
         ? 'cypress.config.ts' //default
         : `${(0, path_1.basename)(cypressConfigPathJson, (0, path_1.extname)(cypressConfigPathJson))}.config.ts`);
     return {
@@ -45,12 +43,14 @@ function createNewCypressConfig(tree, projectConfig, cypressConfigPathJson) {
     const cypressConfigJson = (0, devkit_1.readJson)(tree, cypressConfigPathJson);
     const { modifyObstructiveCode = null, // no longer needed in configs
     integrationFolder = 'src/e2e', // provide the new defaults if the value isn't present
-    supportFile = 'src/support/e2e.ts' } = cypressConfigJson, restOfConfig = tslib_1.__rest(cypressConfigJson, ["modifyObstructiveCode", "integrationFolder", "supportFile"]);
+    supportFile = 'src/support/e2e.ts', ...restOfConfig } = cypressConfigJson;
     const newIntegrationFolder = tree.exists((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'integration'))
         ? 'src/e2e'
         : integrationFolder;
     const cypressConfigTs = {
-        e2e: Object.assign(Object.assign({}, restOfConfig), { specPattern: `${newIntegrationFolder}/**/*.cy.{js,jsx,ts,tsx}`, 
+        e2e: {
+            ...restOfConfig,
+            specPattern: `${newIntegrationFolder}/**/*.cy.{js,jsx,ts,tsx}`,
             // if supportFile is defined (can be false if not using it) and in the default location (or in the new default location),
             // then use the new default location.
             // otherwise we will use the existing folder location/falsey value
@@ -58,10 +58,11 @@ function createNewCypressConfig(tree, projectConfig, cypressConfigPathJson) {
                 tree.exists((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'index.ts'))) ||
                 tree.exists((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'e2e.ts'))
                 ? 'src/support/e2e.ts'
-                : supportFile, 
+                : supportFile,
             // if the default location is used then will update to the new location otherwise keep the custom location
             // this is used down the line, but won't be in the final config file since it's a deprecated option
-            integrationFolder: newIntegrationFolder }),
+            integrationFolder: newIntegrationFolder,
+        },
     };
     return { cypressConfigTs, cypressConfigJson };
 }
@@ -169,7 +170,7 @@ function updateImports(tree, filePath, oldImportPath, newImportPath) {
     const fileContent = tree.read(filePath, 'utf-8');
     const newContent = tsquery.replace(fileContent, endOfImportSelector, (node) => {
         // if node.parent is an CallExpression require() ||ImportDeclaration
-        if ((node === null || node === void 0 ? void 0 : node.parent) &&
+        if (node?.parent &&
             (isCallExpression(node.parent) ||
                 isImportDeclaration(node.parent) ||
                 isExportDeclaration(node.parent))) {
@@ -182,7 +183,7 @@ function updateImports(tree, filePath, oldImportPath, newImportPath) {
 exports.updateImports = updateImports;
 function writeNewConfig(tree, cypressConfigPathTs, cypressConfigs) {
     // remove deprecated configs options
-    const _a = cypressConfigs.cypressConfigTs.e2e, { pluginsFile = false, integrationFolder = '' } = _a, restOfConfig = tslib_1.__rest(_a, ["pluginsFile", "integrationFolder"]);
+    const { pluginsFile = false, integrationFolder = '', ...restOfConfig } = cypressConfigs.cypressConfigTs.e2e;
     const pluginImport = pluginsFile
         ? `import setupNodeEvents from '${pluginsFile}';`
         : '';
@@ -216,18 +217,23 @@ function addConfigToTsConfig(tree, tsconfigPath, cypressConfigPath) {
 }
 exports.addConfigToTsConfig = addConfigToTsConfig;
 function updatePluginFile(tree, projectConfig, cypressConfigs) {
-    var _a, _b;
     // if ts file change module.exports = to export default
     // if js file don't do anything
     // update cypressConfigTs.e2e to remove file extension
-    const pluginsFile = (_b = (_a = cypressConfigs.cypressConfigTs) === null || _a === void 0 ? void 0 : _a.e2e) === null || _b === void 0 ? void 0 : _b.pluginsFile;
+    const pluginsFile = cypressConfigs.cypressConfigTs?.e2e?.pluginsFile;
     if (!pluginsFile) {
         return cypressConfigs;
     }
     const ext = (0, path_1.extname)(pluginsFile);
-    const updatedCypressConfigs = Object.assign(Object.assign({}, cypressConfigs), { cypressConfigTs: {
-            e2e: Object.assign(Object.assign({}, cypressConfigs.cypressConfigTs.e2e), { pluginsFile: pluginsFile.replace(ext, '') }),
-        } });
+    const updatedCypressConfigs = {
+        ...cypressConfigs,
+        cypressConfigTs: {
+            e2e: {
+                ...cypressConfigs.cypressConfigTs.e2e,
+                pluginsFile: pluginsFile.replace(ext, ''),
+            },
+        },
+    };
     const pluginFilePath = (0, devkit_1.joinPathFragments)(projectConfig.root, pluginsFile);
     if (ext === '.ts' && tree.exists(pluginFilePath)) {
         const pluginFileContent = tree.read(pluginFilePath, 'utf-8');

package/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.js

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateCypressProject = void 0;
-const tslib_1 = require("tslib");
 const cypress_version_1 = require("../../utils/cypress-version");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const conversion_util_1 = require("./conversion.util");
 function migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs) {
-    var _a, _b, _c, _d, _e, _f, _g;
     try {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
         const { cypressConfigPathJson, cypressConfigPathTs } = (0, conversion_util_1.findCypressConfigs)(tree, projectConfig, target, configuration);
@@ -29,14 +27,21 @@ function migrateCypressExecutorOptions(tree, projectName, target, configuration,
             const cypressConfigs = previousCypressConfigs.get(cypressConfigPathJson);
             (0, conversion_util_1.updateProjectPaths)(tree, projectConfig, cypressConfigs);
             (0, conversion_util_1.addConfigToTsConfig)(tree, (configuration
-                ? (_d = (_c = (_b = (_a = projectConfig.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.configurations) === null || _c === void 0 ? void 0 : _c[configuration]) === null || _d === void 0 ? void 0 : _d.tsConfig
-                : (_g = (_f = (_e = projectConfig.targets) === null || _e === void 0 ? void 0 : _e[target]) === null || _f === void 0 ? void 0 : _f.options) === null || _g === void 0 ? void 0 : _g.tsConfig) ||
+                ? projectConfig.targets?.[target]?.configurations?.[configuration]
+                    ?.tsConfig
+                : projectConfig.targets?.[target]?.options?.tsConfig) ||
                 (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), cypressConfigPathTs);
             if (configuration) {
-                projectConfig.targets[target].configurations[configuration] = Object.assign(Object.assign({}, projectConfig.targets[target].configurations[configuration]), { cypressConfig: cypressConfigPathTs });
+                projectConfig.targets[target].configurations[configuration] = {
+                    ...projectConfig.targets[target].configurations[configuration],
+                    cypressConfig: cypressConfigPathTs,
+                };
             }
             else {
-                projectConfig.targets[target].options = Object.assign(Object.assign({}, projectConfig.targets[target].options), { cypressConfig: cypressConfigPathTs });
+                projectConfig.targets[target].options = {
+                    ...projectConfig.targets[target].options,
+                    cypressConfig: cypressConfigPathTs,
+                };
             }
             projectConfig.targets[target].options.testingType = 'e2e';
             (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
@@ -51,40 +56,38 @@ https://nx.dev/cypress/v10-migration-guide
         throw e;
     }
 }
-function migrateCypressProject(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, cypress_version_1.assertMinimumCypressVersion)(8);
-        if ((0, cypress_version_1.installedCypressVersion)() >= 10) {
-            devkit_1.logger.info('NX This workspace is already using Cypress v10+');
-            return;
-        }
-        // keep history of cypress configs as some workspaces share configs
-        // if we don't have the already migrated configs
-        // it prevents us from being able to rename files for those projects
-        const previousCypressConfigs = new Map();
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/cypress:cypress', (currentValue, projectName, target, configuration) => {
-            migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs);
-        });
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (currentValue, projectName, target, configuration) => {
-            migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs);
-        });
-        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-            json.devDependencies['cypress'] = '^11.2.0';
-            return json;
-        });
-        yield (0, devkit_1.formatFiles)(tree);
-        if (tree.exists('cypress.json')) {
-            devkit_1.logger.warn((0, devkit_1.stripIndents) `A root cypress.json file was found. 
+async function migrateCypressProject(tree) {
+    (0, cypress_version_1.assertMinimumCypressVersion)(8);
+    if ((0, cypress_version_1.installedCypressVersion)() >= 10) {
+        devkit_1.logger.info('NX This workspace is already using Cypress v10+');
+        return;
+    }
+    // keep history of cypress configs as some workspaces share configs
+    // if we don't have the already migrated configs
+    // it prevents us from being able to rename files for those projects
+    const previousCypressConfigs = new Map();
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/cypress:cypress', (currentValue, projectName, target, configuration) => {
+        migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs);
+    });
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (currentValue, projectName, target, configuration) => {
+        migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs);
+    });
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        json.devDependencies['cypress'] = '^11.2.0';
+        return json;
+    });
+    await (0, devkit_1.formatFiles)(tree);
+    if (tree.exists('cypress.json')) {
+        devkit_1.logger.warn((0, devkit_1.stripIndents) `A root cypress.json file was found. 
     You should remove this file as it will cause an error when running Cypress.
     If you want to share options between Cypress projects. 
     You can create a root ts file and import it into each project's cypress config file.
     More Info: https://github.com/nrwl/nx/issues/11512#issuecomment-1213420638
     `);
-        }
-        return () => {
-            (0, devkit_1.installPackagesTask)(tree);
-        };
-    });
+    }
+    return () => {
+        (0, devkit_1.installPackagesTask)(tree);
+    };
 }
 exports.migrateCypressProject = migrateCypressProject;
 exports.default = migrateCypressProject;

package/src/migrations/update-12-8-0/remove-typescript-plugin.js

@@ -1,40 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const typescript_1 = require("typescript");
 const path_1 = require("path");
 const cypress_version_1 = require("../../utils/cypress-version");
-function removeTypescriptPlugin(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
-        if (cypressVersion < 7) {
-            console.warn(`Cypress v${cypressVersion} is installed. This migration was skipped. Please rerun this migration after updating to Cypress 7.`);
-            return;
+async function removeTypescriptPlugin(tree) {
+    const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
+    if (cypressVersion < 7) {
+        console.warn(`Cypress v${cypressVersion} is installed. This migration was skipped. Please rerun this migration after updating to Cypress 7.`);
+        return;
+    }
+    for (const [_, proj] of (0, devkit_1.getProjects)(tree)) {
+        const cypressTargets = getCypressTargets(proj);
+        if (cypressTargets.length <= 0) {
+            continue;
         }
-        for (const [_, proj] of (0, devkit_1.getProjects)(tree)) {
-            const cypressTargets = getCypressTargets(proj);
-            if (cypressTargets.length <= 0) {
-                continue;
-            }
-            for (const target of cypressTargets) {
-                const cypressConfigs = getCypressConfigs(target);
-                for (const config of cypressConfigs) {
-                    const cypressConfig = (0, devkit_1.readJson)(tree, config);
-                    if (cypressConfig.pluginsFile) {
-                        let pluginPath = (0, path_1.join)((0, path_1.dirname)(config), cypressConfig.pluginsFile);
-                        if (!tree.exists(pluginPath)) {
-                            pluginPath = ['.js', '.ts']
-                                .map((ext) => pluginPath + ext)
-                                .find((path) => tree.exists(path));
-                        }
-                        removePreprocessor(tree, pluginPath);
+        for (const target of cypressTargets) {
+            const cypressConfigs = getCypressConfigs(target);
+            for (const config of cypressConfigs) {
+                const cypressConfig = (0, devkit_1.readJson)(tree, config);
+                if (cypressConfig.pluginsFile) {
+                    let pluginPath = (0, path_1.join)((0, path_1.dirname)(config), cypressConfig.pluginsFile);
+                    if (!tree.exists(pluginPath)) {
+                        pluginPath = ['.js', '.ts']
+                            .map((ext) => pluginPath + ext)
+                            .find((path) => tree.exists(path));
                     }
+                    removePreprocessor(tree, pluginPath);
                 }
             }
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = removeTypescriptPlugin;
 function removePreprocessor(tree, pluginPath) {