@nrwl/cypress 14.8.3 → 15.0.0-beta.1

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.8.3](https://github.com/nrwl/nx/compare/14.8.2...14.8.3) (2022-10-04)
+# [15.0.0-beta.1](https://github.com/nrwl/nx/compare/14.8.0...15.0.0-beta.1) (2022-10-05)
 
 **Note:** Version bump only for package @nrwl/cypress

package/migrations.json

@@ -42,6 +42,12 @@
       "version": "14.7.0-beta.0",
       "description": "Update Cypress if using v10 to support latest component testing features",
       "factory": "./src/migrations/update-14-7-0/update-cypress-version-if-10"
+    },
+    "add-cypress-inputs": {
+      "cli": "nx",
+      "version": "15.0.0-beta.0",
+      "description": "Stop hashing cypress spec files and config files for build targets and dependent tasks",
+      "factory": "./src/migrations/update-15-0-0/add-cypress-inputs"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/cypress",
-  "version": "14.8.3",
+  "version": "15.0.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -37,9 +37,9 @@
     "@babel/core": "^7.0.1",
     "@babel/preset-env": "^7.0.0",
     "@cypress/webpack-preprocessor": "^5.12.0",
-    "@nrwl/devkit": "14.8.3",
-    "@nrwl/linter": "14.8.3",
-    "@nrwl/workspace": "14.8.3",
+    "@nrwl/devkit": "15.0.0-beta.1",
+    "@nrwl/linter": "15.0.0-beta.1",
+    "@nrwl/workspace": "15.0.0-beta.1",
     "@phenomnomnominal/tsquery": "4.1.1",
     "babel-loader": "^8.0.2",
     "chalk": "4.1.0",
@@ -63,5 +63,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "c30d39a028f495c54811a8cd9cc09b84ac5130c8"
+  "gitHead": "49c5e5069b80605943ef3bbe965e291d79354cd5"
 }

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

@@ -33,7 +33,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "tslint", "none"],
+      "enum": ["eslint", "none"],
       "default": "eslint"
     },
     "js": {

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

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

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

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+function default_1(tree) {
+    var _a, _b, _c, _d;
+    var _e;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const workspaceConfiguration = (0, devkit_1.readWorkspaceConfiguration)(tree);
+        const { cypressTargets, hasComponentTesting } = getCypressTargetNames(tree);
+        const hasProductionFileset = !!((_a = workspaceConfiguration.namedInputs) === null || _a === void 0 ? void 0 : _a.production);
+        if (hasComponentTesting && hasProductionFileset && cypressTargets.size > 0) {
+            const productionFileset = new Set(workspaceConfiguration.namedInputs.production);
+            for (const exclusion of [
+                '!{projectRoot}/cypress/**/*',
+                '!{projectRoot}/**/*.cy.[jt]s?(x)',
+                '!{projectRoot}/cypress.config.[jt]s',
+            ]) {
+                productionFileset.add(exclusion);
+            }
+            workspaceConfiguration.namedInputs.production =
+                Array.from(productionFileset);
+        }
+        for (const targetName of cypressTargets) {
+            (_b = workspaceConfiguration.targetDefaults) !== null && _b !== void 0 ? _b : (workspaceConfiguration.targetDefaults = {});
+            const cypressTargetDefaults = ((_c = (_e = workspaceConfiguration.targetDefaults)[targetName]) !== null && _c !== void 0 ? _c : (_e[targetName] = {}));
+            (_d = cypressTargetDefaults.inputs) !== null && _d !== void 0 ? _d : (cypressTargetDefaults.inputs = [
+                'default',
+                hasProductionFileset ? '^production' : '^default',
+            ]);
+        }
+        (0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+function getCypressTargetNames(tree) {
+    const cypressTargets = new Set();
+    let hasComponentTesting = false;
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (options, __, target) => {
+        cypressTargets.add(target);
+        if (options.testingType === 'component') {
+            hasComponentTesting = true;
+        }
+    });
+    return { cypressTargets, hasComponentTesting };
+}
+//# sourceMappingURL=add-cypress-inputs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"add-cypress-inputs.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-15-0-0/add-cypress-inputs.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,iGAA8F;AAG9F,mBAA+B,IAAU;;;;QACvC,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAEhE,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5E,MAAM,oBAAoB,GAAG,CAAC,CAAC,CAAA,MAAA,sBAAsB,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;QAE9E,IAAI,mBAAmB,IAAI,oBAAoB,IAAI,cAAc,CAAC,IAAI,GAAG,CAAC,EAAE;YAC1E,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,sBAAsB,CAAC,WAAW,CAAC,UAAU,CAC9C,CAAC;YACF,KAAK,MAAM,SAAS,IAAI;gBACtB,6BAA6B;gBAC7B,kCAAkC;gBAClC,qCAAqC;aACtC,EAAE;gBACD,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aAClC;YACD,sBAAsB,CAAC,WAAW,CAAC,UAAU;gBAC3C,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SACjC;QAED,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE;YACvC,MAAA,sBAAsB,CAAC,cAAc,oCAArC,sBAAsB,CAAC,cAAc,GAAK,EAAE,EAAC;YAC7C,MAAM,qBAAqB,GAAG,aAAC,sBAAsB,CAAC,cAAc,EAClE,UAAU,wCAAV,UAAU,IACN,EAAE,EAAC,CAAC;YAEV,MAAA,qBAAqB,CAAC,MAAM,oCAA5B,qBAAqB,CAAC,MAAM,GAAK;gBAC/B,SAAS;gBACT,oBAAoB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;aAClD,EAAC;SACH;QAED,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;QAE3D,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AApCD,4BAoCC;AAED,SAAS,qBAAqB,CAAC,IAAU;IACvC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,IAAA,+CAAsB,EACpB,IAAI,EACJ,uBAAuB,EACvB,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;QACtB,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,OAAO,CAAC,WAAW,KAAK,WAAW,EAAE;YACvC,mBAAmB,GAAG,IAAI,CAAC;SAC5B;IACH,CAAC,CACF,CAAC;IACF,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC;AACjD,CAAC"}