@nx/cypress 16.0.0-beta.1

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

@@ -0,0 +1,89 @@
+"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;
+        }
+        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);
+                    }
+                }
+            }
+        }
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = removeTypescriptPlugin;
+function removePreprocessor(tree, pluginPath) {
+    const pluginContents = tree.read(pluginPath, 'utf-8');
+    const sourceFile = (0, typescript_1.createSourceFile)(pluginPath, pluginContents, typescript_1.ScriptTarget.ESNext, true);
+    const deletions = [];
+    const callback = (node) => {
+        // Look for the invocation of preprocessTypescript
+        if ((0, typescript_1.isCallExpression)(node) &&
+            (0, typescript_1.isIdentifier)(node.expression) &&
+            node.expression.getText(sourceFile) === 'preprocessTypescript' &&
+            node.arguments.length < 2) {
+            // Get the Statement that the function call belongs to
+            let n = node.parent;
+            while (!(0, typescript_1.isExpressionStatement)(n) && n === sourceFile) {
+                n = n.parent;
+            }
+            deletions.push({
+                type: devkit_1.ChangeType.Delete,
+                start: n.getStart(),
+                length: n.getWidth() +
+                    (pluginContents[n.getStart() + n.getWidth()] === ';' ? 1 : 0),
+            });
+        }
+    };
+    // Call the callback for every node in the file
+    sourceFile.forEachChild(recurse);
+    function recurse(node) {
+        callback(node);
+        node.forEachChild((child) => recurse(child));
+    }
+    // Remove the preprocessor from the file
+    tree.write(pluginPath, (0, devkit_1.applyChangesToString)(pluginContents, deletions));
+}
+function getCypressConfigs(target) {
+    if (!target.configurations && !target.options.cypressConfig) {
+        return [];
+    }
+    else if (!target.configurations && target.options.cypressConfig) {
+        return [target.options.cypressConfig];
+    }
+    return [target.options, Object.values(target.configurations)]
+        .filter((options) => !!options.cypressConfig)
+        .map((options) => options.cypressConfig);
+}
+function getCypressTargets(proj) {
+    if (!proj.targets) {
+        return [];
+    }
+    return Object.values(proj.targets).filter((target) => target.executor === '@nrwl/cypress:cypress');
+}
+//# sourceMappingURL=remove-typescript-plugin.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"remove-typescript-plugin.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-12-8-0/remove-typescript-plugin.ts"],"names":[],"mappings":";;;AAAA,uCAUoB;AACpB,2CAOoB;AACpB,+BAAqC;AACrC,iEAAsE;AAEtE,SAA8B,sBAAsB,CAAC,IAAU;;QAC7D,MAAM,cAAc,GAAG,IAAA,yCAAuB,GAAE,CAAC;QACjD,IAAI,cAAc,GAAG,CAAC,EAAE;YACtB,OAAO,CAAC,IAAI,CACV,YAAY,cAAc,qGAAqG,CAChI,CAAC;YACF,OAAO;SACR;QAED,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACzC,MAAM,cAAc,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,cAAc,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC9B,SAAS;aACV;YAED,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE;gBACnC,MAAM,cAAc,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBAEjD,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE;oBACnC,MAAM,aAAa,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBAC7C,IAAI,aAAa,CAAC,WAAW,EAAE;wBAC7B,IAAI,UAAU,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,MAAM,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;wBAClE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;4BAC5B,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC;iCACxB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC;iCAC9B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;yBACtC;wBACD,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;qBACtC;iBACF;aACF;SACF;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAlCD,yCAkCC;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,UAAkB;IACxD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,6BAAgB,EACjC,UAAU,EACV,cAAc,EACd,yBAAY,CAAC,MAAM,EACnB,IAAI,CACL,CAAC;IAEF,MAAM,SAAS,GAAqB,EAAE,CAAC;IAEvC,MAAM,QAAQ,GAAG,CAAC,IAAU,EAAE,EAAE;QAC9B,kDAAkD;QAClD,IACE,IAAA,6BAAgB,EAAC,IAAI,CAAC;YACtB,IAAA,yBAAY,EAAC,IAAI,CAAC,UAAU,CAAC;YAC7B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,sBAAsB;YAC9D,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EACzB;YACA,sDAAsD;YACtD,IAAI,CAAC,GAAS,IAAI,CAAC,MAAM,CAAC;YAC1B,OAAO,CAAC,IAAA,kCAAqB,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE;gBACpD,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;aACd;YAED,SAAS,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,mBAAU,CAAC,MAAM;gBACvB,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE;gBACnB,MAAM,EACJ,CAAC,CAAC,QAAQ,EAAE;oBACZ,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAChE,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;IAEF,+CAA+C;IAC/C,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAEjC,SAAS,OAAO,CAAC,IAAU;QACzB,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,wCAAwC;IACxC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,6BAAoB,EAAC,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,iBAAiB,CAAC,MAA2B;IACpD,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE;QAC3D,OAAO,EAAE,CAAC;KACX;SAAM,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE;QACjE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACvC;IAED,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC1D,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;SAC5C,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,iBAAiB,CAAC,IAA0B;IACnD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACjB,OAAO,EAAE,CAAC;KACX;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CACvC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,uBAAuB,CACxD,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare function updateCypressConfigsPresets(tree: Tree): Promise<void>;
+export default updateCypressConfigsPresets;

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

@@ -0,0 +1,111 @@
+"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;
+        }
+        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);
+        }
+        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) `
+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. 
+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) {
+    let contents = tsquery_1.tsquery.replace(tree.read(options.cypressConfig, 'utf-8'), 'CallExpression', (node) => {
+        // technically someone could have both component and e2e in the same project.
+        const expression = node.expression.getText();
+        if (expression === 'nxE2EPreset') {
+            return 'nxE2EPreset(__filename)';
+        }
+        else if (expression === 'nxE2EStorybookPreset') {
+            return 'nxE2EStorybookPreset(__filename)';
+        }
+        else if (node.expression.getText() === 'nxComponentTestingPreset') {
+            return targetName && targetName !== 'component-test' // the default
+                ? `nxComponentTestingPreset(__filename, { ctTargetName: '${targetName}' })`
+                : 'nxComponentTestingPreset(__filename)';
+        }
+        return;
+    });
+    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']),
+        });
+        // 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) || !(projectWithBuild === null || projectWithBuild === void 0 ? void 0 : projectWithBuild.config)) {
+            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;
+    });
+}
+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',
+                        ])) }) }) }) }));
+    });
+}
+exports.default = updateCypressConfigsPresets;
+//# sourceMappingURL=update-cypress-configs-presets.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"update-cypress-configs-presets.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-14-6-1/update-cypress-configs-presets.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,3 @@
+import { GeneratorCallback, Tree } from '@nx/devkit';
+export declare function updateCypressVersionIf10(tree: Tree): GeneratorCallback;
+export default updateCypressVersionIf10;

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateCypressVersionIf10 = void 0;
+const devkit_1 = require("@nx/devkit");
+// don't import from root level to prevent issue where angular isn't installed.
+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'];
+    if (!installedVersion) {
+        return;
+    }
+    const normalizedInstalledCypressVersion = (0, semver_1.checkAndCleanWithSemver)('cypress', installedVersion);
+    // not using v10
+    if ((0, semver_2.lt)(normalizedInstalledCypressVersion, '10.0.0') ||
+        (0, semver_2.gte)(normalizedInstalledCypressVersion, '11.0.0')) {
+        return;
+    }
+    const ngComponentTestingVersion = '10.7.0';
+    if ((0, semver_2.lt)(normalizedInstalledCypressVersion, ngComponentTestingVersion)) {
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            json.devDependencies['cypress'] = `^${ngComponentTestingVersion}`;
+            return json;
+        });
+        return () => {
+            (0, devkit_1.installPackagesTask)(tree);
+        };
+    }
+}
+exports.updateCypressVersionIf10 = updateCypressVersionIf10;
+exports.default = updateCypressVersionIf10;
+//# sourceMappingURL=update-cypress-version-if-10.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"update-cypress-version-if-10.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-14-7-0/update-cypress-version-if-10.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AACpB,+EAA+E;AAC/E,wDAAsE;AACtE,mCAAiC;AAEjC,SAAgB,wBAAwB,CAAC,IAAU;;IACjD,MAAM,gBAAgB,GAAG,MAAA,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,eAAe,0CACrE,SAAS,CACV,CAAC;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO;KACR;IACD,MAAM,iCAAiC,GAAG,IAAA,gCAAuB,EAC/D,SAAS,EACT,gBAAgB,CACjB,CAAC;IAEF,gBAAgB;IAChB,IACE,IAAA,WAAE,EAAC,iCAAiC,EAAE,QAAQ,CAAC;QAC/C,IAAA,YAAG,EAAC,iCAAiC,EAAE,QAAQ,CAAC,EAChD;QACA,OAAO;KACR;IAED,MAAM,yBAAyB,GAAG,QAAQ,CAAC;IAE3C,IAAI,IAAA,WAAE,EAAC,iCAAiC,EAAE,yBAAyB,CAAC,EAAE;QACpE,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,IAAI,yBAAyB,EAAE,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;KACH;AACH,CAAC;AAhCD,4DAgCC;AAED,kBAAe,wBAAwB,CAAC"}

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

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

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

@@ -0,0 +1,48 @@
+"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);
+        }
+        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);
+    });
+}
+exports.default = default_1;
+function getCypressTargetNames(tree) {
+    const cypressTargets = new Set();
+    let hasComponentTesting = false;
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (options, __, target) => {
+        cypressTargets.add(target);
+        if (options.testingType === 'component') {
+            hasComponentTesting = true;
+        }
+    });
+    return { cypressTargets, hasComponentTesting };
+}
+//# sourceMappingURL=add-cypress-inputs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"add-cypress-inputs.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-15-0-0/add-cypress-inputs.ts"],"names":[],"mappings":";;;AAAA,uCAAyE;AACzE,6FAA0F;AAG1F,mBAA+B,IAAU;;;;QACvC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAEhC,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5E,MAAM,oBAAoB,GAAG,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;QAE9D,IAAI,mBAAmB,IAAI,oBAAoB,IAAI,cAAc,CAAC,IAAI,GAAG,CAAC,EAAE;YAC1E,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YACjE,KAAK,MAAM,SAAS,IAAI;gBACtB,6BAA6B;gBAC7B,kCAAkC;gBAClC,qCAAqC;aACtC,EAAE;gBACD,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAC/D;QAED,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE;YACvC,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;YAC7B,MAAM,qBAAqB,GAAG,aAAC,MAAM,CAAC,cAAc,EAAC,UAAU,wCAAV,UAAU,IAAM,EAAE,EAAC,CAAC;YAEzE,MAAA,qBAAqB,CAAC,MAAM,oCAA5B,qBAAqB,CAAC,MAAM,GAAK;gBAC/B,SAAS;gBACT,oBAAoB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;aAClD,EAAC;SACH;QAED,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AA/BD,4BA+BC;AAED,SAAS,qBAAqB,CAAC,IAAU;IACvC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,IAAA,+CAAsB,EACpB,IAAI,EACJ,uBAAuB,EACvB,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;QACtB,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,OAAO,CAAC,WAAW,KAAK,WAAW,EAAE;YACvC,mBAAmB,GAAG,IAAI,CAAC;SAC5B;IACH,CAAC,CACF,CAAC;IACF,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC;AACjD,CAAC"}

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

@@ -0,0 +1,5 @@
+import { Tree } from '@nx/devkit';
+export declare function updateCyMountUsage(tree: Tree): Promise<void>;
+export declare function addMountCommand(tree: Tree, projectRoot: string, framework: string): void;
+export declare function updateCyFile(tree: Tree, filePath: string, framework: 'angular' | 'react' | 'react18'): void;
+export default updateCyMountUsage;

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

@@ -0,0 +1,124 @@
+"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");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+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) {
+            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 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);
+    });
+}
+exports.updateCyMountUsage = updateCyMountUsage;
+function addMountCommand(tree, projectRoot, framework) {
+    const commandFilePath = (0, devkit_1.joinPathFragments)(projectRoot, 'cypress', 'support', 'commands.ts');
+    if (!tree.exists(commandFilePath)) {
+        return;
+    }
+    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) {
+        return;
+    }
+    const existingCommands = tsquery_1.tsquery.query(commandFile, 'InterfaceDeclaration:has(Identifier[name="Chainable"]) > MethodSignature, InterfaceDeclaration:has(Identifier[name="Chainable"]) > PropertySignature');
+    const isGlobalDeclaration = tsquery_1.tsquery.query(commandFile, 'ModuleDeclaration > Identifier[name="global"]');
+    const updatedInterface = tsquery_1.tsquery.replace(commandFile, 'ModuleDeclaration:has(Identifier[name="Cypress"])', (node) => {
+        const newModuleDelcaration = `declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface Chainable<Subject> {
+      ${existingCommands.map((c) => c.getText()).join('\n')}
+      mount: typeof mount;
+    }
+  }
+}`;
+        /*
+         * this is to prevent the change being applied twice since
+         * declare global { 1
+         *   interface Cypress { 2
+         *   }
+         * }
+         * matches twice.
+         * i.e. if there is no global declaration, then add it
+         * 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 ||
+            node.name.getText() === 'global') {
+            return newModuleDelcaration;
+        }
+    });
+    const updatedCommandFile = `import { mount } from 'cypress/${framework}'\n${updatedInterface}\nCypress.Commands.add('mount', mount);`;
+    tree.write(commandFilePath, updatedCommandFile);
+}
+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 hasReact18 = reactDomVersion &&
+        (0, semver_2.gte)((0, semver_1.checkAndCleanWithSemver)('react-dom', reactDomVersion), '18.0.0');
+    if (hasReact18) {
+        return 'react18';
+    }
+    return 'react';
+}
+function updateCyFile(tree, filePath, framework) {
+    if (!tree.exists(filePath)) {
+        return;
+    }
+    const contents = tree.read(filePath, 'utf-8');
+    const withCyMount = tsquery_1.tsquery.replace(contents, ':matches(CallExpression>Identifier[name="mount"])', (node) => {
+        return `cy.mount`;
+    });
+    const withUpdatedImports = tsquery_1.tsquery.replace(withCyMount, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="mount"]):has(StringLiteral[value="cypress/react"], StringLiteral[value="cypress/angular"], StringLiteral[value="cypress/react18"])', (node) => {
+        switch (framework) {
+            case 'angular':
+                return `import { MountConfig } from 'cypress/angular';`;
+            case 'react18':
+            case 'react':
+                return ' '; // have to return non falsy string to remove the node
+            default:
+                return node.getText().replace('mount', '');
+        }
+    });
+    tree.write(filePath, withUpdatedImports);
+}
+exports.updateCyFile = updateCyFile;
+exports.default = updateCyMountUsage;
+//# sourceMappingURL=update-cy-mount-usage.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"update-cy-mount-usage.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-15-0-0/update-cy-mount-usage.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+export declare function updateToCypress11(tree: Tree): Promise<() => void>;
+export declare function updateMountHookUsage(tree: Tree, filePath: string): void;
+export declare function updateUnmountUsage(tree: Tree, filePath: string): void;
+export declare function updateProviderUsage(tree: Tree, filePath: string): void;
+export default updateToCypress11;

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

@@ -0,0 +1,118 @@
+"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");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+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) {
+            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 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 installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { cypress: versions_1.cypressVersion });
+        yield (0, devkit_1.formatFiles)(tree);
+        return () => {
+            installTask();
+        };
+    });
+}
+exports.updateToCypress11 = updateToCypress11;
+function updateMountHookUsage(tree, filePath) {
+    const originalContents = tree.read(filePath, 'utf-8');
+    const commentedMountHook = tsquery_1.tsquery.replace(originalContents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="mountHook"]):has(StringLiteral[value="cypress/react"], StringLiteral[value="cypress/react18"])', (node) => {
+        return `/** TODO: mountHook is deprecate. 
+* Use a wrapper component instead. 
+* See post for details: https://www.cypress.io/blog/2022/11/04/upcoming-changes-to-component-testing/#reactmounthook-removed 
+* */\n${node.getText()}`;
+    });
+    tree.write(filePath, commentedMountHook);
+}
+exports.updateMountHookUsage = updateMountHookUsage;
+function updateUnmountUsage(tree, filePath) {
+    const reactDomImport = (0, path_1.extname)(filePath).includes('ts')
+        ? `import ReactDom from 'react-dom'`
+        : `const ReactDom = require('react-dom')`;
+    const originalContents = tree.read(filePath, 'utf-8');
+    const updatedImports = tsquery_1.tsquery.replace(originalContents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="unmount"]):has(StringLiteral[value="cypress/react"], StringLiteral[value="cypress/react18"])', (node) => {
+        return `${node.getText().replace('unmount', 'getContainerEl')}
+${reactDomImport}`;
+    });
+    const updatedUnmountApi = tsquery_1.tsquery.replace(updatedImports, 'ExpressionStatement > CallExpression:has(Identifier[name="unmount"])', (node) => {
+        if (node.expression.getText() === 'unmount') {
+            return `cy.then(() => ReactDom.unmountComponentAtNode(getContainerEl()))`;
+        }
+    });
+    tree.write(filePath, updatedUnmountApi);
+}
+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;
+    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) {
+            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 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';
+                });
+                return `TestBed.overrideComponent(${component}, { add: { ${providers} }});\n${noProviders}`;
+            }
+            else {
+                return `TestBed.overrideComponent(${component}, {add: { providers: ${node.arguments[1].getText()}.providers}});\n${node.getText()}`;
+            }
+        }
+    });
+    tree.write(filePath, `${isTestBedImported
+        ? ''
+        : "import {TestBed} from '@angular/core/testing';\n"}${updatedProviders}`);
+}
+exports.updateProviderUsage = updateProviderUsage;
+function getFramework(contents) {
+    if (contents.includes('cypress/react') || contents.includes('@nrwl/react')) {
+        return 'react';
+    }
+    if (contents.includes('cypress/angular') ||
+        contents.includes('@nrwl/angular')) {
+        return 'angular';
+    }
+    return null;
+}
+exports.default = updateToCypress11;
+//# sourceMappingURL=cypress-11.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cypress-11.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-15-1-0/cypress-11.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-15-5-0/helpers.d.ts

@@ -0,0 +1,3 @@
+import type { Node } from 'typescript';
+export declare function isAlreadyCommented(node: Node): boolean;
+export declare const BANNED_COMMANDS: string[];