@nx/cypress 16.4.0-beta.10 → 16.4.0-beta.14

package/migrations.json

@@ -53,6 +53,18 @@
       "version": "16.2.0-beta.0",
       "description": "Normalize tsconfig.cy.json files to be located at '<projectRoot>/cypress/tsconfig.json'",
       "implementation": "./src/migrations/update-16-2-0/update-cy-tsconfig"
+    },
+    "update-16-3-0-remove-old-tsconfigs": {
+      "cli": "nx",
+      "version": "16.4.0-beta.10",
+      "description": "Remove tsconfig.e2e.json and add settings to project tsconfig.json. tsConfigs executor option is now deprecated. The project level tsconfig.json file should be used instead.",
+      "implementation": "./src/migrations/update-16-4-0/tsconfig-sourcemaps"
+    },
+    "update-16-4-0-warn-incompatible-angular-cypress": {
+      "cli": "nx",
+      "version": "16.4.0-beta.11",
+      "description": "Cypress Component Testing is broken with Angular 16.1.0. Warn about it if the workspace has Angular >= 16.1.0 and Angular projects using Component Testing.",
+      "implementation": "./src/migrations/update-16-4-0/warn-incompatible-angular-cypress"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "16.4.0-beta.10",
+  "version": "16.4.0-beta.14",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -34,10 +34,10 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/cypress": "16.4.0-beta.10",
-    "@nx/devkit": "16.4.0-beta.10",
-    "@nx/js": "16.4.0-beta.10",
-    "@nx/linter": "16.4.0-beta.10",
+    "@nrwl/cypress": "16.4.0-beta.14",
+    "@nx/devkit": "16.4.0-beta.14",
+    "@nx/js": "16.4.0-beta.14",
+    "@nx/linter": "16.4.0-beta.14",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "dotenv": "~10.0.0",
@@ -55,5 +55,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "d2bde0605c692a023bc9c28686f3a3037bbd56d3"
+  "gitHead": "796c91c34b96d82306a62e90f9146ae8e68762b5"
 }

package/plugins/cypress-preset.d.ts

@@ -13,7 +13,9 @@ export interface NxComponentTestingOptions {
     ctTargetName?: string;
     bundler?: 'vite' | 'webpack';
 }
-export declare function nxBaseCypressPreset(pathToConfig: string): BaseCypressPreset;
+export declare function nxBaseCypressPreset(pathToConfig: string, options?: {
+    testingType: 'component' | 'e2e';
+}): BaseCypressPreset;
 /**
  * nx E2E Preset for Cypress
  * @description

package/plugins/cypress-preset.js

@@ -5,7 +5,10 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const preprocessor_vite_1 = require("../src/plugins/preprocessor-vite");
-function nxBaseCypressPreset(pathToConfig) {
+function nxBaseCypressPreset(pathToConfig, options) {
+    // used to set babel settings for react CT.
+    process.env.NX_CYPRESS_COMPONENT_TEST =
+        (options === null || options === void 0 ? void 0 : options.testingType) === 'component' ? 'true' : 'false';
     // prevent from placing path outside the root of the workspace
     // if they pass in a file or directory
     const normalizedPath = (0, fs_1.lstatSync)(pathToConfig).isDirectory()

package/src/executors/cypress/cypress.impl.d.ts

@@ -6,7 +6,6 @@ export type Json = {
 export interface CypressExecutorOptions extends Json {
     cypressConfig: string;
     watch?: boolean;
-    tsConfig?: string;
     devServerTarget?: string;
     headed?: boolean;
     /**

package/src/executors/cypress/cypress.impl.js

@@ -17,25 +17,20 @@ function cypressExecutor(options, context) {
         process.env.NX_CYPRESS_TARGET_CONFIGURATION = context.configurationName;
         let success;
         try {
-            for (var _d = true, _e = tslib_1.__asyncValues(startDevServer(options, context)), _f; _f = yield _e.next(), _a = _f.done, !_a;) {
+            for (var _d = true, _e = tslib_1.__asyncValues(startDevServer(options, context)), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
                 _c = _f.value;
                 _d = false;
+                const devServerValues = _c;
                 try {
-                    const devServerValues = _c;
-                    try {
-                        success = yield runCypress(devServerValues.baseUrl, Object.assign(Object.assign({}, options), { portLockFilePath: devServerValues.portLockFilePath }));
-                        if (!options.watch)
-                            break;
-                    }
-                    catch (e) {
-                        devkit_1.logger.error(e.message);
-                        success = false;
-                        if (!options.watch)
-                            break;
-                    }
+                    success = yield runCypress(devServerValues.baseUrl, Object.assign(Object.assign({}, options), { portLockFilePath: devServerValues.portLockFilePath }));
+                    if (!options.watch)
+                        break;
                 }
-                finally {
-                    _d = true;
+                catch (e) {
+                    devkit_1.logger.error(e.message);
+                    success = false;
+                    if (!options.watch)
+                        break;
                 }
             }
         }
@@ -53,11 +48,6 @@ exports.default = cypressExecutor;
 function normalizeOptions(options, context) {
     var _a, _b, _c;
     options.env = options.env || {};
-    if (options.tsConfig) {
-        const tsConfigPath = (0, path_1.join)(context.root, options.tsConfig);
-        options.env.tsConfig = tsConfigPath;
-        process.env.TS_NODE_PROJECT = tsConfigPath;
-    }
     if (options.testingType === 'component') {
         const project = (_b = (_a = context === null || context === void 0 ? void 0 : context.projectGraph) === null || _a === void 0 ? void 0 : _a.nodes) === null || _b === void 0 ? void 0 : _b[context.projectName];
         if ((_c = project === null || project === void 0 ? void 0 : project.data) === null || _c === void 0 ? void 0 : _c.root) {
@@ -142,27 +132,22 @@ If the port is in use, try using a different port value or passing --port='cypre
             }
         }
         try {
-            for (var _g = true, _h = tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)(parsedDevServerTarget, overrides, context))), _j; _j = yield tslib_1.__await(_h.next()), _d = _j.done, !_d;) {
+            for (var _g = true, _h = tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)(parsedDevServerTarget, overrides, context))), _j; _j = yield tslib_1.__await(_h.next()), _d = _j.done, !_d; _g = true) {
                 _f = _j.value;
                 _g = false;
-                try {
-                    const output = _f;
-                    if (!output.success && !opts.watch)
-                        throw new Error('Could not compile application files');
-                    if (!opts.baseUrl &&
-                        !output.baseUrl &&
-                        !((_a = output.info) === null || _a === void 0 ? void 0 : _a.baseUrl) &&
-                        ((_b = output.info) === null || _b === void 0 ? void 0 : _b.port)) {
-                        output.baseUrl = `http://localhost:${output.info.port}`;
-                    }
-                    yield yield tslib_1.__await({
-                        baseUrl: opts.baseUrl || output.baseUrl || ((_c = output.info) === null || _c === void 0 ? void 0 : _c.baseUrl),
-                        portLockFilePath: overrides.port && (0, path_1.join)(__dirname, `${overrides.port}.txt`),
-                    });
-                }
-                finally {
-                    _g = true;
+                const output = _f;
+                if (!output.success && !opts.watch)
+                    throw new Error('Could not compile application files');
+                if (!opts.baseUrl &&
+                    !output.baseUrl &&
+                    !((_a = output.info) === null || _a === void 0 ? void 0 : _a.baseUrl) &&
+                    ((_b = output.info) === null || _b === void 0 ? void 0 : _b.port)) {
+                    output.baseUrl = `http://localhost:${output.info.port}`;
                 }
+                yield yield tslib_1.__await({
+                    baseUrl: opts.baseUrl || output.baseUrl || ((_c = output.info) === null || _c === void 0 ? void 0 : _c.baseUrl),
+                    portLockFilePath: overrides.port && (0, path_1.join)(__dirname, `${overrides.port}.txt`),
+                });
             }
         }
         catch (e_2_1) { e_2 = { error: e_2_1 }; }

package/src/executors/cypress/schema.json

@@ -32,6 +32,7 @@
       "default": false
     },
     "tsConfig": {
+      "x-deprecated": "This option no longer has any effect. Cypress supports typescript out of the box. Add any options directly to <projectRoot>/tsconfig.json or <projectRoot>/cypress/tsconfig.json",
       "type": "string",
       "description": "The path of the Cypress tsconfig configuration json file.",
       "x-completion-type": "file",

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

@@ -31,4 +31,9 @@ export declare function updatePluginFile(tree: Tree, projectConfig: ProjectConfi
 }): {
     cypressConfigTs: Record<string, any>;
     cypressConfigJson: Record<string, any>;
+} | {
+    cypressConfigTs: {
+        e2e: any;
+    };
+    cypressConfigJson: Record<string, any>;
 };

package/src/migrations/update-16-4-0/tsconfig-sourcemaps.d.ts

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

package/src/migrations/update-16-4-0/tsconfig-sourcemaps.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixLegacyCypressTsconfig = void 0;
+const tslib_1 = require("tslib");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+function fixLegacyCypressTsconfig(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', (options, projectName, targetName, configName) => {
+            var _a, _b, _c;
+            const projectConfig = projects.get(projectName);
+            if (options.testingType !== 'e2e' &&
+                ((_b = (_a = projectConfig.targets[targetName]) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.testingType) !== 'e2e') {
+                return;
+            }
+            const tsconfigToRemove = (_c = options.tsConfig) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.e2e.json');
+            const projectLevelConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
+            if (!tree.exists(projectLevelConfigPath) ||
+                !tree.exists(tsconfigToRemove)) {
+                return;
+            }
+            if (tsconfigToRemove === projectLevelConfigPath) {
+                (0, devkit_1.updateJson)(tree, projectLevelConfigPath, (json) => {
+                    json.compilerOptions = Object.assign({ sourceMap: false }, json.compilerOptions);
+                    return json;
+                });
+            }
+            else {
+                const e2eConfig = (0, devkit_1.readJson)(tree, tsconfigToRemove);
+                (0, devkit_1.updateJson)(tree, projectLevelConfigPath, (json) => {
+                    var _a, _b, _c, _d, _e, _f, _g;
+                    json.compilerOptions = Object.assign(Object.assign({ sourceMap: false }, json.compilerOptions), e2eConfig.compilerOptions);
+                    json.files = Array.from(new Set([...((_a = json.files) !== null && _a !== void 0 ? _a : []), ...((_b = e2eConfig.files) !== null && _b !== void 0 ? _b : [])]));
+                    json.include = Array.from(new Set([...((_c = json.include) !== null && _c !== void 0 ? _c : []), ...((_d = e2eConfig.include) !== null && _d !== void 0 ? _d : [])]));
+                    json.exclude = Array.from(new Set([...((_e = json.exclude) !== null && _e !== void 0 ? _e : []), ...((_f = e2eConfig.exclude) !== null && _f !== void 0 ? _f : [])]));
+                    // these paths will always be 'unix style'
+                    // and on windows relative will not work on these paths
+                    const tsConfigFromProjRoot = path_1.posix.relative(projectConfig.root, tsconfigToRemove);
+                    json.references = ((_g = json.references) !== null && _g !== void 0 ? _g : []).filter(({ path }) => !path.includes(tsConfigFromProjRoot));
+                    return json;
+                });
+                tree.delete(tsconfigToRemove);
+            }
+            if (configName) {
+                delete projectConfig.targets[targetName].configurations[configName]
+                    .tsConfig;
+            }
+            else {
+                delete projectConfig.targets[targetName].options.tsConfig;
+            }
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.fixLegacyCypressTsconfig = fixLegacyCypressTsconfig;
+exports.default = fixLegacyCypressTsconfig;

package/src/migrations/update-16-4-0/warn-incompatible-angular-cypress.d.ts

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

package/src/migrations/update-16-4-0/warn-incompatible-angular-cypress.js

@@ -0,0 +1,56 @@
+"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");
+const package_json_1 = require("nx/src/utils/package-json");
+const semver_1 = require("semver");
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const angularVersion = getInstalledAngularVersion();
+        if (!angularVersion || (0, semver_1.lt)(angularVersion, '16.1.0')) {
+            return;
+        }
+        const angularProjects = yield getAngularProjects();
+        if (!angularProjects.length) {
+            return;
+        }
+        let skipChecking = false;
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/cypress:cypress', (options, projectName) => {
+            if (skipChecking || !angularProjects.includes(projectName)) {
+                return;
+            }
+            if (options.testingType === 'component') {
+                skipChecking = true;
+                devkit_1.logger.warn((0, devkit_1.stripIndents) `Some of your Angular projects are setup for Cypress Component testing.
+          The current version of Cypress does not support component testing for Angular 16.1 so your tests may fail.
+          If your component tests fail, here are some recommended next steps:
+          
+          - Revert these changes and update Nx without updating Angular ("nx migrate latest --interactive"). You can update Angular once the issue has been resolved
+          - Keep these changes but temporarily disable the component tests until this issue is resolved
+          
+          Check https://github.com/nrwl/nx/issues/17720 for more details.
+
+          `);
+            }
+        });
+    });
+}
+exports.default = default_1;
+function getAngularProjects() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
+        return Object.entries(projectGraph.dependencies)
+            .filter(([node, dep]) => dep.some(({ target }) => { var _a; return !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]) && target === 'npm:@angular/core'; }))
+            .map(([projectName]) => projectName);
+    });
+}
+function getInstalledAngularVersion() {
+    try {
+        const { packageJson: { version }, } = (0, package_json_1.readModulePackageJson)('@angular/core');
+        return version;
+    }
+    catch (_a) {
+        return null;
+    }
+}