npm - @nx/cypress - Versions diffs - 16.0.0-beta.2 → 16.0.0-beta.3 - Mend

@nx/cypress 16.0.0-beta.2 → 16.0.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "16.0.0-beta.2",
+  "version": "16.0.0-beta.3",
   "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.0.0-beta.2",
-    "@nx/devkit": "16.0.0-beta.2",
-    "@nx/js": "16.0.0-beta.2",
-    "@nx/linter": "16.0.0-beta.2",
+    "@nrwl/cypress": "16.0.0-beta.3",
+    "@nx/devkit": "16.0.0-beta.3",
+    "@nx/js": "16.0.0-beta.3",
+    "@nx/linter": "16.0.0-beta.3",
     "@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": "0d7dbbc5254390f53a28d94de536da916ed06a70"
+  "gitHead": "27344019a2a23403a7ac7fd2c94b1412d86458ba"
 }

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

@@ -332,7 +332,7 @@ ${e.message || e}`);
     }
     let targetHasOpt = Object.keys(targetOpts).includes(property);
     if (!targetHasOpt) {
-        // NOTE: readTargetOptions doesn't apply non defaulted values, i.e. @nrwl/vite has a port options but is optional
+        // NOTE: readTargetOptions doesn't apply non defaulted values, i.e. @nx/vite has a port options but is optional
         // so we double check the schema if readTargetOptions didn't return a value for the property
         const projectConfig = (_b = (_a = context.projectsConfigurations) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b[target.project];
         const targetConfig = projectConfig.targets[target.target];

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

	@@ -1 +1 @@
1	- {"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":"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~~,iHAAiH~~;~~QACjH~~,4FAA4F;QAC5F,MAAM,aAAa,GACjB,MAAA,MAAA,OAAO,CAAC,sBAAsB,0CAAE,QAAQ,0CAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7D,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAE1D,MAAM,SAAS,GAAG,IAAI,mBAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEhE,uEAAuE;QACvE,2DAA2D;QAC3D,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KAClE;IACD,OAAO,CAAC,YAAY,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY;IACrC,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;IACxD,IAAI;QACF,IAAI,IAAA,eAAU,EAAC,gBAAgB,CAAC,EAAE;YAChC,OAAO,KAAK,CAAC;SACd;QACD,IAAA,kBAAa,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI;QACF,IAAI,IAAI,IAAI,IAAA,eAAU,EAAC,IAAI,CAAC,EAAE;YAC5B,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC;SAClB;QACD,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
1	+ {"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/convert-tslint-to-eslint/convert-tslint-to-eslint.js CHANGED Viewed

@@ -12,8 +12,8 @@ function conversionGenerator(host, options) {
          * to perform in order to convert a project from TSLint to ESLint, as well as some
          * extensibility points for adjusting the behavior on a per package basis.
          *
-         * E.g. @nrwl/angular projects might need to make different changes to the final
-         * ESLint config when compared with @nrwl/next projects.
+         * E.g. @nx/angular projects might need to make different changes to the final
+         * ESLint config when compared with @nx/next projects.
          *
          * See the ProjectConverter implementation for a full breakdown of what it does.
          */
@@ -64,7 +64,7 @@ function conversionGenerator(host, options) {
         /**
          * Store user preferences for the collection
          */
-        projectConverter.setDefaults('@nrwl/cypress', defaults);
+        projectConverter.setDefaults('@nx/cypress', defaults);
         /**
          * Based on user preference and remaining usage, remove TSLint from the workspace entirely.
          */

package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"convert-tslint-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,uCAIoB;AACpB,uDAA8D;AAG9D,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAoC;;QAEpC;;;;;;;;;WASG;QACH,MAAM,gBAAgB,GAAG,IAAI,yBAAgB,CAAC;YAC5C,IAAI;YACJ,WAAW,EAAE,OAAO,CAAC,OAAO;YAC5B,0BAA0B,EAAE,OAAO,CAAC,0BAA0B;YAC9D,iBAAiB,EAAE,CAAO,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;gBAC1D,MAAM,IAAA,iCAAoB,EAAC,IAAI,EAAE;oBAC/B,MAAM,EAAE,eAAM,CAAC,MAAM;oBACrB,OAAO,EAAE,WAAW;oBACpB;;;;uBAIG;oBACH,uBAAuB,EAAE,IAAI;oBAC7B,UAAU,EAAE,KAAK;oBACjB,iBAAiB,EAAE,IAAI;iBACxB,CAAC,CAAC;YACL,CAAC,CAAA;SACF,CAAC,CAAC;QAEH;;;;WAIG;QACH,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAE7D;;;WAGG;QACH,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,CAAC;QAElE;;WAEG;QACH,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,uBAAuB,CAC1E,CAAC,IAAI,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,EAC3C,sBAAsB,CACvB,CAAC;QAEF;;WAEG;QACH,MAAM,wBAAwB,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAC1E,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CACf,CAAC;QAEF;;WAEG;QACH,gBAAgB,CAAC,uBAAuB,EAAE,CAAC;QAE3C,+CAA+C;QAC/C,MAAM,EAAE,OAAO,KAAkB,OAAO,EAApB,QAAQ,kBAAK,OAAO,EAAlC,WAAwB,CAAU,CAAC;QAEzC;;WAEG;QACH,gBAAgB,CAAC,WAAW,CAAC,~~eAAe~~,EAAE,QAAQ,CAAC,CAAC;~~QAExD~~;;WAEG;QACH,IAAI,mBAAmB,GAAsB,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9E,IACE,OAAO,CAAC,iCAAiC;YACzC,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,EAC3C;YACA,mBAAmB,GAAG,gBAAgB,CAAC,yBAAyB,EAAE,CAAC;SACpE;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAS,EAAE;YAChB,MAAM,qBAAqB,EAAE,CAAC;YAC9B,MAAM,qBAAqB,EAAE,CAAC;YAC9B,MAAM,wBAAwB,EAAE,CAAC;YACjC,MAAM,mBAAmB,EAAE,CAAC;QAC9B,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AAhGD,kDAgGC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC;AAE3E;;;GAGG;AACH,SAAS,2BAA2B,CAAC,IAAqB;IACxD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAC9C,IAAI,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SAC7B;KACF;IACD,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAChC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAClD,CAAC;KACH;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
1	+ {"version":3,"file":"convert-tslint-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,uCAIoB;AACpB,uDAA8D;AAG9D,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAoC;;QAEpC;;;;;;;;;WASG;QACH,MAAM,gBAAgB,GAAG,IAAI,yBAAgB,CAAC;YAC5C,IAAI;YACJ,WAAW,EAAE,OAAO,CAAC,OAAO;YAC5B,0BAA0B,EAAE,OAAO,CAAC,0BAA0B;YAC9D,iBAAiB,EAAE,CAAO,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;gBAC1D,MAAM,IAAA,iCAAoB,EAAC,IAAI,EAAE;oBAC/B,MAAM,EAAE,eAAM,CAAC,MAAM;oBACrB,OAAO,EAAE,WAAW;oBACpB;;;;uBAIG;oBACH,uBAAuB,EAAE,IAAI;oBAC7B,UAAU,EAAE,KAAK;oBACjB,iBAAiB,EAAE,IAAI;iBACxB,CAAC,CAAC;YACL,CAAC,CAAA;SACF,CAAC,CAAC;QAEH;;;;WAIG;QACH,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAE7D;;;WAGG;QACH,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,CAAC;QAElE;;WAEG;QACH,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,uBAAuB,CAC1E,CAAC,IAAI,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,EAC3C,sBAAsB,CACvB,CAAC;QAEF;;WAEG;QACH,MAAM,wBAAwB,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAC1E,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CACf,CAAC;QAEF;;WAEG;QACH,gBAAgB,CAAC,uBAAuB,EAAE,CAAC;QAE3C,+CAA+C;QAC/C,MAAM,EAAE,OAAO,KAAkB,OAAO,EAApB,QAAQ,kBAAK,OAAO,EAAlC,WAAwB,CAAU,CAAC;QAEzC;;WAEG;QACH,gBAAgB,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAEtD;;WAEG;QACH,IAAI,mBAAmB,GAAsB,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9E,IACE,OAAO,CAAC,iCAAiC;YACzC,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,EAC3C;YACA,mBAAmB,GAAG,gBAAgB,CAAC,yBAAyB,EAAE,CAAC;SACpE;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAS,EAAE;YAChB,MAAM,qBAAqB,EAAE,CAAC;YAC9B,MAAM,qBAAqB,EAAE,CAAC;YAC9B,MAAM,wBAAwB,EAAE,CAAC;YACjC,MAAM,mBAAmB,EAAE,CAAC;QAC9B,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AAhGD,kDAgGC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC;AAE3E;;;GAGG;AACH,SAAS,2BAA2B,CAAC,IAAqB;IACxD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAC9C,IAAI,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SAC7B;KACF;IACD,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAChC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAClD,CAAC;KACH;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

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

@@ -44,7 +44,7 @@ function addProjectFiles(tree, projectConfig, options) {
 }
 function addTargetToProject(tree, projectConfig, options) {
     projectConfig.targets['component-test'] = {
-        executor: '@nrwl/cypress:cypress',
+        executor: '@nx/cypress:cypress',
         options: {
             cypressConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts'),
             testingType: 'component',

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

	@@ -1 +1 @@
1	- {"version":3,"file":"cypress-component-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-component-project/cypress-component-project.ts"],"names":[],"mappings":";;;;AAAA,uCAaoB;AACpB,iEAAsE;AAEtE,mDAK8B;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,EAAE,OAAO,CAAC,CAAC;QAElD,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAC9C,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACjD,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAChC,iCAAiC,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAEvD,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;AA1BD,0DA0BC;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,OAAsC;IACpE,MAAM,OAAO,GAAG;QACd,OAAO,EAAE,yBAAc;KACxB,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;QAC9B,OAAO,CAAC,0BAA0B,CAAC,GAAG,sCAA2B,CAAC;KACnE;SAAM;QACL,OAAO,CAAC,6BAA6B,CAAC,GAAG,gCAAqB,CAAC;QAC/D,OAAO,CAAC,qBAAqB,CAAC,GAAG,mCAAwB,CAAC;KAC3D;IAED,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~~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"}
1	+ {"version":3,"file":"cypress-component-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-component-project/cypress-component-project.ts"],"names":[],"mappings":"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"}

package/src/generators/cypress-e2e-configuration/cypress-e2e-configuration.js CHANGED Viewed

@@ -99,7 +99,7 @@ function addTarget(tree, opts) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();
     projectConfig.targets.e2e = {
-        executor: '@nrwl/cypress:cypress',
+        executor: '@nx/cypress:cypress',
         options: {
             cypressConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, cyVersion && cyVersion < 10 ? 'cypress.json' : 'cypress.config.ts'),
             testingType: 'e2e',

package/src/generators/cypress-e2e-configuration/cypress-e2e-configuration.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cypress-e2e-configuration.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-e2e-configuration/cypress-e2e-configuration.ts"],"names":[],"mappings":"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~~uBAAuB~~;~~QACjC~~,OAAO,EAAE;YACP,aAAa,EAAE,IAAA,0BAAiB,EAC9B,aAAa,CAAC,IAAI,EAClB,SAAS,IAAI,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,mBAAmB,CACnE;YACD,WAAW,EAAE,KAAK;SACnB;KACF,CAAC;IACF,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,mCAC5B,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,KACpC,OAAO,EAAE,IAAI,CAAC,OAAO,GACtB,CAAC;KACH;SAAM,IAAI,IAAI,CAAC,eAAe,EAAE;QAC/B,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE7D,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,mCAC5B,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,KACpC,eAAe,EAAE,IAAI,CAAC,eAAe,EACrC,IAAI,EAAE,IAAI,CAAC,IAAI,GAChB,CAAC;QAEF,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG;YACzC,CAAC,YAAY,CAAC,aAAa,IAAI,YAAY,CAAC,EAAE;gBAC5C,eAAe,EAAE,GAAG,IAAI,CAAC,eAAe,GACtC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aACpC,EAAE;aACH;SACF,CAAC;QACF,MAAM,sBAAsB,GAAG,IAAA,iCAAwB,EACrD,IAAI,EACJ,YAAY,CAAC,OAAO,CACrB,CAAC;QACF,IAAI,MAAA,sBAAsB,CAAC,OAAO,0CAAG,cAAc,CAAC,EAAE;YACpD,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,GAAG;gBAC5C,eAAe,EAAE,GAAG,YAAY,CAAC,OAAO,eAAe;aACxD,CAAC;SACH;KACF;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACvE;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC;AAED,kBAAe,gCAAgC,CAAC;AACnC,QAAA,MAAM,GAAG,IAAA,2BAAkB,EAAC,gCAAgC,CAAC,CAAC"}
1	+ {"version":3,"file":"cypress-e2e-configuration.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-e2e-configuration/cypress-e2e-configuration.ts"],"names":[],"mappings":"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"}

package/src/generators/cypress-e2e-configuration/files/v10/cypress.config.ts__tmpl__ CHANGED Viewed

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

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

@@ -45,7 +45,7 @@ function addProject(tree, options) {
             projectType: 'application',
             targets: {
                 e2e: {
-                    executor: '@nrwl/cypress:cypress',
+                    executor: '@nx/cypress:cypress',
                     options: {
                         cypressConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, cypressConfig),
                         baseUrl: options.baseUrl,
@@ -74,7 +74,7 @@ function addProject(tree, options) {
             projectType: 'application',
             targets: {
                 e2e: {
-                    executor: '@nrwl/cypress:cypress',
+                    executor: '@nx/cypress:cypress',
                     options: {
                         cypressConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, cypressConfig),
                         devServerTarget,

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

	@@ -1 +1 @@
1	- {"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":";;;;AAAA,uCAqBoB;AACpB,uCAAoC;AAEpC,+BAAuD;AAEvD,+BAA4B;AAC5B,iEAAsE;AACtE,2DAA0D;AAC1D,mDAAmE;AACnE,uCAAoD;AAGpD,uDAA8D;AAQ9D,SAAS,WAAW,CAAC,IAAU,EAAE,OAA6B;IAC5D,0CAA0C;IAC1C,qBAAqB;IACrB,MAAM,cAAc,GAAG,IAAA,yCAAuB,GAAE,CAAC;IACjD,MAAM,YAAY,GAChB,cAAc,IAAI,cAAc,GAAG,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC;IAE3E,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,EACxC,OAAO,CAAC,WAAW,gCAEjB,IAAI,EAAE,EAAE,IACL,OAAO,KACV,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS,EACrC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAC7B,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,gBAAgB,EAAE,IAAA,kCAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,WAAW,CACpB,EACD,OAAO,EAAE,OAAO,CAAC,OAAO,IAE3B,CAAC;IAEF,IAAI,cAAc,IAAI,cAAc,GAAG,CAAC,EAAE;QACxC,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;YACnE,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC;YACzC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,cAAc,GAAG,EAAE,EAAE;QAC9B,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;QACrE,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SACzB;KACF;IAED,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,OAA6B;;IAC3D,IAAI,gBAAsC,CAAC;IAE3C,MAAM,sBAAsB,GAAG,MAAA,IAAA,yCAAuB,GAAE,mCAAI,yBAAc,CAAC;IAE3E,MAAM,aAAa,GACjB,sBAAsB,GAAG,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAErE,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,gBAAgB,GAAG;YACjB,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;YACzD,WAAW,EAAE,aAAa;YAC1B,OAAO,EAAE;gBACP,GAAG,EAAE;oBACH,QAAQ,EAAE,~~uBAAuB~~;~~oBACjC~~,OAAO,EAAE;wBACP,aAAa,EAAE,IAAA,0BAAiB,EAC9B,OAAO,CAAC,WAAW,EACnB,aAAa,CACd;wBACD,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,WAAW,EAAE,KAAK;qBACnB;iBACF;aACF;YACD,IAAI,EAAE,EAAE;YACR,oBAAoB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;SACtE,CAAC;KACH;SAAM,IAAI,OAAO,CAAC,OAAO,EAAE;QAC1B,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEhE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAY,EAAA;wBACN,OAAO,CAAC,OAAO;SAC9B,OAAO,CAAC,OAAO,+FAA+F,OAAO,CAAC,OAAO;OAC/H,CAAC,CAAC;SACJ;QACD,MAAM,eAAe,GACnB,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,MAAI,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,oBAAoB,CAAA;YACpE,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE;YAC1E,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,QAAQ,CAAC;QACjC,gBAAgB,GAAG;YACjB,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;YACzD,WAAW,EAAE,aAAa;YAC1B,OAAO,EAAE;gBACP,GAAG,EAAE;oBACH,QAAQ,EAAE,~~uBAAuB~~;~~oBACjC~~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"}
1	+ {"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__ CHANGED Viewed

@@ -1,10 +1,10 @@
 import { defineConfig } from 'cypress';
-import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 export default defineConfig({
-  e2e: nxE2EPreset(__dirname<% if (bundler === 'vite'){ %>,
+  e2e: nxE2EPreset(__dirname<% if (bundler === 'vite'){ %>,
   {
     bundler: 'vite'
   }
   <% } %>)
-});
+});

package/src/generators/init/init.js CHANGED Viewed

@@ -23,9 +23,9 @@ function setupE2ETargetDefaults(tree) {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function updateDependencies(tree) {
-    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nrwl/cypress'], []);
+    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/cypress'], []);
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        ['@nrwl/cypress']: versions_1.nxVersion,
+        ['@nx/cypress']: versions_1.nxVersion,
         cypress: versions_1.cypressVersion,
         '@types/node': versions_1.typesNodeVersion,
     });

package/src/generators/init/init.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCASoB;AACpB,mDAI8B;AAE9B,+BAAuC;AAEvC,SAAS,sBAAsB,CAAC,IAAU;;;IACxC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,OAAO;KACR;IAED,yFAAyF;IACzF,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;IAE7B,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;IAC3D,YAAA,MAAM,CAAC,cAAc,EAAC,GAAG,uCAAH,GAAG,GAAK,EAAE,EAAC;IACjC,YAAA,MAAM,CAAC,cAAc,CAAC,GAAG,EAAC,MAAM,uCAAN,MAAM,GAAK;QACnC,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,~~eAAe~~,CAAC,EAAE,EAAE,CAAC,CAAC;~~IAE/D~~,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,CAAC,~~eAAe~~,CAAC,EAAE,oBAAS;~~QAC5B~~,OAAO,EAAE,yBAAc;QACvB,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,oBAAoB,CAAC,IAAU,EAAE,OAAe;;QACpE,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAE7B,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAa,EAAC,IAAI,kCACnB,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;SACtC;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAjBD,oDAiBC;AAED,kBAAe,oBAAoB,CAAC;AACvB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
1	+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCASoB;AACpB,mDAI8B;AAE9B,+BAAuC;AAEvC,SAAS,sBAAsB,CAAC,IAAU;;;IACxC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,OAAO;KACR;IAED,yFAAyF;IACzF,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;IAE7B,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;IAC3D,YAAA,MAAM,CAAC,cAAc,EAAC,GAAG,uCAAH,GAAG,GAAK,EAAE,EAAC;IACjC,YAAA,MAAM,CAAC,cAAc,CAAC,GAAG,EAAC,MAAM,uCAAN,MAAM,GAAK;QACnC,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7D,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,CAAC,aAAa,CAAC,EAAE,oBAAS;QAC1B,OAAO,EAAE,yBAAc;QACvB,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,oBAAoB,CAAC,IAAU,EAAE,OAAe;;QACpE,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAE7B,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAa,EAAC,IAAI,kCACnB,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;SACtC;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAjBD,oDAiBC;AAED,kBAAe,oBAAoB,CAAC;AACvB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}

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

@@ -189,7 +189,7 @@ function writeNewConfig(tree, cypressConfigPathTs, cypressConfigs) {
     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';
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 ${pluginImport}
 const cypressJsonConfig = ${convertedConfig}

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

@@ -6,6 +6,51 @@ const cypress_version_1 = require("../../utils/cypress-version");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const conversion_util_1 = require("./conversion.util");
+function migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    try {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        const { cypressConfigPathJson, cypressConfigPathTs } = (0, conversion_util_1.findCypressConfigs)(tree, projectConfig, target, configuration);
+        if (!cypressConfigPathJson && !cypressConfigPathTs) {
+            return;
+        }
+        // a matching cypress ts file hasn't been made yet. need to migrate.
+        if (tree.exists(cypressConfigPathJson) &&
+            !tree.exists(cypressConfigPathTs)) {
+            let cypressConfigs = (0, conversion_util_1.createNewCypressConfig)(tree, projectConfig, cypressConfigPathJson);
+            cypressConfigs = (0, conversion_util_1.updatePluginFile)(tree, projectConfig, cypressConfigs);
+            (0, conversion_util_1.writeNewConfig)(tree, cypressConfigPathTs, cypressConfigs);
+            previousCypressConfigs.set(cypressConfigPathJson, cypressConfigs);
+            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)) {
+            const cypressConfigs = previousCypressConfigs.get(cypressConfigPathJson);
+            (0, conversion_util_1.updateProjectPaths)(tree, projectConfig, cypressConfigs);
+            (0, conversion_util_1.addConfigToTsConfig)(tree, (configuration
+                ? (_d = (_c = (_b = (_a = projectConfig.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.configurations) === null || _c === void 0 ? void 0 : _c[configuration]) === null || _d === void 0 ? void 0 : _d.tsConfig
+                : (_g = (_f = (_e = projectConfig.targets) === null || _e === void 0 ? void 0 : _e[target]) === null || _f === void 0 ? void 0 : _f.options) === null || _g === void 0 ? void 0 : _g.tsConfig) ||
+                (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), cypressConfigPathTs);
+            if (configuration) {
+                projectConfig.targets[target].configurations[configuration] = Object.assign(Object.assign({}, projectConfig.targets[target].configurations[configuration]), { cypressConfig: cypressConfigPathTs });
+            }
+            else {
+                projectConfig.targets[target].options = Object.assign(Object.assign({}, projectConfig.targets[target].options), { cypressConfig: cypressConfigPathTs });
+            }
+            projectConfig.targets[target].options.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;
+    }
+}
 function migrateCypressProject(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         (0, cypress_version_1.assertMinimumCypressVersion)(8);
@@ -17,50 +62,11 @@ function migrateCypressProject(tree) {
         // if we don't have the already migrated configs
         // it prevents us from being able to rename files for those projects
         const previousCypressConfigs = new Map();
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/cypress:cypress', (currentValue, projectName, target, configuration) => {
+            migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs);
+        });
         (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (currentValue, projectName, target, configuration) => {
-            var _a, _b, _c, _d, _e, _f, _g;
-            try {
-                const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-                const { cypressConfigPathJson, cypressConfigPathTs } = (0, conversion_util_1.findCypressConfigs)(tree, projectConfig, target, configuration);
-                if (!cypressConfigPathJson && !cypressConfigPathTs) {
-                    return;
-                }
-                // a matching cypress ts file hasn't been made yet. need to migrate.
-                if (tree.exists(cypressConfigPathJson) &&
-                    !tree.exists(cypressConfigPathTs)) {
-                    let cypressConfigs = (0, conversion_util_1.createNewCypressConfig)(tree, projectConfig, cypressConfigPathJson);
-                    cypressConfigs = (0, conversion_util_1.updatePluginFile)(tree, projectConfig, cypressConfigs);
-                    (0, conversion_util_1.writeNewConfig)(tree, cypressConfigPathTs, cypressConfigs);
-                    previousCypressConfigs.set(cypressConfigPathJson, cypressConfigs);
-                    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)) {
-                    const cypressConfigs = previousCypressConfigs.get(cypressConfigPathJson);
-                    (0, conversion_util_1.updateProjectPaths)(tree, projectConfig, cypressConfigs);
-                    (0, conversion_util_1.addConfigToTsConfig)(tree, (configuration
-                        ? (_d = (_c = (_b = (_a = projectConfig.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.configurations) === null || _c === void 0 ? void 0 : _c[configuration]) === null || _d === void 0 ? void 0 : _d.tsConfig
-                        : (_g = (_f = (_e = projectConfig.targets) === null || _e === void 0 ? void 0 : _e[target]) === null || _f === void 0 ? void 0 : _f.options) === null || _g === void 0 ? void 0 : _g.tsConfig) ||
-                        (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), cypressConfigPathTs);
-                    if (configuration) {
-                        projectConfig.targets[target].configurations[configuration] = Object.assign(Object.assign({}, projectConfig.targets[target].configurations[configuration]), { cypressConfig: cypressConfigPathTs });
-                    }
-                    else {
-                        projectConfig.targets[target].options = Object.assign(Object.assign({}, projectConfig.targets[target].options), { cypressConfig: cypressConfigPathTs });
-                    }
-                    projectConfig.targets[target].options.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;
-            }
+            migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs);
         });
         (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
             json.devDependencies['cypress'] = '^11.2.0';

package/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"migrate-to-cypress-11.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts"],"names":[],"mappings":";;;;AAAA,iEAGqC;AACrC,~~uCAUoB~~;AACpB,6FAA0F;AAE1F,uDAO2B;AAE3B,~~SAAsB~~,~~qBAAqB~~,~~CAAC~~,IAAU~~;;QACpD~~,~~IAAA~~,~~6CAA2B~~,~~EAAC~~,~~CAAC~~,~~CAAC~~,~~CAAC;QAC/B~~,~~IAAI~~,IAAA,yCAAuB,GAAE,IAAI,EAAE,EAAE;YACnC,eAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;YAC/D,OAAO;SACR;QACD,mEAAmE;QACnE,gDAAgD;QAChD,oEAAoE;QACpE,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAGnC,CAAC;QAEJ,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~~,IAAI,CAAC,qBAAqB,IAAI,CAAC,mBAAmB,EAAE;~~oBAClD~~,OAAO;~~iBACR~~;~~gBACD~~,oEAAoE;~~gBACpE~~,IACE,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC;~~oBAClC~~,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EACjC;~~oBACA~~,IAAI,cAAc,GAAG,IAAA,wCAAsB,EACzC,IAAI,EACJ,aAAa,EACb,qBAAqB,CACtB,CAAC;~~oBACF~~,cAAc,GAAG,IAAA,kCAAgB,~~EAC/B~~,IAAI,~~EACJ~~,aAAa,~~EACb~~,cAAc,~~CACf~~,CAAC;~~oBACF~~,IAAA,gCAAc,EAAC,IAAI,EAAE,mBAAmB,EAAE,cAAc,CAAC,CAAC;~~oBAE1D~~,sBAAsB,CAAC,GAAG,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;~~oBAClE~~,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~~,MAAM,cAAc,GAAG,sBAAsB,CAAC,GAAG,~~CAC/C~~,qBAAqB,~~CACtB~~,CAAC;~~oBAEF~~,IAAA,oCAAkB,EAAC,IAAI,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;~~oBACxD~~,IAAA,qCAAmB,EACjB,IAAI,EACJ,CAAC,aAAa;~~wBACZ~~,CAAC,CAAC,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,OAAO,0CAAG,MAAM,CAAC,0CAAE,cAAc,0CAAG,aAAa,CAAC,0CAC5D,QAAQ;~~wBACd~~,CAAC,CAAC,MAAA,MAAA,MAAA,aAAa,CAAC,OAAO,0CAAG,MAAM,CAAC,0CAAE,OAAO,0CAAE,QAAQ,CAAC;~~wBACrD~~,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EACxD,mBAAmB,CACpB,CAAC;~~oBAEF~~,IAAI,aAAa,EAAE;~~wBACjB~~,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,mCACtD,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,KAC9D,aAAa,EAAE,mBAAmB,GACnC,CAAC;~~qBACH~~;~~yBAAM~~;~~wBACL~~,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,mCAChC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,KACxC,aAAa,EAAE,mBAAmB,GACnC,CAAC;~~qBACH~~;~~oBAED~~,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;~~oBAE1D~~,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,SAAS,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YAC/B,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAY,EAAA;;;;;KAKvB,CAAC,CAAC;SACJ;QACD,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;~~AAhHD~~,~~sDAgHC~~;AAED,kBAAe,qBAAqB,CAAC"}
1	+ {"version":3,"file":"migrate-to-cypress-11.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts"],"names":[],"mappings":"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"}

package/src/utils/add-linter.js CHANGED Viewed

@@ -37,7 +37,7 @@ function addLinterToCyProject(tree, options) {
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, '.eslintrc.json'), (json) => {
             var _a;
             if (options.rootProject) {
-                json.plugins = ['@nrwl/nx'];
+                json.plugins = ['@nx/nx'];
                 json.extends = ['plugin:cypress/recommended'];
             }
             else {

package/src/utils/add-linter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-linter.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/add-linter.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AACpB,uCAA0D;AAC1D,8FAAgG;AAChG,uDAA4D;AAC5D,yCAAwD;AAqBxD,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAwB;;QAExB,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAClC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,EAAE;YACzE,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,CAAC,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBACvE,kBAAkB,EAAE;oBAClB,GAAG,aAAa,CAAC,IAAI,SAAS,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE;iBAC9D;gBACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;gBACxD,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CACH,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACvD,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;SACnC;QAED,KAAK,CAAC,IAAI,CACR,CAAC,OAAO,CAAC,eAAe;YACtB,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,EAAE,uBAAuB,EAAE,qCAA0B,EAAE,CACxD;YACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CACb,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,EACvD,CAAC,IAAI,EAAE,EAAE;;YACP,IAAI,OAAO,CAAC,WAAW,EAAE;gBACvB,IAAI,CAAC,OAAO,GAAG,CAAC,~~UAAU~~,CAAC,CAAC;~~gBAC5B~~,IAAI,CAAC,OAAO,GAAG,CAAC,4BAA4B,CAAC,CAAC;aAC/C;iBAAM;gBACL,IAAI,CAAC,OAAO,GAAG,CAAC,4BAA4B,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;aAChE;YACD,MAAA,IAAI,CAAC,SAAS,oCAAd,IAAI,CAAC,SAAS,GAAK,EAAE,EAAC;YACtB,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gDAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,MAAM,QAAQ,GAAG;gBACf,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;gBACzC,aAAa,EAAE,CAAC,OAAO,CAAC,uBAAuB;oBAC7C,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC;wBACE,OAAO,EAAE,GAAG,aAAa,CAAC,IAAI,mBAAmB;qBAClD;gBACL,KAAK,EAAE,EAAE;aACV,CAAC;YACF,MAAM,OAAO,GAAG;gDAET,QAAQ,KACX,KAAK,EAAE;wBACL,sBAAsB;wBACtB,GAAG,OAAO,CAAC,UAAU,uBAAuB;qBAC7C;aAEJ,CAAC;YACF,IAAI,OAAO,CAAC,iBAAiB,EAAE;gBAC7B,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,OAAO,EAAE,QAAQ,CAAC,CAAC;aACzC;iBAAM;gBACL,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;gBAChC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;aACjC;YAED,MAAM,SAAS,GAAG,IAAA,yCAAuB,GAAE,CAAC;YAC5C,IAAI,SAAS,IAAI,SAAS,GAAG,CAAC,EAAE;gBAC9B;;;mBAGG;gBACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;oBAClB,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,mBAAmB,CAAC;oBACjD,KAAK,EAAE;wBACL,oCAAoC,EAAE,KAAK;wBAC3C,UAAU,EAAE,KAAK;qBAClB;iBACF,CAAC,CAAC;aACJ;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAlGD,oDAkGC"}
1	+ {"version":3,"file":"add-linter.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/add-linter.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AACpB,uCAA0D;AAC1D,8FAAgG;AAChG,uDAA4D;AAC5D,yCAAwD;AAqBxD,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAwB;;QAExB,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAClC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,EAAE;YACzE,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,CAAC,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBACvE,kBAAkB,EAAE;oBAClB,GAAG,aAAa,CAAC,IAAI,SAAS,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE;iBAC9D;gBACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;gBACxD,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CACH,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACvD,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;SACnC;QAED,KAAK,CAAC,IAAI,CACR,CAAC,OAAO,CAAC,eAAe;YACtB,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,EAAE,uBAAuB,EAAE,qCAA0B,EAAE,CACxD;YACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CACb,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,EACvD,CAAC,IAAI,EAAE,EAAE;;YACP,IAAI,OAAO,CAAC,WAAW,EAAE;gBACvB,IAAI,CAAC,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC1B,IAAI,CAAC,OAAO,GAAG,CAAC,4BAA4B,CAAC,CAAC;aAC/C;iBAAM;gBACL,IAAI,CAAC,OAAO,GAAG,CAAC,4BAA4B,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;aAChE;YACD,MAAA,IAAI,CAAC,SAAS,oCAAd,IAAI,CAAC,SAAS,GAAK,EAAE,EAAC;YACtB,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gDAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,MAAM,QAAQ,GAAG;gBACf,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;gBACzC,aAAa,EAAE,CAAC,OAAO,CAAC,uBAAuB;oBAC7C,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC;wBACE,OAAO,EAAE,GAAG,aAAa,CAAC,IAAI,mBAAmB;qBAClD;gBACL,KAAK,EAAE,EAAE;aACV,CAAC;YACF,MAAM,OAAO,GAAG;gDAET,QAAQ,KACX,KAAK,EAAE;wBACL,sBAAsB;wBACtB,GAAG,OAAO,CAAC,UAAU,uBAAuB;qBAC7C;aAEJ,CAAC;YACF,IAAI,OAAO,CAAC,iBAAiB,EAAE;gBAC7B,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,OAAO,EAAE,QAAQ,CAAC,CAAC;aACzC;iBAAM;gBACL,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;gBAChC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;aACjC;YAED,MAAM,SAAS,GAAG,IAAA,yCAAuB,GAAE,CAAC;YAC5C,IAAI,SAAS,IAAI,SAAS,GAAG,CAAC,EAAE;gBAC9B;;;mBAGG;gBACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;oBAClB,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,mBAAmB,CAAC;oBACjD,KAAK,EAAE;wBACL,oCAAoC,EAAE,KAAK;wBAC3C,UAAU,EAAE,KAAK;qBAClB;iBACF,CAAC,CAAC;aACJ;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAlGD,oDAkGC"}