@nx/cypress 23.1.0-beta.3 → 23.1.0-beta.5

package/dist/src/generators/component-configuration/component-configuration.js

@@ -5,7 +5,8 @@ exports.componentConfigurationGeneratorInternal = componentConfigurationGenerato
 exports.updateTsConfigForComponentTesting = updateTsConfigForComponentTesting;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/js/internal");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 const assert_supported_cypress_version_1 = require("../../utils/assert-supported-cypress-version");
 const deprecation_1 = require("../../utils/deprecation");
 const versions_1 = require("../../utils/versions");
@@ -19,7 +20,7 @@ function componentConfigurationGenerator(tree, options) {
 }
 async function componentConfigurationGeneratorInternal(tree, options) {
     (0, assert_supported_cypress_version_1.assertSupportedCypressVersion)(tree);
-    (0, internal_1.assertNotUsingTsSolutionSetup)(tree, 'cypress', 'component-configuration');
+    (0, internal_2.assertNotUsingTsSolutionSetup)(tree, 'cypress', 'component-configuration');
     const tasks = [];
     const opts = normalizeOptions(tree, options);
     if (!(0, versions_1.getInstalledCypressMajorVersion)(tree)) {
@@ -115,14 +116,24 @@ function updateNxJsonConfiguration(tree, hasPlugin) {
             !cacheableOperations.includes('component-test')) {
             cacheableOperations.push('component-test');
         }
-        nxJson.targetDefaults ??= {};
-        nxJson.targetDefaults['component-test'] ??= {};
-        nxJson.targetDefaults['component-test'].cache ??= true;
-        nxJson.targetDefaults['component-test'] ??= {};
-        nxJson.targetDefaults['component-test'].inputs ??= [
-            'default',
-            productionFileSet ? '^production' : '^default',
-        ];
+        // Either a `target: 'component-test'` default or a default keyed on
+        // the executor we're scaffolding will apply to the new target — pick
+        // the more specific (target-keyed) when both are present.
+        const existingForTarget = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+            target: 'component-test',
+        });
+        const existingForExecutor = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+            executor: '@nx/cypress:cypress',
+        });
+        const existing = existingForTarget ?? existingForExecutor;
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            target: 'component-test',
+            cache: existing?.cache ?? true,
+            inputs: existing?.inputs ?? [
+                'default',
+                productionFileSet ? '^production' : '^default',
+            ],
+        });
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }

package/dist/src/generators/init/init.js

@@ -14,15 +14,33 @@ function setupE2ETargetDefaults(tree) {
         return;
     }
     // E2e targets depend on all their project's sources + production sources of dependencies
-    nxJson.targetDefaults ??= {};
     const productionFileSet = !!nxJson.namedInputs?.production;
-    nxJson.targetDefaults.e2e ??= {};
-    nxJson.targetDefaults.e2e.cache ??= true;
-    nxJson.targetDefaults.e2e.inputs ??= [
-        'default',
-        productionFileSet ? '^production' : '^default',
-    ];
-    (0, devkit_1.updateNxJson)(tree, nxJson);
+    const existing = findExistingE2eDefault(nxJson.targetDefaults);
+    const patch = {};
+    if (existing?.cache === undefined)
+        patch.cache = true;
+    if (existing?.inputs === undefined) {
+        patch.inputs = ['default', productionFileSet ? '^production' : '^default'];
+    }
+    if (Object.keys(patch).length > 0) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'e2e', ...patch });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+}
+function findExistingE2eDefault(td) {
+    if (!td)
+        return undefined;
+    const value = td['e2e'];
+    if (value === undefined)
+        return undefined;
+    if (Array.isArray(value)) {
+        const found = value.find((e) => e.filter === undefined);
+        if (!found)
+            return undefined;
+        const { filter: _f, ...rest } = found;
+        return rest;
+    }
+    return value;
 }
 function updateDependencies(tree, options) {
     const tasks = [];

package/dist/src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor.js

@@ -22,25 +22,42 @@ async function default_1(tree) {
     // update options from nx.json target defaults
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (nxJson.targetDefaults) {
-        for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
-            if (targetOrExecutor !== EXECUTOR_TO_MIGRATE &&
-                targetConfig.executor !== EXECUTOR_TO_MIGRATE) {
-                continue;
-            }
-            if (targetConfig.options) {
-                updateOptions(targetConfig);
-            }
-            Object.keys(targetConfig.configurations ?? {}).forEach((config) => {
-                updateConfiguration(targetConfig, config);
+        const targetDefaults = nxJson.targetDefaults;
+        for (const key of Object.keys(targetDefaults)) {
+            const value = targetDefaults[key];
+            const entries = Array.isArray(value)
+                ? value
+                : [value];
+            const usesExecutor = (entry) => key === EXECUTOR_TO_MIGRATE ||
+                entry.executor === EXECUTOR_TO_MIGRATE ||
+                entry.filter?.executor === EXECUTOR_TO_MIGRATE;
+            const kept = entries.filter((entry) => {
+                if (usesExecutor(entry)) {
+                    if (entry.options) {
+                        updateOptions(entry);
+                    }
+                    Object.keys(entry.configurations ?? {}).forEach((config) => {
+                        updateConfiguration(entry, config);
+                    });
+                }
+                // Drop entries left with nothing but their `filter`/`executor` locator.
+                return Object.keys(entry).some((k) => k !== 'filter' && k !== 'executor');
             });
-            if (!Object.keys(targetConfig).length ||
-                (Object.keys(targetConfig).length === 1 &&
-                    Object.keys(targetConfig)[0] === 'executor')) {
-                delete nxJson.targetDefaults[targetOrExecutor];
+            if (kept.length === 0) {
+                delete targetDefaults[key];
             }
-            if (!Object.keys(nxJson.targetDefaults).length) {
-                delete nxJson.targetDefaults;
+            else if (kept.length === 1 && kept[0].filter === undefined) {
+                // A lone unfiltered entry is stored as the plain object form (which
+                // omits `filter`).
+                const { filter: _filter, ...config } = kept[0];
+                targetDefaults[key] = config;
             }
+            else {
+                targetDefaults[key] = kept;
+            }
+        }
+        if (Object.keys(targetDefaults).length === 0) {
+            delete nxJson.targetDefaults;
         }
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "23.1.0-beta.3",
+  "version": "23.1.0-beta.5",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -89,12 +89,12 @@
     "semver": "^7.6.3",
     "tree-kill": "^1.2.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.1.0-beta.3",
-    "@nx/eslint": "23.1.0-beta.3",
-    "@nx/js": "23.1.0-beta.3"
+    "@nx/devkit": "23.1.0-beta.5",
+    "@nx/eslint": "23.1.0-beta.5",
+    "@nx/js": "23.1.0-beta.5"
   },
   "devDependencies": {
-    "nx": "23.1.0-beta.3"
+    "nx": "23.1.0-beta.5"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"