@nx/cypress 23.0.0-rc.3 → 23.0.0-rc.4

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

@@ -5,8 +5,7 @@ exports.componentConfigurationGeneratorInternal = componentConfigurationGenerato
 exports.updateTsConfigForComponentTesting = updateTsConfigForComponentTesting;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/js/internal");
+const internal_1 = 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");
@@ -20,7 +19,7 @@ function componentConfigurationGenerator(tree, options) {
 }
 async function componentConfigurationGeneratorInternal(tree, options) {
     (0, assert_supported_cypress_version_1.assertSupportedCypressVersion)(tree);
-    (0, internal_2.assertNotUsingTsSolutionSetup)(tree, 'cypress', 'component-configuration');
+    (0, internal_1.assertNotUsingTsSolutionSetup)(tree, 'cypress', 'component-configuration');
     const tasks = [];
     const opts = normalizeOptions(tree, options);
     if (!(0, versions_1.getInstalledCypressMajorVersion)(tree)) {
@@ -116,24 +115,14 @@ function updateNxJsonConfiguration(tree, hasPlugin) {
             !cacheableOperations.includes('component-test')) {
             cacheableOperations.push('component-test');
         }
-        // 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',
-            ],
-        });
+        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',
+        ];
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }

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

@@ -14,26 +14,15 @@ function setupE2ETargetDefaults(tree) {
         return;
     }
     // E2e targets depend on all their project's sources + production sources of dependencies
+    nxJson.targetDefaults ??= {};
     const productionFileSet = !!nxJson.namedInputs?.production;
-    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;
-    if (Array.isArray(td)) {
-        return td.find((e) => e.target === 'e2e' && e.projects === undefined && e.plugin === undefined);
-    }
-    return td['e2e'];
+    nxJson.targetDefaults.e2e ??= {};
+    nxJson.targetDefaults.e2e.cache ??= true;
+    nxJson.targetDefaults.e2e.inputs ??= [
+        'default',
+        productionFileSet ? '^production' : '^default',
+    ];
+    (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 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,37 +22,25 @@ async function default_1(tree) {
     // update options from nx.json target defaults
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (nxJson.targetDefaults) {
-        const originalShape = nxJson.targetDefaults;
-        const entries = (0, internal_1.normalizeTargetDefaults)(originalShape);
-        const remaining = [];
-        for (const entry of entries) {
-            const matches = entry.executor === EXECUTOR_TO_MIGRATE ||
-                entry.target === EXECUTOR_TO_MIGRATE;
-            if (!matches) {
-                remaining.push(entry);
+        for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+            if (targetOrExecutor !== EXECUTOR_TO_MIGRATE &&
+                targetConfig.executor !== EXECUTOR_TO_MIGRATE) {
                 continue;
             }
-            if (entry.options) {
-                updateOptions(entry);
+            if (targetConfig.options) {
+                updateOptions(targetConfig);
             }
-            Object.keys(entry.configurations ?? {}).forEach((config) => {
-                updateConfiguration(entry, config);
+            Object.keys(targetConfig.configurations ?? {}).forEach((config) => {
+                updateConfiguration(targetConfig, config);
             });
-            const meaningfulKeys = Object.keys(entry).filter((k) => k !== 'target' &&
-                k !== 'executor' &&
-                k !== 'projects' &&
-                k !== 'plugin');
-            if (meaningfulKeys.length === 0)
-                continue;
-            remaining.push(entry);
-        }
-        if (remaining.length === 0) {
-            delete nxJson.targetDefaults;
-        }
-        else {
-            nxJson.targetDefaults = Array.isArray(originalShape)
-                ? remaining
-                : (0, internal_1.downgradeTargetDefaults)(remaining);
+            if (!Object.keys(targetConfig).length ||
+                (Object.keys(targetConfig).length === 1 &&
+                    Object.keys(targetConfig)[0] === 'executor')) {
+                delete nxJson.targetDefaults[targetOrExecutor];
+            }
+            if (!Object.keys(nxJson.targetDefaults).length) {
+                delete nxJson.targetDefaults;
+            }
         }
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "23.0.0-rc.3",
+  "version": "23.0.0-rc.4",
   "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.0.0-rc.3",
-    "@nx/eslint": "23.0.0-rc.3",
-    "@nx/js": "23.0.0-rc.3"
+    "@nx/devkit": "23.0.0-rc.4",
+    "@nx/eslint": "23.0.0-rc.4",
+    "@nx/js": "23.0.0-rc.4"
   },
   "devDependencies": {
-    "nx": "23.0.0-rc.3"
+    "nx": "23.0.0-rc.4"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"