@nrwl/cypress 14.4.3 → 14.5.0-beta.2

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [14.4.3](https://github.com/nrwl/nx/compare/14.4.2...14.4.3) (2022-07-16)
+# [14.5.0-beta.2](https://github.com/nrwl/nx/compare/14.4.2...14.5.0-beta.2) (2022-07-18)
 
 **Note:** Version bump only for package @nrwl/cypress

package/generators.json

@@ -13,6 +13,16 @@
       "factory": "./src/generators/cypress-project/cypress-project#cypressProjectSchematic",
       "schema": "./src/generators/cypress-project/schema.json",
       "description": "Add a Cypress E2E Project."
+    },
+    "cypress-component-project": {
+      "factory": "./src/generators/cypress-component-project/cypress-component-project#cypressComponentProject",
+      "schema": "./src/generators/cypress-component-project/schema.json",
+      "description": "Set up Cypress Component Test for a project"
+    },
+    "migrate-to-cypress-10": {
+      "factory": "./src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten#migrateCypressProject",
+      "schema": "./src/generators/migrate-to-cypress-ten/schema.json",
+      "description": "Migrate existing Cypress e2e projects to Cypress v10"
     }
   },
   "generators": {
@@ -28,6 +38,18 @@
       "schema": "./src/generators/cypress-project/schema.json",
       "description": "Add a Cypress E2E Project.",
       "hidden": true
+    },
+    "cypress-component-project": {
+      "factory": "./src/generators/cypress-component-project/cypress-component-project#cypressComponentProject",
+      "schema": "./src/generators/cypress-component-project/schema.json",
+      "description": "Set up Cypress Component Test for a project",
+      "hidden": true
+    },
+    "migrate-to-cypress-10": {
+      "factory": "./src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten#migrateCypressProject",
+      "schema": "./src/generators/migrate-to-cypress-ten/schema.json",
+      "description": "Migrate existing Cypress e2e projects to Cypress v10",
+      "hidden": true
     }
   }
 }

package/index.d.ts

@@ -1,3 +1,5 @@
 export { cypressProjectGenerator } from './src/generators/cypress-project/cypress-project';
 export { cypressInitGenerator } from './src/generators/init/init';
 export { conversionGenerator } from './src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint';
+export { cypressComponentProject } from './src/generators/cypress-component-project/cypress-component-project';
+export { migrateCypressProject } from './src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten';

package/index.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.conversionGenerator = exports.cypressInitGenerator = exports.cypressProjectGenerator = void 0;
+exports.migrateCypressProject = exports.cypressComponentProject = exports.conversionGenerator = exports.cypressInitGenerator = exports.cypressProjectGenerator = void 0;
 var cypress_project_1 = require("./src/generators/cypress-project/cypress-project");
 Object.defineProperty(exports, "cypressProjectGenerator", { enumerable: true, get: function () { return cypress_project_1.cypressProjectGenerator; } });
 var init_1 = require("./src/generators/init/init");
 Object.defineProperty(exports, "cypressInitGenerator", { enumerable: true, get: function () { return init_1.cypressInitGenerator; } });
 var convert_tslint_to_eslint_1 = require("./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint");
 Object.defineProperty(exports, "conversionGenerator", { enumerable: true, get: function () { return convert_tslint_to_eslint_1.conversionGenerator; } });
+var cypress_component_project_1 = require("./src/generators/cypress-component-project/cypress-component-project");
+Object.defineProperty(exports, "cypressComponentProject", { enumerable: true, get: function () { return cypress_component_project_1.cypressComponentProject; } });
+var migrate_to_cypress_ten_1 = require("./src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten");
+Object.defineProperty(exports, "migrateCypressProject", { enumerable: true, get: function () { return migrate_to_cypress_ten_1.migrateCypressProject; } });
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/cypress/index.ts"],"names":[],"mappings":";;;AAAA,oFAA2F;AAAlF,0HAAA,uBAAuB,OAAA;AAChC,mDAAkE;AAAzD,4GAAA,oBAAoB,OAAA;AAC7B,+GAAyG;AAAhG,+HAAA,mBAAmB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/cypress/index.ts"],"names":[],"mappings":";;;AAAA,oFAA2F;AAAlF,0HAAA,uBAAuB,OAAA;AAChC,mDAAkE;AAAzD,4GAAA,oBAAoB,OAAA;AAC7B,+GAAyG;AAAhG,+HAAA,mBAAmB,OAAA;AAC5B,kHAA+G;AAAtG,oIAAA,uBAAuB,OAAA;AAChC,yGAAuG;AAA9F,+HAAA,qBAAqB,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/cypress",
-  "version": "14.4.3",
+  "version": "14.5.0-beta.2",
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
     "type": "git",
@@ -35,15 +35,16 @@
   "dependencies": {
     "@babel/core": "^7.0.1",
     "@babel/preset-env": "^7.0.0",
-    "@cypress/webpack-preprocessor": "^5.9.1",
-    "@nrwl/devkit": "14.4.3",
-    "@nrwl/linter": "14.4.3",
-    "@nrwl/workspace": "14.4.3",
+    "@cypress/webpack-preprocessor": "^5.12.0",
+    "@nrwl/devkit": "14.5.0-beta.2",
+    "@nrwl/linter": "14.5.0-beta.2",
+    "@nrwl/workspace": "14.5.0-beta.2",
+    "@phenomnomnominal/tsquery": "4.1.1",
     "babel-loader": "^8.0.2",
     "chalk": "4.1.0",
     "dotenv": "~10.0.0",
     "enhanced-resolve": "^5.8.3",
-    "fork-ts-checker-webpack-plugin": "6.2.10",
+    "fork-ts-checker-webpack-plugin": "7.2.13",
     "rxjs": "^6.5.4",
     "ts-loader": "^9.2.6",
     "tsconfig-paths": "^3.9.0",
@@ -53,12 +54,12 @@
     "webpack-node-externals": "^3.0.0"
   },
   "peerDependencies": {
-    "cypress": ">= 3 < 10"
+    "cypress": ">= 3 < 11"
   },
   "peerDependenciesMeta": {
     "cypress": {
       "optional": true
     }
   },
-  "gitHead": "9f7df39875d04baa2e8b8f8f12796dea6b38752a"
+  "gitHead": "38a2d95d9d654c89f58ed6700ec7b6cc01ddf74b"
 }

package/plugins/cypress-preset.d.ts

@@ -0,0 +1,34 @@
+interface BaseCypressPreset {
+    videosFolder: string;
+    screenshotsFolder: string;
+    video: boolean;
+    chromeWebSecurity: boolean;
+}
+export declare function nxBaseCypressPreset(pathToConfig: string): BaseCypressPreset;
+/**
+ * nx E2E Preset for Cypress
+ * @description
+ * this preset contains the base configuration
+ * for your e2e tests that nx recommends.
+ * you can easily extend this within your cypress config via spreading the preset
+ * @example
+ * export default defineConfig({
+ *   e2e: {
+ *     ...nxE2EPreset(__dirname)
+ *     // add your own config here
+ *   }
+ * })
+ *
+ * @param pathToConfig will be used to construct the output paths for videos and screenshots
+ */
+export declare function nxE2EPreset(pathToConfig: string): {
+    fileServerFolder: string;
+    supportFile: string;
+    specPattern: string;
+    fixturesFolder: string;
+    videosFolder: string;
+    screenshotsFolder: string;
+    video: boolean;
+    chromeWebSecurity: boolean;
+};
+export {};

package/plugins/cypress-preset.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nxE2EPreset = exports.nxBaseCypressPreset = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
+function nxBaseCypressPreset(pathToConfig) {
+    const projectPath = (0, path_1.relative)(devkit_1.workspaceRoot, pathToConfig);
+    const offset = (0, path_1.relative)(pathToConfig, devkit_1.workspaceRoot);
+    const videosFolder = (0, path_1.join)(offset, 'dist', 'cypress', projectPath, 'videos');
+    const screenshotsFolder = (0, path_1.join)(offset, 'dist', 'cypress', projectPath, 'screenshots');
+    return {
+        videosFolder,
+        screenshotsFolder,
+        video: true,
+        chromeWebSecurity: false,
+    };
+}
+exports.nxBaseCypressPreset = nxBaseCypressPreset;
+/**
+ * nx E2E Preset for Cypress
+ * @description
+ * this preset contains the base configuration
+ * for your e2e tests that nx recommends.
+ * you can easily extend this within your cypress config via spreading the preset
+ * @example
+ * export default defineConfig({
+ *   e2e: {
+ *     ...nxE2EPreset(__dirname)
+ *     // add your own config here
+ *   }
+ * })
+ *
+ * @param pathToConfig will be used to construct the output paths for videos and screenshots
+ */
+function nxE2EPreset(pathToConfig) {
+    return Object.assign(Object.assign({}, nxBaseCypressPreset(pathToConfig)), { fileServerFolder: '.', supportFile: 'src/support/e2e.ts', specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', fixturesFolder: 'src/fixtures' });
+}
+exports.nxE2EPreset = nxE2EPreset;
+//# sourceMappingURL=cypress-preset.js.map

package/plugins/cypress-preset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cypress-preset.js","sourceRoot":"","sources":["../../../../packages/cypress/plugins/cypress-preset.ts"],"names":[],"mappings":";;;AAAA,yCAA6C;AAC7C,+BAAsC;AAStC,SAAgB,mBAAmB,CAAC,YAAoB;IACtD,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,sBAAa,EAAE,YAAY,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,IAAA,eAAQ,EAAC,YAAY,EAAE,sBAAa,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAC5B,MAAM,EACN,MAAM,EACN,SAAS,EACT,WAAW,EACX,aAAa,CACd,CAAC;IAEF,OAAO;QACL,YAAY;QACZ,iBAAiB;QACjB,KAAK,EAAE,IAAI;QACX,iBAAiB,EAAE,KAAK;KACzB,CAAC;AACJ,CAAC;AAlBD,kDAkBC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,WAAW,CAAC,YAAoB;IAC9C,uCACK,mBAAmB,CAAC,YAAY,CAAC,KACpC,gBAAgB,EAAE,GAAG,EACrB,WAAW,EAAE,oBAAoB,EACjC,WAAW,EAAE,6BAA6B,EAC1C,cAAc,EAAE,cAAc,IAC9B;AACJ,CAAC;AARD,kCAQC"}

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

@@ -1,5 +1,5 @@
-import 'dotenv/config';
 import { ExecutorContext } from '@nrwl/devkit';
+import 'dotenv/config';
 export declare type Json = {
     [k: string]: any;
 };

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
 require("dotenv/config");
 const path_1 = require("path");
 const cypress_version_1 = require("../../utils/cypress-version");
-const devkit_1 = require("@nrwl/devkit");
 const Cypress = require('cypress'); // @NOTE: Importing via ES6 messes the whole test dependencies.
 function cypressExecutor(options, context) {
     var e_1, _a;
@@ -47,6 +47,7 @@ function normalizeOptions(options, context) {
     }
     checkSupportedBrowser(options);
     warnDeprecatedHeadless(options);
+    warnDeprecatedCypressVersion();
     return options;
 }
 function checkSupportedBrowser({ browser }) {
@@ -85,6 +86,15 @@ function warnDeprecatedHeadless({ headless }) {
         devkit_1.logger.warn(deprecatedMsg);
     }
 }
+function warnDeprecatedCypressVersion() {
+    if ((0, cypress_version_1.installedCypressVersion)() < 10) {
+        devkit_1.logger.warn((0, devkit_1.stripIndents) `
+NOTE:
+Support for Cypress versions < 10 is deprecated. Please upgrade to at least Cypress version 10. 
+A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v10-migration-guide
+`);
+    }
+}
 function startDevServer(opts, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* startDevServer_1() {
         var e_2, _a;

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

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

package/src/generators/cypress-component-project/cypress-component-project.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+import { CypressComponentProjectSchema } from './schema';
+export declare function cypressComponentProject(tree: Tree, options: CypressComponentProjectSchema): Promise<() => void>;

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

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cypressComponentProject = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const cypress_version_1 = require("../../utils/cypress-version");
+const versions_1 = require("../../utils/versions");
+function cypressComponentProject(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const cyVersion = (0, cypress_version_1.installedCypressVersion)();
+        if (cyVersion && cyVersion < 10) {
+            throw new Error('Cypress version of 10 or higher is required to use component testing. See the migration guide to upgrade. https://nx.dev/cypress/v10-migration-guide');
+        }
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+        const installDepsTask = updateDeps(tree);
+        addProjectFiles(tree, projectConfig, options);
+        addTargetToProject(tree, projectConfig, options);
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+        return () => {
+            installDepsTask();
+        };
+    });
+}
+exports.cypressComponentProject = cypressComponentProject;
+function updateDeps(tree) {
+    const devDeps = {
+        '@cypress/webpack-dev-server': versions_1.cypressWebpackVersion,
+        'html-webpack-plugin': versions_1.webpackHttpPluginVersion,
+        cypress: versions_1.cypressVersion,
+    };
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDeps);
+}
+function addProjectFiles(tree, projectConfig, options) {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), projectConfig.root, Object.assign(Object.assign({}, options), { projectRoot: projectConfig.root, offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root), ext: '' }));
+}
+function addTargetToProject(tree, projectConfig, options) {
+    projectConfig.targets['component-test'] = {
+        executor: '@nrwl/cypress:cypress',
+        options: {
+            cypressConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts'),
+            testingType: 'component',
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+}
+//# sourceMappingURL=cypress-component-project.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cypress-component-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-component-project/cypress-component-project.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,iEAAsE;AAEtE,mDAI8B;AAG9B,SAAsB,uBAAuB,CAC3C,IAAU,EACV,OAAsC;;QAEtC,MAAM,SAAS,GAAG,IAAA,yCAAuB,GAAE,CAAC;QAC5C,IAAI,SAAS,IAAI,SAAS,GAAG,EAAE,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,sJAAsJ,CACvJ,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,MAAM,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAEzC,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAC9C,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAEjD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QACD,OAAO,GAAG,EAAE;YACV,eAAe,EAAE,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;CAAA;AAxBD,0DAwBC;AAED,SAAS,UAAU,CAAC,IAAU;IAC5B,MAAM,OAAO,GAAG;QACd,6BAA6B,EAAE,gCAAqB;QACpD,qBAAqB,EAAE,mCAAwB;QAC/C,OAAO,EAAE,yBAAc;KACxB,CAAC;IAEF,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,eAAe,CACtB,IAAU,EACV,aAAmC,EACnC,OAAsC;IAEtC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,aAAa,CAAC,IAAI,kCAEb,OAAO,KACV,WAAW,EAAE,aAAa,CAAC,IAAI,EAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC,EAClD,GAAG,EAAE,EAAE,IAEV,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,IAAU,EACV,aAAmC,EACnC,OAAsC;IAEtC,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG;QACxC,QAAQ,EAAE,uBAAuB;QACjC,OAAO,EAAE;YACP,aAAa,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,mBAAmB,CAAC;YACzE,WAAW,EAAE,WAAW;SACzB;KACF,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AACnE,CAAC"}

package/src/generators/cypress-component-project/files/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

package/src/generators/cypress-component-project/files/cypress/support/commands.ts__ext__

@@ -0,0 +1,33 @@
+// ***********************************************
+// This example commands.ts shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+  declare namespace Cypress {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface Chainable<Subject> {
+      login(email: string, password: string): void;
+    }
+  }
+//
+// -- This is a parent command --
+    Cypress.Commands.add('login', (email, password) => {
+      console.log('Custom command example: Login', email, password);
+    });
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

package/src/generators/cypress-component-project/files/cypress/support/component-index.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <title><%= project %> Components App</title>
+
+</head>
+<body>
+  <div data-cy-root></div>
+</body>
+</html>

package/src/generators/cypress-component-project/files/cypress/support/component.ts__ext__

@@ -0,0 +1,17 @@
+// ***********************************************************
+// This example support/component.ts is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.ts using ES2015 syntax:
+import './commands';

package/src/generators/cypress-component-project/files/cypress.config.ts__ext__

@@ -0,0 +1,3 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({});

package/src/generators/cypress-component-project/files/tsconfig.cy.json

@@ -0,0 +1,16 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["cypress", "node"]
+  },
+  "include": [
+    "cypress.config.ts",
+    "**/*.cy.ts",
+    "**/*.cy.tsx",
+    "**/*.cy.js",
+    "**/*.cy.jsx",
+    "**/*.d.ts"
+  ]
+}

package/src/generators/cypress-component-project/schema.d.ts

@@ -0,0 +1,4 @@
+export interface CypressComponentProjectSchema {
+  project: string;
+  skipFormat: boolean;
+}

package/src/generators/cypress-component-project/schema.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxCypressComponentProject",
+  "cli": "nx",
+  "title": "Set up Cypress component testing for a project",
+  "description": "Set up Cypress component test for a project.",
+  "type": "object",
+  "examples": [
+    {
+      "command": "nx g @nrwl/cypress:cypress-component-project --project=my-cool-lib ",
+      "description": "Add cypress component testing to an existing project named my-cool-lib"
+    }
+  ],
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project to add cypress component testing to",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-prompt": "What project should we add Cypress component testing to?"
+    }
+  },
+  "required": ["project"]
+}

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

@@ -7,21 +7,27 @@ const linter_1 = require("@nrwl/linter");
 const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
 const path_1 = require("path");
-const versions_1 = require("../../utils/versions");
-const project_name_1 = require("../../utils/project-name");
 const cypress_version_1 = require("../../utils/cypress-version");
+const project_name_1 = require("../../utils/project-name");
+const versions_1 = require("../../utils/versions");
 function createFiles(tree, options) {
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), 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, typescript_1.getRelativePathToRootTsConfig)(tree, options.projectRoot) }));
+    // if not installed or >v10 use v10 folder
+    // else use v9 folder
     const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
-    if (!cypressVersion || cypressVersion >= 7) {
-        tree.delete((0, path_1.join)(options.projectRoot, 'src/plugins/index.js'));
-    }
-    else {
+    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, typescript_1.getRelativePathToRootTsConfig)(tree, options.projectRoot) }));
+    if (cypressVersion && cypressVersion < 7) {
         (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'cypress.json'), (json) => {
             json.pluginsFile = './src/plugins/index';
             return json;
         });
     }
+    else if (cypressVersion < 10) {
+        const pluginPath = (0, path_1.join)(options.projectRoot, 'src/plugins/index.js');
+        if (tree.exists(pluginPath)) {
+            tree.delete(pluginPath);
+        }
+    }
     if (options.js) {
         (0, devkit_1.toJS)(tree);
     }
@@ -29,6 +35,8 @@ function createFiles(tree, options) {
 function addProject(tree, options) {
     var _a, _b, _c, _d;
     let e2eProjectConfig;
+    const detectedCypressVersion = (_a = (0, cypress_version_1.installedCypressVersion)()) !== null && _a !== void 0 ? _a : versions_1.cypressVersion;
+    const cypressConfig = detectedCypressVersion < 10 ? 'cypress.json' : 'cypress.config.ts';
     if (options.baseUrl) {
         e2eProjectConfig = {
             root: options.projectRoot,
@@ -38,8 +46,9 @@ function addProject(tree, options) {
                 e2e: {
                     executor: '@nrwl/cypress:cypress',
                     options: {
-                        cypressConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, 'cypress.json'),
+                        cypressConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, cypressConfig),
                         baseUrl: options.baseUrl,
+                        testingType: 'e2e',
                     },
                 },
             },
@@ -55,7 +64,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 = ((_a = project.targets) === null || _a === void 0 ? void 0 : _a.serve) && ((_c = (_b = project.targets) === null || _b === void 0 ? void 0 : _b.serve) === null || _c === void 0 ? void 0 : _c.defaultConfiguration)
+        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)
             ? `${options.project}:serve:${project.targets.serve.defaultConfiguration}`
             : `${options.project}:serve`;
         e2eProjectConfig = {
@@ -66,8 +75,9 @@ function addProject(tree, options) {
                 e2e: {
                     executor: '@nrwl/cypress:cypress',
                     options: {
-                        cypressConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, 'cypress.json'),
+                        cypressConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, cypressConfig),
                         devServerTarget,
+                        testingType: 'e2e',
                     },
                     configurations: {
                         production: {
@@ -83,7 +93,6 @@ function addProject(tree, options) {
     else {
         throw new Error(`Either project or baseUrl should be specified.`);
     }
-    const detectedCypressVersion = (_d = (0, cypress_version_1.installedCypressVersion)()) !== null && _d !== void 0 ? _d : versions_1.cypressVersion;
     if (detectedCypressVersion < 7) {
         e2eProjectConfig.targets.e2e.options.tsConfig = (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json');
     }

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

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

package/src/generators/cypress-project/files/v10-and-after/cypress.config.ts__tmpl__

@@ -0,0 +1,6 @@
+import { defineConfig } from 'cypress';
+import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+
+export default defineConfig({
+  e2e: nxE2EPreset(__dirname)
+});

package/src/generators/cypress-project/files/v10-and-after/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "<%= rootTsConfigPath %>",
+  "compilerOptions": {
+    "sourceMap": false,
+    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
+    "allowJs": true,
+    "types": ["cypress", "node"]
+  },
+  "include": ["src/**/*.ts", "src/**/*.js", "cypress.config.ts"]
+}

package/src/generators/cypress-project/files/v9-and-under/src/fixtures/example.json__tmpl__

@@ -0,0 +1,4 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io"
+}

package/src/generators/cypress-project/files/v9-and-under/src/integration/app.spec.ts__tmpl__

@@ -0,0 +1,13 @@
+import { getGreeting } from '../support/app.po';
+
+describe('<%= project %>', () => {
+  beforeEach(() => cy.visit('/'));
+
+  it('should display welcome message', () => {
+    // Custom command example, see `../support/commands.ts` file
+    cy.login('my-email@something.com', 'myPassword');
+
+    // Function helper example, see `../support/app.po.ts` file
+    getGreeting().contains('Welcome <%= project %>');
+  });
+});

package/src/generators/cypress-project/files/v9-and-under/src/support/app.po.ts__tmpl__

@@ -0,0 +1 @@
+export const getGreeting = () => cy.get('h1');

package/src/generators/cypress-project/files/v9-and-under/src/support/commands.ts__tmpl__

@@ -0,0 +1,33 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+<% if (linter === 'eslint') { %>
+// eslint-disable-next-line @typescript-eslint/no-namespace<% } %>
+declare namespace Cypress {<% if (linter === 'eslint') { %>
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars<% } %>
+  interface Chainable<Subject> {
+    login(email: string, password: string): void;
+  }
+}
+//
+// -- This is a parent command --
+Cypress.Commands.add('login', (email, password) => {
+  console.log('Custom command example: Login', email, password);
+});
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

package/src/generators/cypress-project/files/v9-and-under/src/support/index.ts__tmpl__

@@ -0,0 +1,17 @@
+// ***********************************************************
+// This example support/index.ts is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.ts using ES2015 syntax:
+import './commands';

package/src/generators/cypress-project/files/{tsconfig.json → v9-and-under/tsconfig.json}

@@ -1,5 +1,5 @@
 {
-  "extends": "<%= rootTsConfigPath %>",
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
   "compilerOptions": {
     "sourceMap": false,
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",

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

@@ -0,0 +1,27 @@
+import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+export declare function findCypressConfigs(tree: Tree, projectConfig: ProjectConfiguration, target: string, config: string): {
+    cypressConfigPathJson: string;
+    cypressConfigPathTs: string;
+};
+/**
+ * update the existing cypress.json config to the new cypress.config.ts structure.
+ * return both the old and new configs
+ */
+export declare function createNewCypressConfig(tree: Tree, projectConfig: ProjectConfiguration, cypressConfigPathJson: string): {
+    cypressConfigTs: Record<string, any>;
+    cypressConfigJson: Record<string, any>;
+};
+export declare function createSupportFileImport(oldSupportFilePath: string, newSupportFilePath: string, projectSourceRoot: string): {
+    oldImportPathLeaf: string;
+    newImportPathLeaf: string;
+};
+export declare function updateProjectPaths(tree: Tree, projectConfig: ProjectConfiguration, { cypressConfigTs, cypressConfigJson, }: {
+    cypressConfigTs: Record<string, any>;
+    cypressConfigJson: Record<string, any>;
+}): void;
+export declare function updateImports(tree: Tree, filePath: string, oldImportPath: string, newImportPath: string): void;
+export declare function writeNewConfig(tree: Tree, cypressConfigPathTs: string, cypressConfigs: {
+    cypressConfigTs: Record<string, any>;
+    cypressConfigJson: Record<string, any>;
+}): void;
+export declare function addConfigToTsConfig(tree: Tree, tsconfigPath: string, cypressConfigPath: string): void;

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

@@ -0,0 +1,204 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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("@nrwl/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const path_1 = require("path");
+const typescript_1 = require("typescript");
+const validFilesEndingsToUpdate = [
+    '.js',
+    '.jsx',
+    '.ts',
+    '.tsx',
+    '.mjs',
+    '.cjs',
+];
+function findCypressConfigs(tree, projectConfig, target, config) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    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) ||
+        // make sure it's a json file, since it could have been updated to ts file from previous configuration migration
+        (((_e = (_d = projectConfig.targets[target]) === null || _d === void 0 ? void 0 : _d.options) === null || _e === void 0 ? void 0 : _e.cypressConfig.endsWith('json'))
+            ? (_g = (_f = projectConfig.targets[target]) === null || _f === void 0 ? void 0 : _f.options) === null || _g === void 0 ? void 0 : _g.cypressConfig
+            : (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.json'));
+    const cypressConfigPathTs = (0, devkit_1.joinPathFragments)(projectConfig.root, 
+    // create matching ts config for custom cypress config if present
+    cypressConfigPathJson.endsWith('cypress.json')
+        ? 'cypress.config.ts' //default
+        : `${(0, path_1.basename)(cypressConfigPathJson, (0, path_1.extname)(cypressConfigPathJson))}.config.ts`);
+    return {
+        cypressConfigPathJson,
+        cypressConfigPathTs,
+    };
+}
+exports.findCypressConfigs = findCypressConfigs;
+/**
+ * update the existing cypress.json config to the new cypress.config.ts structure.
+ * return both the old and new configs
+ */
+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"]);
+    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}`, 
+            // 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
+            supportFile: (supportFile &&
+                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, 
+            // 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 }),
+    };
+    return { cypressConfigTs, cypressConfigJson };
+}
+exports.createNewCypressConfig = createNewCypressConfig;
+function createSupportFileImport(oldSupportFilePath, newSupportFilePath, projectSourceRoot) {
+    // need to get the new import path for the support file.
+    // before it was "<relative path>/support/index.ts" and the new path will be "<relative path>/support/e2e.ts"
+    // i.e. take ../support => ../support/e2e.ts
+    // 1. take apps/app-e2e/support/index.ts => support (this cant have a / in it. must grab the leaf for tsquery)
+    // 2. if the leaf value is index.ts then grab the parent directory (i.e. so we have support/index.ts => support)
+    // 3. take apps/app-e2e/support/e2e.ts => support/e2e
+    // apps/app-e2e/support/e2e.ts => support/e2e
+    const newFileExt = (0, path_1.extname)(newSupportFilePath);
+    const newImportPathLeaf = (0, path_1.relative)(projectSourceRoot, newSupportFilePath).replace(newFileExt, '');
+    // apps/app-e2e/support/index.ts => support/index
+    const oldFileExt = (0, path_1.extname)(oldSupportFilePath);
+    const oldImportPathLeaf = (0, path_1.relative)(projectSourceRoot, oldSupportFilePath).replace(oldFileExt, '');
+    // support/index => support
+    const oldRelativeImportPath = (0, path_1.basename)(oldImportPathLeaf, oldFileExt);
+    return {
+        newImportPathLeaf,
+        // don't import from 'support/index' it's just 'support'
+        oldImportPathLeaf: oldRelativeImportPath === 'index'
+            ? (0, path_1.dirname)(oldImportPathLeaf)
+            : oldImportPathLeaf,
+    };
+}
+exports.createSupportFileImport = createSupportFileImport;
+function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfigJson, }) {
+    const { integrationFolder, supportFile } = cypressConfigTs['e2e'];
+    const oldIntegrationFolder = (0, devkit_1.joinPathFragments)(projectConfig.root, cypressConfigJson.integrationFolder);
+    const newIntegrationFolder = (0, devkit_1.joinPathFragments)(projectConfig.root, integrationFolder);
+    let newSupportFile;
+    let oldSupportFile;
+    let oldImportLeafPath;
+    let newImportLeafPath;
+    let shouldUpdateSupportFileImports = false;
+    // supportFile can be falsey or a string path to the file
+    if (cypressConfigJson.supportFile) {
+        // we need to check the test files to see if
+        // support file import is used and then update it if so
+        shouldUpdateSupportFileImports = true;
+        oldSupportFile = (0, devkit_1.joinPathFragments)(projectConfig.root, cypressConfigJson.supportFile);
+        newSupportFile = (0, devkit_1.joinPathFragments)(projectConfig.root, supportFile);
+        // oldSupportFile might have already been updated
+        // to the new default location so must be guarded for
+        if (oldSupportFile !== newSupportFile && tree.exists(oldSupportFile)) {
+            tree.rename(oldSupportFile, newSupportFile);
+        }
+    }
+    else {
+        shouldUpdateSupportFileImports = false;
+        newSupportFile = supportFile;
+        // rename the default support file even if not in use to keep the system in sync with cypress v10
+        const defaultSupportFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'index.ts');
+        if (tree.exists(defaultSupportFile)) {
+            const newSupportDefaultPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'e2e.ts');
+            if (defaultSupportFile !== newSupportDefaultPath &&
+                tree.exists(defaultSupportFile)) {
+                tree.rename(defaultSupportFile, newSupportDefaultPath);
+            }
+        }
+    }
+    if (shouldUpdateSupportFileImports) {
+        const newImportPaths = createSupportFileImport(oldSupportFile, newSupportFile, projectConfig.sourceRoot);
+        oldImportLeafPath = newImportPaths.oldImportPathLeaf;
+        newImportLeafPath = newImportPaths.newImportPathLeaf;
+    }
+    // tree.rename doesn't work on directories must update each file within
+    // the directory to the new directory
+    (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (path) => {
+        if (!path.includes(oldIntegrationFolder)) {
+            return;
+        }
+        const fileName = (0, path_1.basename)(path);
+        let newPath = path.replace(oldIntegrationFolder, newIntegrationFolder);
+        if (fileName.includes('.spec.')) {
+            newPath = newPath.replace('.spec.', '.cy.');
+        }
+        if (newPath !== path && tree.exists(path)) {
+            tree.rename(path, newPath);
+        }
+        // if they weren't using the supportFile then there is no need to update the imports.
+        if (shouldUpdateSupportFileImports &&
+            validFilesEndingsToUpdate.some((e) => path.endsWith(e))) {
+            updateImports(tree, newPath, oldImportLeafPath, newImportLeafPath);
+        }
+    });
+    if (tree.children(oldIntegrationFolder).length === 0) {
+        tree.delete(oldIntegrationFolder);
+    }
+}
+exports.updateProjectPaths = updateProjectPaths;
+function updateImports(tree, filePath, oldImportPath, newImportPath) {
+    const endOfImportSelector = `StringLiteral[value=/${oldImportPath}$/]`;
+    const fileContent = tree.read(filePath, 'utf-8');
+    const newContent = tsquery_1.tsquery.replace(fileContent, endOfImportSelector, (node) => {
+        // if node.parent is an CallExpression require() ||ImportDeclaration
+        if ((node === null || node === void 0 ? void 0 : node.parent) &&
+            ((0, typescript_1.isCallExpression)(node.parent) ||
+                (0, typescript_1.isImportDeclaration)(node.parent) ||
+                (0, typescript_1.isExportDeclaration)(node.parent))) {
+            return `'${node.text.replace(oldImportPath, newImportPath)}'`;
+        }
+        return node.text;
+    });
+    tree.write(filePath, newContent);
+}
+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 pluginImport = pluginsFile
+        ? `import setupNodeEvents from '${pluginsFile}';`
+        : '';
+    const convertedConfig = JSON.stringify(restOfConfig, null, 2);
+    tree.write(cypressConfigPathTs, (0, devkit_1.stripIndents) `
+import { defineConfig } from 'cypress'
+import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+${pluginImport}
+
+const cypressJsonConfig = ${convertedConfig}
+export default defineConfig({
+  e2e: {
+    ...nxE2EPreset(__dirname),
+    ...cypressJsonConfig,
+    ${pluginsFile ? 'setupNodeEvents' : ''}
+  }
+})
+`);
+}
+exports.writeNewConfig = writeNewConfig;
+function addConfigToTsConfig(tree, tsconfigPath, cypressConfigPath) {
+    if (tree.exists(tsconfigPath)) {
+        (0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
+            json.include = Array.from(new Set([
+                ...(json.include || []),
+                (0, path_1.relative)((0, path_1.dirname)(tsconfigPath), cypressConfigPath),
+            ]));
+            return json;
+        }, { expectComments: true });
+    }
+}
+exports.addConfigToTsConfig = addConfigToTsConfig;
+//# sourceMappingURL=conversion.util.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"conversion.util.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-ten/conversion.util.ts"],"names":[],"mappings":"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"}

package/src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten.d.ts

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

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

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateCypressProject = void 0;
+const tslib_1 = require("tslib");
+const cypress_version_1 = require("@nrwl/cypress/src/utils/cypress-version");
+const devkit_1 = require("@nrwl/devkit");
+const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+const versions_1 = require("../../utils/versions");
+const conversion_util_1 = require("./conversion.util");
+function migrateCypressProject(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (0, cypress_version_1.assertMinimumCypressVersion)(8);
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (currentValue, projectName, target, configuration) => {
+            var _a, _b, _c, _d, _e, _f;
+            try {
+                const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+                const { cypressConfigPathJson, cypressConfigPathTs } = (0, conversion_util_1.findCypressConfigs)(tree, projectConfig, target, configuration);
+                // a matching cypress ts file hasn't been made yet. need to migrate.
+                if (tree.exists(cypressConfigPathJson) &&
+                    !tree.exists(cypressConfigPathTs)) {
+                    const cypressConfigs = (0, conversion_util_1.createNewCypressConfig)(tree, projectConfig, cypressConfigPathJson);
+                    (0, conversion_util_1.updateProjectPaths)(tree, projectConfig, cypressConfigs);
+                    (0, conversion_util_1.writeNewConfig)(tree, cypressConfigPathTs, cypressConfigs);
+                    (0, conversion_util_1.addConfigToTsConfig)(tree, ((_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.tsConfig) ||
+                        ((_f = (_e = (_d = projectConfig.targets) === null || _d === void 0 ? void 0 : _d[target]) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.tsConfig) ||
+                        (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), cypressConfigPathTs);
+                    tree.delete(cypressConfigPathJson);
+                }
+                // ts file has been made and matching json file has been removed only need to update the project config
+                if (!tree.exists(cypressConfigPathJson) &&
+                    tree.exists(cypressConfigPathTs)) {
+                    projectConfig.targets[target].options = Object.assign(Object.assign({}, projectConfig.targets[target].options), { cypressConfig: cypressConfigPathTs, testingType: 'e2e' });
+                    (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+                }
+            }
+            catch (e) {
+                devkit_1.logger.error((0, devkit_1.stripIndents) `
+NX There was an error converting ${projectName}:${target}.
+You can manually update the project by following the migration guide if need be.
+https://nx.dev/cypress/v10-migration-guide
+  `);
+                throw e;
+            }
+        });
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            json.devDependencies['cypress'] = versions_1.cypressVersion;
+            return json;
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+        return () => {
+            (0, devkit_1.installPackagesTask)(tree);
+        };
+    });
+}
+exports.migrateCypressProject = migrateCypressProject;
+exports.default = migrateCypressProject;
+//# sourceMappingURL=migrate-to-cypress-ten.js.map

package/src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-to-cypress-ten.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten.ts"],"names":[],"mappings":";;;;AAAA,6EAAsF;AACtF,yCAUsB;AACtB,iGAA8F;AAE9F,mDAAsD;AACtD,uDAM2B;AAE3B,SAAsB,qBAAqB,CAAC,IAAU;;QACpD,IAAA,6CAA2B,EAAC,CAAC,CAAC,CAAC;QAE/B,IAAA,+CAAsB,EACpB,IAAI,EACJ,uBAAuB,EACvB,CAAC,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE;;YACnD,IAAI;gBACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAElE,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,GAClD,IAAA,oCAAkB,EAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBAEjE,oEAAoE;gBACpE,IACE,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC;oBAClC,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EACjC;oBACA,MAAM,cAAc,GAAG,IAAA,wCAAsB,EAC3C,IAAI,EACJ,aAAa,EACb,qBAAqB,CACtB,CAAC;oBAEF,IAAA,oCAAkB,EAAC,IAAI,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;oBACxD,IAAA,gCAAc,EAAC,IAAI,EAAE,mBAAmB,EAAE,cAAc,CAAC,CAAC;oBAC1D,IAAA,qCAAmB,EACjB,IAAI,EACJ,CAAA,MAAA,MAAA,MAAA,aAAa,CAAC,OAAO,0CAAG,MAAM,CAAC,0CAAE,cAAc,0CAAE,QAAQ;yBACvD,MAAA,MAAA,MAAA,aAAa,CAAC,OAAO,0CAAG,MAAM,CAAC,0CAAE,OAAO,0CAAE,QAAQ,CAAA;wBAClD,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EACxD,mBAAmB,CACpB,CAAC;oBAEF,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;iBACpC;gBACD,uGAAuG;gBACvG,IACE,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC;oBACnC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAChC;oBACA,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,mCAChC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,KACxC,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,KAAK,GACnB,CAAC;oBAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;iBAC9D;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,eAAM,CAAC,KAAK,CAAC,IAAA,qBAAY,EAAA;mCACE,WAAW,IAAI,MAAM;;;GAGrD,CAAC,CAAC;gBACG,MAAM,CAAC,CAAC;aACT;QACH,CAAC,CACF,CAAC;QAEF,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,yBAAc,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AArED,sDAqEC;AAED,kBAAe,qBAAqB,CAAC"}

package/src/generators/migrate-to-cypress-ten/schema.json

@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxCypressMigrateToTen",
+  "cli": "nx",
+  "title": "Migrate e2e project to Cypress 10",
+  "description": "Migrate Cypress e2e project from v8/v9 to Cypress v10.",
+  "type": "object",
+  "examples": [
+    {
+      "command": "nx g @nrwl/cypress:migrate-to-cypress-10",
+      "description": "Migrate existing cypress projects to Cypress v10"
+    }
+  ],
+  "properties": {}
+}

package/src/plugins/preprocessor.js

@@ -58,7 +58,6 @@ function getWebpackConfig(config) {
         plugins: [
             new ForkTsCheckerWebpackPlugin({
                 typescript: {
-                    enabled: true,
                     configFile: config.env.tsConfig,
                 },
             }),

package/src/plugins/preprocessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"preprocessor.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/preprocessor.ts"],"names":[],"mappings":";;;;AAAA,oDAAoD;AACpD,iFAAoE;AACpE,6EAA8E;AAC9E,yCAA4C;AAC5C,6EAAkF;AAClF,wDAAyD;AAEzD;;GAEG;AACH,SAAgB,oBAAoB,CAClC,MAAW,EACX,sBAAoD;IAEpD,IAAI,IAAA,yCAAuB,GAAE,IAAI,CAAC,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,IAAA,qBAAY,EAAA;;4GAEgF,CAAC,CAAC;KAC3G;IAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;KACH;IAED,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,cAAc,GAAG,sBAAsB;YAC3C,CAAC,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAClD,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC,CAAA,CAAC;AACJ,CAAC;AAtBD,oDAsBC;AAED,SAAgB,gBAAgB,CAAC,MAAW;IAC1C,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC1D,OAAO;QACL,OAAO,EAAE;YACP,UAAU;YACV,OAAO,EAAE;gBACP,IAAI,mDAAmB,CAAC;oBACtB,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;oBAC/B,UAAU;iBACX,CAAC;aACH;SACF;QACD,MAAM,EAAE;YACN,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,cAAc;oBACpB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC;oBACpC,OAAO,EAAE,CAAC,cAAc,CAAC;oBACzB,OAAO,EAAE;wBACP,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;wBAC/B,mDAAmD;wBACnD,oBAAoB,EAAE,IAAI;wBAC1B,aAAa,EAAE,IAAI;qBACpB;iBACF;aACF;SACF;QACD,OAAO,EAAE;YACP,IAAI,0BAA0B,CAAC;gBAC7B,UAAU,EAAE;oBACV,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;iBAChC;aACF,CAAC;SACH;QACD,SAAS,EAAE,CAAC,aAAa,EAAE,CAAC;KAC7B,CAAC;AACJ,CAAC;AArCD,4CAqCC"}
+{"version":3,"file":"preprocessor.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/preprocessor.ts"],"names":[],"mappings":";;;;AAAA,oDAAoD;AACpD,iFAAoE;AACpE,6EAA8E;AAC9E,yCAA4C;AAC5C,6EAAkF;AAClF,wDAAyD;AAEzD;;GAEG;AACH,SAAgB,oBAAoB,CAClC,MAAW,EACX,sBAAoD;IAEpD,IAAI,IAAA,yCAAuB,GAAE,IAAI,CAAC,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,IAAA,qBAAY,EAAA;;4GAEgF,CAAC,CAAC;KAC3G;IAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;KACH;IAED,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,cAAc,GAAG,sBAAsB;YAC3C,CAAC,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAClD,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC,CAAA,CAAC;AACJ,CAAC;AAtBD,oDAsBC;AAED,SAAgB,gBAAgB,CAAC,MAAW;IAC1C,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC1D,OAAO;QACL,OAAO,EAAE;YACP,UAAU;YACV,OAAO,EAAE;gBACP,IAAI,mDAAmB,CAAC;oBACtB,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;oBAC/B,UAAU;iBACX,CAAC;aACH;SACF;QACD,MAAM,EAAE;YACN,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,cAAc;oBACpB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC;oBACpC,OAAO,EAAE,CAAC,cAAc,CAAC;oBACzB,OAAO,EAAE;wBACP,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;wBAC/B,mDAAmD;wBACnD,oBAAoB,EAAE,IAAI;wBAC1B,aAAa,EAAE,IAAI;qBACpB;iBACF;aACF;SACF;QACD,OAAO,EAAE;YACP,IAAI,0BAA0B,CAAC;gBAC7B,UAAU,EAAE;oBACV,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;iBAChC;aACF,CAAC;SACH;QACD,SAAS,EAAE,CAAC,aAAa,EAAE,CAAC;KAC7B,CAAC;AACJ,CAAC;AApCD,4CAoCC"}

package/src/utils/cypress-version.d.ts

@@ -1 +1,5 @@
 export declare function installedCypressVersion(): number;
+/**
+ * will not throw if cypress is not installed
+ */
+export declare function assertMinimumCypressVersion(minVersion: number): void;

package/src/utils/cypress-version.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installedCypressVersion = void 0;
+exports.assertMinimumCypressVersion = exports.installedCypressVersion = void 0;
 let cypressPackageJson;
 let loadedCypress = false;
 function installedCypressVersion() {
@@ -21,4 +21,14 @@ function installedCypressVersion() {
     return +majorVersion;
 }
 exports.installedCypressVersion = installedCypressVersion;
+/**
+ * will not throw if cypress is not installed
+ */
+function assertMinimumCypressVersion(minVersion) {
+    const version = installedCypressVersion();
+    if (version && version < minVersion) {
+        throw new Error(`Cypress version of ${minVersion} or higher is not installed. Expected Cypress v${minVersion}+, found Cypress v${version} instead.`);
+    }
+}
+exports.assertMinimumCypressVersion = assertMinimumCypressVersion;
 //# sourceMappingURL=cypress-version.js.map

package/src/utils/cypress-version.js.map

@@ -1 +1 @@
-{"version":3,"file":"cypress-version.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/cypress-version.ts"],"names":[],"mappings":";;;AAAA,IAAI,kBAAkB,CAAC;AACvB,IAAI,aAAa,GAAG,KAAK,CAAC;AAE1B,SAAgB,uBAAuB;IACrC,IAAI,CAAC,aAAa,EAAE;QAClB,IAAI;YACF,kBAAkB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;SACtD;QAAC,WAAM,GAAE;KACX;IAED,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,IAAI,CAAC;KACb;IACD,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,OAAO,CAAC;IACzD,MAAM,YAAY,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,CAAC,CAAC;KACV;IACD,OAAO,CAAC,YAAY,CAAC;AACvB,CAAC;AAhBD,0DAgBC"}
+{"version":3,"file":"cypress-version.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/cypress-version.ts"],"names":[],"mappings":";;;AAAA,IAAI,kBAAkB,CAAC;AACvB,IAAI,aAAa,GAAG,KAAK,CAAC;AAE1B,SAAgB,uBAAuB;IACrC,IAAI,CAAC,aAAa,EAAE;QAClB,IAAI;YACF,kBAAkB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;SACtD;QAAC,WAAM,GAAE;KACX;IAED,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,IAAI,CAAC;KACb;IACD,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,OAAO,CAAC;IACzD,MAAM,YAAY,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,CAAC,CAAC;KACV;IACD,OAAO,CAAC,YAAY,CAAC;AACvB,CAAC;AAhBD,0DAgBC;AAED;;GAEG;AACH,SAAgB,2BAA2B,CAAC,UAAkB;IAC5D,MAAM,OAAO,GAAG,uBAAuB,EAAE,CAAC;IAC1C,IAAI,OAAO,IAAI,OAAO,GAAG,UAAU,EAAE;QACnC,MAAM,IAAI,KAAK,CACb,sBAAsB,UAAU,kDAAkD,UAAU,qBAAqB,OAAO,WAAW,CACpI,CAAC;KACH;AACH,CAAC;AAPD,kEAOC"}

package/src/utils/versions.d.ts

@@ -1,4 +1,6 @@
 export declare const nxVersion: any;
-export declare const cypressVersion = "^9.1.0";
 export declare const eslintPluginCypressVersion = "^2.10.3";
 export declare const typesNodeVersion = "16.11.7";
+export declare const cypressVersion = "^10.2.0";
+export declare const cypressWebpackVersion = "^2.0.0";
+export declare const webpackHttpPluginVersion = "^5.5.0";

package/src/utils/versions.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typesNodeVersion = exports.eslintPluginCypressVersion = exports.cypressVersion = exports.nxVersion = void 0;
+exports.webpackHttpPluginVersion = exports.cypressWebpackVersion = exports.cypressVersion = exports.typesNodeVersion = exports.eslintPluginCypressVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.cypressVersion = '^9.1.0';
 exports.eslintPluginCypressVersion = '^2.10.3';
 exports.typesNodeVersion = '16.11.7';
+exports.cypressVersion = '^10.2.0';
+exports.cypressWebpackVersion = '^2.0.0';
+exports.webpackHttpPluginVersion = '^5.5.0';
 //# sourceMappingURL=versions.js.map

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAClD,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,0BAA0B,GAAG,SAAS,CAAC;AACvC,QAAA,gBAAgB,GAAG,SAAS,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAClD,QAAA,0BAA0B,GAAG,SAAS,CAAC;AACvC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,wBAAwB,GAAG,QAAQ,CAAC"}