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

package/src/migrations/update-14-6-1/update-cypress-configs-presets.js

@@ -1,45 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateCypressConfigsPresets = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const cypress_version_1 = require("../../utils/cypress-version");
 const find_target_options_1 = require("../../utils/find-target-options");
-function updateCypressConfigsPresets(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if ((0, cypress_version_1.installedCypressVersion)() < 10) {
-            return;
+async function updateCypressConfigsPresets(tree) {
+    if ((0, cypress_version_1.installedCypressVersion)() < 10) {
+        return;
+    }
+    const projectsWithoutDevServerTarget = new Set();
+    const updateTasks = [];
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (options, projectName, targetName, configName) => {
+        if (options.cypressConfig && tree.exists(options.cypressConfig)) {
+            updatePreset(tree, options, targetName);
         }
-        const projectsWithoutDevServerTarget = new Set();
-        const updateTasks = [];
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (options, projectName, targetName, configName) => {
-            var _a, _b, _c, _d;
-            if (options.cypressConfig && tree.exists(options.cypressConfig)) {
-                updatePreset(tree, options, targetName);
-            }
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            const testingType = options.testingType ||
-                ((_b = (_a = projectConfig.targets[targetName]) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.testingType);
-            const devServerTarget = options.devServerTarget ||
-                ((_d = (_c = projectConfig.targets[targetName]) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.devServerTarget);
-            if (!devServerTarget && testingType === 'component') {
-                updateTasks.push(addBuildTargetToConfig(tree, projectName, targetName, configName).then((didUpdate) => {
-                    if (!didUpdate) {
-                        projectsWithoutDevServerTarget.add(projectName);
-                    }
-                }));
-            }
-        });
-        if (updateTasks.length > 0) {
-            cacheComponentTestTarget(tree);
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        const testingType = options.testingType ||
+            projectConfig.targets[targetName]?.options?.testingType;
+        const devServerTarget = options.devServerTarget ||
+            projectConfig.targets[targetName]?.options?.devServerTarget;
+        if (!devServerTarget && testingType === 'component') {
+            updateTasks.push(addBuildTargetToConfig(tree, projectName, targetName, configName).then((didUpdate) => {
+                if (!didUpdate) {
+                    projectsWithoutDevServerTarget.add(projectName);
+                }
+            }));
         }
-        yield Promise.all(updateTasks);
-        if (projectsWithoutDevServerTarget.size > 0) {
-            devkit_1.logger.warn(`Unable to find a build target to add to the component testing target in the following projects:`);
-            devkit_1.logger.warn(`- ${Array.from(projectsWithoutDevServerTarget).join('\n- ')}`);
-            devkit_1.logger.warn((0, devkit_1.stripIndents) `
+    });
+    if (updateTasks.length > 0) {
+        cacheComponentTestTarget(tree);
+    }
+    await Promise.all(updateTasks);
+    if (projectsWithoutDevServerTarget.size > 0) {
+        devkit_1.logger.warn(`Unable to find a build target to add to the component testing target in the following projects:`);
+        devkit_1.logger.warn(`- ${Array.from(projectsWithoutDevServerTarget).join('\n- ')}`);
+        devkit_1.logger.warn((0, devkit_1.stripIndents) `
 You can manually add the 'devServerTarget' option to the 
 component testing target to specify the build target to use.
 The build configuration should be using @nrwl/web:webpack as the executor. 
@@ -47,8 +44,7 @@ Usually this is a React app in your workspace.
 Component testing will fallback to a default configuration if one isn't provided, 
 but might require modifications if your projects are more complex.
     `);
-        }
-    });
+    }
 }
 exports.updateCypressConfigsPresets = updateCypressConfigsPresets;
 function updatePreset(tree, options, targetName) {
@@ -70,42 +66,57 @@ function updatePreset(tree, options, targetName) {
     });
     tree.write(options.cypressConfig, contents);
 }
-function addBuildTargetToConfig(tree, projectName, targetName, configName) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectWithBuild = yield (0, find_target_options_1.findBuildConfig)(tree, {
-            project: projectName,
-            validExecutorNames: new Set(['@nrwl/web:webpack']),
-            skipGetOptions: true,
-        });
-        // didn't find the config so can't update. consumer should collect list of them and display a warning at the end
-        // no reason to fail since the preset will fallback to a default config so should still keep working.
-        if (!(projectWithBuild === null || projectWithBuild === void 0 ? void 0 : projectWithBuild.target)) {
-            return false;
-        }
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        // if using a custom config and the devServerTarget default args
-        // has a different target, then add it to the custom target config
-        // otherwise add it to the default options
-        if (configName &&
-            projectWithBuild.target !==
-                ((_b = (_a = projectConfig.targets[targetName]) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.devServerTarget)) {
-            projectConfig.targets[targetName].configurations[configName] = Object.assign(Object.assign({}, projectConfig.targets[targetName].configurations[configName]), { devServerTarget: projectWithBuild.target, skipServe: true });
-        }
-        else {
-            projectConfig.targets[targetName].options = Object.assign(Object.assign({}, projectConfig.targets[targetName].options), { devServerTarget: projectWithBuild.target, skipServe: true });
-        }
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        return true;
+async function addBuildTargetToConfig(tree, projectName, targetName, configName) {
+    const projectWithBuild = await (0, find_target_options_1.findBuildConfig)(tree, {
+        project: projectName,
+        validExecutorNames: new Set(['@nrwl/web:webpack']),
+        skipGetOptions: true,
     });
+    // didn't find the config so can't update. consumer should collect list of them and display a warning at the end
+    // no reason to fail since the preset will fallback to a default config so should still keep working.
+    if (!projectWithBuild?.target) {
+        return false;
+    }
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    // if using a custom config and the devServerTarget default args
+    // has a different target, then add it to the custom target config
+    // otherwise add it to the default options
+    if (configName &&
+        projectWithBuild.target !==
+            projectConfig.targets[targetName]?.options?.devServerTarget) {
+        projectConfig.targets[targetName].configurations[configName] = {
+            ...projectConfig.targets[targetName].configurations[configName],
+            devServerTarget: projectWithBuild.target,
+            skipServe: true,
+        };
+    }
+    else {
+        projectConfig.targets[targetName].options = {
+            ...projectConfig.targets[targetName].options,
+            devServerTarget: projectWithBuild.target,
+            skipServe: true,
+        };
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+    return true;
 }
 function cacheComponentTestTarget(tree) {
-    (0, devkit_1.updateJson)(tree, 'nx.json', (json) => {
-        var _a, _b, _c, _d, _e, _f, _g;
-        return (Object.assign(Object.assign({}, json), { tasksRunnerOptions: Object.assign(Object.assign({}, json.tasksRunnerOptions), { default: Object.assign(Object.assign({}, (_a = json.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a.default), { options: Object.assign(Object.assign({}, (_c = (_b = json.tasksRunnerOptions) === null || _b === void 0 ? void 0 : _b.default) === null || _c === void 0 ? void 0 : _c.options), { cacheableOperations: Array.from(new Set([
-                            ...((_g = (_f = (_e = (_d = json.tasksRunnerOptions) === null || _d === void 0 ? void 0 : _d.default) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.cacheableOperations) !== null && _g !== void 0 ? _g : []),
-                            'component-test',
-                        ])) }) }) }) }));
-    });
+    (0, devkit_1.updateJson)(tree, 'nx.json', (json) => ({
+        ...json,
+        tasksRunnerOptions: {
+            ...json.tasksRunnerOptions,
+            default: {
+                ...json.tasksRunnerOptions?.default,
+                options: {
+                    ...json.tasksRunnerOptions?.default?.options,
+                    cacheableOperations: Array.from(new Set([
+                        ...(json.tasksRunnerOptions?.default?.options
+                            ?.cacheableOperations ?? []),
+                        'component-test',
+                    ])),
+                },
+            },
+        },
+    }));
 }
 exports.default = updateCypressConfigsPresets;

package/src/migrations/update-14-7-0/update-cypress-version-if-10.js

@@ -6,8 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const semver_2 = require("semver");
 function updateCypressVersionIf10(tree) {
-    var _a;
-    const installedVersion = (_a = (0, devkit_1.readJson)(tree, 'package.json').devDependencies) === null || _a === void 0 ? void 0 : _a['cypress'];
+    const installedVersion = (0, devkit_1.readJson)(tree, 'package.json').devDependencies?.['cypress'];
     if (!installedVersion) {
         return;
     }

package/src/migrations/update-15-0-0/add-cypress-inputs.js

@@ -1,37 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function default_1(tree) {
-    var _a, _b, _c, _d;
-    var _e;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        const { cypressTargets, hasComponentTesting } = getCypressTargetNames(tree);
-        const hasProductionFileset = !!((_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.production);
-        if (hasComponentTesting && hasProductionFileset && cypressTargets.size > 0) {
-            const productionFileset = new Set(nxJson.namedInputs.production);
-            for (const exclusion of [
-                '!{projectRoot}/cypress/**/*',
-                '!{projectRoot}/**/*.cy.[jt]s?(x)',
-                '!{projectRoot}/cypress.config.[jt]s',
-            ]) {
-                productionFileset.add(exclusion);
-            }
-            nxJson.namedInputs.production = Array.from(productionFileset);
+async function default_1(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const { cypressTargets, hasComponentTesting } = getCypressTargetNames(tree);
+    const hasProductionFileset = !!nxJson.namedInputs?.production;
+    if (hasComponentTesting && hasProductionFileset && cypressTargets.size > 0) {
+        const productionFileset = new Set(nxJson.namedInputs.production);
+        for (const exclusion of [
+            '!{projectRoot}/cypress/**/*',
+            '!{projectRoot}/**/*.cy.[jt]s?(x)',
+            '!{projectRoot}/cypress.config.[jt]s',
+        ]) {
+            productionFileset.add(exclusion);
         }
-        for (const targetName of cypressTargets) {
-            (_b = nxJson.targetDefaults) !== null && _b !== void 0 ? _b : (nxJson.targetDefaults = {});
-            const cypressTargetDefaults = ((_c = (_e = nxJson.targetDefaults)[targetName]) !== null && _c !== void 0 ? _c : (_e[targetName] = {}));
-            (_d = cypressTargetDefaults.inputs) !== null && _d !== void 0 ? _d : (cypressTargetDefaults.inputs = [
-                'default',
-                hasProductionFileset ? '^production' : '^default',
-            ]);
-        }
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+        nxJson.namedInputs.production = Array.from(productionFileset);
+    }
+    for (const targetName of cypressTargets) {
+        nxJson.targetDefaults ??= {};
+        const cypressTargetDefaults = (nxJson.targetDefaults[targetName] ??= {});
+        cypressTargetDefaults.inputs ??= [
+            'default',
+            hasProductionFileset ? '^production' : '^default',
+        ];
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;
 function getCypressTargetNames(tree) {

package/src/migrations/update-15-0-0/update-cy-mount-usage.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateCyFile = exports.addMountCommand = exports.updateCyMountUsage = void 0;
-const tslib_1 = require("tslib");
 const ct_helpers_1 = require("../../utils/ct-helpers");
 const cypress_version_1 = require("../../utils/cypress-version");
 const devkit_1 = require("@nx/devkit");
@@ -9,35 +8,33 @@ const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-opt
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const semver_2 = require("semver");
-function updateCyMountUsage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if ((0, cypress_version_1.installedCypressVersion)() < 10) {
+async function updateCyMountUsage(tree) {
+    if ((0, cypress_version_1.installedCypressVersion)() < 10) {
+        return;
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (options, projectName) => {
+        if (options.testingType !== 'component' || !options.devServerTarget) {
             return;
         }
-        const projects = (0, devkit_1.getProjects)(tree);
-        const graph = yield (0, devkit_1.createProjectGraphAsync)();
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (options, projectName) => {
-            if (options.testingType !== 'component' || !options.devServerTarget) {
-                return;
-            }
-            const parsed = (0, devkit_1.parseTargetString)(options.devServerTarget, graph);
-            if (!(parsed === null || parsed === void 0 ? void 0 : parsed.project) || !(parsed === null || parsed === void 0 ? void 0 : parsed.target)) {
-                return;
+        const parsed = (0, devkit_1.parseTargetString)(options.devServerTarget, graph);
+        if (!parsed?.project || !parsed?.target) {
+            return;
+        }
+        const buildProjectConfig = projects.get(parsed.project);
+        const framework = getFramework(tree, parsed.configuration
+            ? buildProjectConfig.targets[parsed.target].configurations[parsed.configuration]
+            : buildProjectConfig.targets[parsed.target]);
+        const ctProjectConfig = projects.get(projectName);
+        addMountCommand(tree, ctProjectConfig.root, framework);
+        (0, devkit_1.visitNotIgnoredFiles)(tree, ctProjectConfig.sourceRoot, (filePath) => {
+            if (ct_helpers_1.CY_FILE_MATCHER.test(filePath)) {
+                updateCyFile(tree, filePath, framework);
             }
-            const buildProjectConfig = projects.get(parsed.project);
-            const framework = getFramework(tree, parsed.configuration
-                ? buildProjectConfig.targets[parsed.target].configurations[parsed.configuration]
-                : buildProjectConfig.targets[parsed.target]);
-            const ctProjectConfig = projects.get(projectName);
-            addMountCommand(tree, ctProjectConfig.root, framework);
-            (0, devkit_1.visitNotIgnoredFiles)(tree, ctProjectConfig.sourceRoot, (filePath) => {
-                if (ct_helpers_1.CY_FILE_MATCHER.test(filePath)) {
-                    updateCyFile(tree, filePath, framework);
-                }
-            });
         });
-        yield (0, devkit_1.formatFiles)(tree);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.updateCyMountUsage = updateCyMountUsage;
 function addMountCommand(tree, projectRoot, framework) {
@@ -47,7 +44,7 @@ function addMountCommand(tree, projectRoot, framework) {
     }
     const commandFile = tree.read(commandFilePath, 'utf-8');
     const mountCommand = tsquery_1.tsquery.query(commandFile, 'CallExpression:has(StringLiteral[value="mount"]) PropertyAccessExpression:has(Identifier[name="add"])');
-    if ((mountCommand === null || mountCommand === void 0 ? void 0 : mountCommand.length) > 0) {
+    if (mountCommand?.length > 0) {
         return;
     }
     const existingCommands = tsquery_1.tsquery.query(commandFile, 'InterfaceDeclaration:has(Identifier[name="Chainable"]) > MethodSignature, InterfaceDeclaration:has(Identifier[name="Chainable"]) > PropertySignature');
@@ -74,7 +71,7 @@ function addMountCommand(tree, projectRoot, framework) {
          * or if the node is the global declaration, then add it,
          * but not to the cypress module declaration inside the global declaration
          */
-        if ((isGlobalDeclaration === null || isGlobalDeclaration === void 0 ? void 0 : isGlobalDeclaration.length) === 0 ||
+        if (isGlobalDeclaration?.length === 0 ||
             node.name.getText() === 'global') {
             return newModuleDelcaration;
         }
@@ -84,13 +81,12 @@ function addMountCommand(tree, projectRoot, framework) {
 }
 exports.addMountCommand = addMountCommand;
 function getFramework(tree, target) {
-    var _a;
     if (target.executor === '@nrwl/angular:webpack-browser' ||
         target.executor === '@angular-devkit/build-angular:browser') {
         return 'angular';
     }
     const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
-    const reactDomVersion = (_a = pkgJson === null || pkgJson === void 0 ? void 0 : pkgJson.dependencies) === null || _a === void 0 ? void 0 : _a['react-dom'];
+    const reactDomVersion = pkgJson?.dependencies?.['react-dom'];
     const hasReact18 = reactDomVersion &&
         (0, semver_2.gte)((0, semver_1.checkAndCleanWithSemver)('react-dom', reactDomVersion), '18.0.0');
     if (hasReact18) {

package/src/migrations/update-15-1-0/cypress-11.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProviderUsage = exports.updateUnmountUsage = exports.updateMountHookUsage = exports.updateToCypress11 = void 0;
-const tslib_1 = require("tslib");
 const ct_helpers_1 = require("../../utils/ct-helpers");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
@@ -10,43 +9,41 @@ const path_1 = require("path");
 const ts = require("typescript");
 const cypress_version_1 = require("../../utils/cypress-version");
 const versions_1 = require("../../utils/versions");
-function updateToCypress11(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const installedVersion = (0, cypress_version_1.installedCypressVersion)();
-        if (installedVersion < 10) {
+async function updateToCypress11(tree) {
+    const installedVersion = (0, cypress_version_1.installedCypressVersion)();
+    if (installedVersion < 10) {
+        return;
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (options, projectName, targetName, configurationName) => {
+        if (options.testingType !== 'component' ||
+            !(options.cypressConfig && tree.exists(options.cypressConfig))) {
             return;
         }
-        const projects = (0, devkit_1.getProjects)(tree);
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (options, projectName, targetName, configurationName) => {
-            if (options.testingType !== 'component' ||
-                !(options.cypressConfig && tree.exists(options.cypressConfig))) {
+        const projectConfig = projects.get(projectName);
+        const commandsFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'commands.ts');
+        const framework = getFramework(tree.exists(commandsFile)
+            ? tree.read(commandsFile, 'utf-8')
+            : tree.read(options.cypressConfig, 'utf-8'));
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
+            if (!ct_helpers_1.CY_FILE_MATCHER.test(filePath)) {
                 return;
             }
-            const projectConfig = projects.get(projectName);
-            const commandsFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'commands.ts');
-            const framework = getFramework(tree.exists(commandsFile)
-                ? tree.read(commandsFile, 'utf-8')
-                : tree.read(options.cypressConfig, 'utf-8'));
-            (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
-                if (!ct_helpers_1.CY_FILE_MATCHER.test(filePath)) {
-                    return;
-                }
-                const frameworkFromFile = getFramework(tree.read(filePath, 'utf-8'));
-                if (framework === 'react' || frameworkFromFile === 'react') {
-                    updateUnmountUsage(tree, filePath);
-                    updateMountHookUsage(tree, filePath);
-                }
-                if (framework === 'angular' || frameworkFromFile === 'angular') {
-                    updateProviderUsage(tree, filePath);
-                }
-            });
+            const frameworkFromFile = getFramework(tree.read(filePath, 'utf-8'));
+            if (framework === 'react' || frameworkFromFile === 'react') {
+                updateUnmountUsage(tree, filePath);
+                updateMountHookUsage(tree, filePath);
+            }
+            if (framework === 'angular' || frameworkFromFile === 'angular') {
+                updateProviderUsage(tree, filePath);
+            }
         });
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { cypress: versions_1.cypressVersion });
-        yield (0, devkit_1.formatFiles)(tree);
-        return () => {
-            installTask();
-        };
     });
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { cypress: versions_1.cypressVersion });
+    await (0, devkit_1.formatFiles)(tree);
+    return () => {
+        installTask();
+    };
 }
 exports.updateToCypress11 = updateToCypress11;
 function updateMountHookUsage(tree, filePath) {
@@ -78,16 +75,16 @@ ${reactDomImport}`;
 }
 exports.updateUnmountUsage = updateUnmountUsage;
 function updateProviderUsage(tree, filePath) {
-    var _a;
     const originalContents = tree.read(filePath, 'utf-8');
-    const isTestBedImported = ((_a = tsquery_1.tsquery.query(originalContents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="TestBed"]):has(StringLiteral[value="@angular/core/testing"])')) === null || _a === void 0 ? void 0 : _a.length) > 0;
+    const isTestBedImported = tsquery_1.tsquery.query(originalContents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="TestBed"]):has(StringLiteral[value="@angular/core/testing"])')?.length > 0;
     let updatedProviders = tsquery_1.tsquery.replace(originalContents, 'CallExpression:has(PropertyAccessExpression:has(Identifier[name="mount"]))', (node) => {
-        var _a, _b, _c, _d;
         const expressionName = node.expression.getText();
-        if (expressionName === 'cy.mount' && ((_a = node === null || node === void 0 ? void 0 : node.arguments) === null || _a === void 0 ? void 0 : _a.length) > 1) {
+        if (expressionName === 'cy.mount' && node?.arguments?.length > 1) {
             const component = node.arguments[0].getText();
             if (ts.isObjectLiteralExpression(node.arguments[1])) {
-                const providers = (_d = (_c = (_b = node.arguments[1]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c.find((p) => { var _a; return ((_a = p.name) === null || _a === void 0 ? void 0 : _a.getText()) === 'providers'; })) === null || _d === void 0 ? void 0 : _d.getText();
+                const providers = node.arguments[1]?.properties
+                    ?.find((p) => p.name?.getText() === 'providers')
+                    ?.getText();
                 const noProviders = tsquery_1.tsquery.replace(node.getText(), 'PropertyAssignment:has(Identifier[name="providers"])', (n) => {
                     // set it to undefined so we don't run into a hanging comma causing invalid syntax
                     return 'providers: undefined';

package/src/migrations/update-15-5-0/update-to-cypress-12.js

@@ -125,16 +125,15 @@ exports.shouldUseCySession = shouldUseCySession;
 function shouldNotUseCyInShouldCB(tree, filePath) {
     const content = tree.read(filePath, 'utf-8');
     const markedNestedCyCommands = tsquery_1.tsquery.replace(content, 'CallExpression > PropertyAccessExpression:has(Identifier[name="cy"]):has(Identifier[name="should"])', (node) => {
-        var _a, _b;
         if ((0, helpers_1.isAlreadyCommented)(node) ||
             (node.parent && !(0, typescript_1.isCallExpression)(node.parent))) {
             return;
         }
         const parentExpression = node.parent;
-        if (((_a = parentExpression === null || parentExpression === void 0 ? void 0 : parentExpression.arguments) === null || _a === void 0 ? void 0 : _a[0]) &&
+        if (parentExpression?.arguments?.[0] &&
             ((0, typescript_1.isArrowFunction)(parentExpression.arguments[0]) ||
                 (0, typescript_1.isFunctionExpression)(parentExpression.arguments[0]))) {
-            const isUsingNestedCyCommand = ((_b = tsquery_1.tsquery.query(parentExpression.arguments[0], 'CallExpression > PropertyAccessExpression:has(Identifier[name="cy"])')) === null || _b === void 0 ? void 0 : _b.length) > 0;
+            const isUsingNestedCyCommand = tsquery_1.tsquery.query(parentExpression.arguments[0], 'CallExpression > PropertyAccessExpression:has(Identifier[name="cy"])')?.length > 0;
             if (isUsingNestedCyCommand) {
                 return `/**
 * TODO(@nrwl/cypress): Nesting Cypress commands in a should assertion now throws.
@@ -155,7 +154,6 @@ exports.shouldNotUseCyInShouldCB = shouldNotUseCyInShouldCB;
 function shouldNotOverrideCommands(tree, filePath) {
     const content = tree.read(filePath, 'utf-8');
     const markedOverrideUsage = tsquery_1.tsquery.replace(content, 'PropertyAccessExpression:has(Identifier[name="overwrite"]):has(Identifier[name="Cypress"])', (node) => {
-        var _a, _b;
         if ((0, helpers_1.isAlreadyCommented)(node)) {
             return;
         }
@@ -164,7 +162,7 @@ function shouldNotOverrideCommands(tree, filePath) {
         if (expression === 'Cypress.Commands') {
             // get value.
             const overwriteExpression = node.parent;
-            const command = (_b = (_a = overwriteExpression.arguments) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.text; // need string without quotes
+            const command = overwriteExpression.arguments?.[0]?.text; // need string without quotes
             if (helpers_1.BANNED_COMMANDS.includes(command)) {
                 // overwrite
                 return `/**

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/cypress', '@nx/cypress');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/cypress', '@nx/cypress');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/migrations/update-16-2-0/update-cy-tsconfig.js

@@ -1,35 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCyTsConfigNames = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function normalizeCyTsConfigNames(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/cypress:cypress', (_, projectName) => {
-            const projectConfig = projects.get(projectName);
-            const newTsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'tsconfig.json');
-            // if there is already a tsconfig.json in the cypress folder, then assume things are setup already
-            if (!tree.exists(newTsConfigPath)) {
-                moveProjectTsCyConfig(tree, projectConfig, newTsConfigPath);
-                moveCyDirTsCyConfig(tree, projectConfig, newTsConfigPath);
-                updateCyDirTsConfigReferences(tree, projectConfig);
-            }
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function normalizeCyTsConfigNames(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/cypress:cypress', (_, projectName) => {
+        const projectConfig = projects.get(projectName);
+        const newTsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'tsconfig.json');
+        // if there is already a tsconfig.json in the cypress folder, then assume things are setup already
+        if (!tree.exists(newTsConfigPath)) {
+            moveProjectTsCyConfig(tree, projectConfig, newTsConfigPath);
+            moveCyDirTsCyConfig(tree, projectConfig, newTsConfigPath);
+            updateCyDirTsConfigReferences(tree, projectConfig);
+        }
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.normalizeCyTsConfigNames = normalizeCyTsConfigNames;
 function moveProjectTsCyConfig(tree, projectConfig, newTsConfigPath) {
     if (tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.cy.json'))) {
         tree.rename((0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.cy.json'), newTsConfigPath);
         (0, devkit_1.updateJson)(tree, newTsConfigPath, (json) => {
-            var _a, _b;
             json.extends = '../tsconfig.json';
-            (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : (json.compilerOptions = {});
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { sourceMap: false, outDir: '../../../dist/out-tsc' });
-            (_b = json.include) !== null && _b !== void 0 ? _b : (json.include = []);
+            json.compilerOptions ??= {};
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                sourceMap: false,
+                outDir: '../../../dist/out-tsc',
+            };
+            json.include ??= [];
             json.include = json.include.map((p) => {
                 if (p.startsWith('cypress/')) {
                     return p.replace('cypress/', '');
@@ -44,9 +44,11 @@ function moveCyDirTsCyConfig(tree, projectConfig, newTsConfigPath) {
     if (tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'tsconfig.cy.json'))) {
         tree.rename((0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'tsconfig.cy.json'), newTsConfigPath);
         (0, devkit_1.updateJson)(tree, newTsConfigPath, (json) => {
-            var _a;
-            (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : (json.compilerOptions = {});
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { sourceMap: false });
+            json.compilerOptions ??= {};
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                sourceMap: false,
+            };
             return json;
         });
     }
@@ -56,8 +58,7 @@ function updateCyDirTsConfigReferences(tree, projectConfig) {
         return;
     }
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), (json) => {
-        var _a;
-        (_a = json.references) !== null && _a !== void 0 ? _a : (json.references = []);
+        json.references ??= [];
         if (!json.references) {
             return json;
         }