@nx/cypress 23.0.0-beta.12 → 23.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "23.0.0-beta.12",
+  "version": "23.0.0-beta.13",
   "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 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.12",
-    "@nx/eslint": "23.0.0-beta.12",
-    "@nx/js": "23.0.0-beta.12",
+    "@nx/devkit": "23.0.0-beta.13",
+    "@nx/eslint": "23.0.0-beta.13",
+    "@nx/js": "23.0.0-beta.13",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "detect-port": "^2.1.0",
     "semver": "^7.6.3",
@@ -47,7 +47,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.12"
+    "nx": "23.0.0-beta.13"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"

package/plugins/cypress-preset.js

@@ -4,7 +4,7 @@ exports.nxBaseCypressPreset = nxBaseCypressPreset;
 exports.nxE2EPreset = nxE2EPreset;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const http_1 = require("http");
@@ -24,7 +24,7 @@ function nxBaseCypressPreset(pathToConfig, options) {
         : (0, path_1.dirname)(pathToConfig);
     const projectPath = (0, path_1.relative)(devkit_1.workspaceRoot, normalizedPath);
     const offset = (0, path_1.relative)(normalizedPath, devkit_1.workspaceRoot);
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+    const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)();
     const videosFolder = isTsSolutionSetup
         ? (0, path_1.join)('test-output', 'cypress', 'videos')
         : (0, path_1.join)(offset, 'dist', 'cypress', projectPath, 'videos');

package/src/generators/base-setup/base-setup.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addBaseCypressSetup = addBaseCypressSetup;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 function addBaseCypressSetup(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -12,7 +12,7 @@ function addBaseCypressSetup(tree, options) {
         return;
     }
     const opts = normalizeOptions(tree, projectConfig, options);
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isUsingTsSolutionConfig = (0, internal_1.isUsingTsSolutionSetup)(tree);
     const templateVars = {
         ...opts,
         jsx: !!opts.jsx,

package/src/generators/component-configuration/component-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/component-configuration/component-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAGjB,oBAAoB,EAKpB,IAAI,EAIL,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,mCAAmC,EAAE,MAAM,UAAU,CAAC;AAI/D,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BAM7C;AAED,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BA6C7C;AAkHD,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,QAsDpC;AAOD,eAAe,+BAA+B,CAAC"}
+{"version":3,"file":"component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/component-configuration/component-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAGjB,oBAAoB,EAKpB,IAAI,EAIL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,mCAAmC,EAAE,MAAM,UAAU,CAAC;AAI/D,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BAM7C;AAED,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BA6C7C;AA2HD,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,QAsDpC;AAOD,eAAe,+BAA+B,CAAC"}

package/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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+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, ts_solution_setup_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/src/generators/configuration/configuration.js

@@ -6,9 +6,7 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
-const package_manager_workspaces_1 = require("@nx/js/src/utils/package-manager-workspaces");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 const add_linter_1 = require("../../utils/add-linter");
 const assert_supported_cypress_version_1 = require("../../utils/assert-supported-cypress-version");
@@ -62,7 +60,7 @@ async function configurationGeneratorInternal(tree, options) {
         });
     }
     const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     if (isTsSolutionSetup) {
         createPackageJson(tree, opts);
         ignoreTestOutput(tree);
@@ -87,9 +85,9 @@ async function configurationGeneratorInternal(tree, options) {
         await (0, devkit_1.formatFiles)(tree);
     }
     if (isTsSolutionSetup) {
-        const projectPackageManagerWorkspaceState = (0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceState)(tree, projectRoot);
+        const projectPackageManagerWorkspaceState = (0, internal_2.getProjectPackageManagerWorkspaceState)(tree, projectRoot);
         if (projectPackageManagerWorkspaceState !== 'included') {
-            tasks.push((0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceStateWarningTask)(projectPackageManagerWorkspaceState, tree.root));
+            tasks.push((0, internal_2.getProjectPackageManagerWorkspaceStateWarningTask)(projectPackageManagerWorkspaceState, tree.root));
         }
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
@@ -105,7 +103,7 @@ function ensureDependencies(tree, options) {
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
 }
 async function normalizeOptions(tree, options) {
-    const linter = await (0, generator_prompts_1.normalizeLinterOption)(tree, options.linter);
+    const linter = await (0, internal_2.normalizeLinterOption)(tree, options.linter);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (projectConfig?.targets?.e2e) {
         throw new Error(`Project ${options.project} already has an e2e target.

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EACjB,YAAY,EAIZ,IAAI,EAEL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA+ClC,wBAAgB,SAAS,CACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,YAAY,EACnB,oBAAoB,EAAE,OAAO,iBAmB9B;AAmBD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,8BAErE;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,8BAgChB;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,iBAAiB,EACjB,YAAY,EAMZ,IAAI,EAEL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA4DlC,wBAAgB,SAAS,CACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,YAAY,EACnB,oBAAoB,EAAE,OAAO,iBAmB9B;AAmBD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,8BAErE;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,8BAgChB;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.js

@@ -14,15 +14,26 @@ 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;
+    if (Array.isArray(td)) {
+        return td.find((e) => e.target === 'e2e' && e.projects === undefined && e.plugin === undefined);
+    }
+    return td['e2e'];
 }
 function updateDependencies(tree, options) {
     const tasks = [];

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

@@ -1 +1 @@
-{"version":3,"file":"conversion.util.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/conversion.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EAGpB,IAAI,EAGL,MAAM,YAAY,CAAC;AAkBpB,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,EACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb;IACD,qBAAqB,EAAE,MAAM,CAAC;IAC9B,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CA4BA;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,EACnC,qBAAqB,EAAE,MAAM,GAC5B;IACD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC,CAoCA;AAED,wBAAgB,uBAAuB,CACrC,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,MAAM,GACxB;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,CAiC1D;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,EACnC,EACE,eAAe,EACf,iBAAiB,GAClB,EAAE;IACD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC,QAqGF;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,QA8BtB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,mBAAmB,EAAE,MAAM,EAC3B,cAAc,EAAE;IACd,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC,QA+BF;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,QAkB1B;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,EACnC,cAAc,EAAE;IACd,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC;qBAFkB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;uBACjB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;;uBAAnB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;EAmCzC"}
+{"version":3,"file":"conversion.util.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/conversion.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EAGpB,IAAI,EAGL,MAAM,YAAY,CAAC;AAiBpB,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,EACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb;IACD,qBAAqB,EAAE,MAAM,CAAC;IAC9B,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CA4BA;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,EACnC,qBAAqB,EAAE,MAAM,GAC5B;IACD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC,CAoCA;AAED,wBAAgB,uBAAuB,CACrC,kBAAkB,EAAE,MAAM,EAC1B,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,MAAM,GACxB;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,CAiC1D;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,EACnC,EACE,eAAe,EACf,iBAAiB,GAClB,EAAE;IACD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC,QAqGF;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,QA8BtB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,mBAAmB,EAAE,MAAM,EAC3B,cAAc,EAAE;IACd,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC,QA+BF;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,QAkB1B;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,EACnC,cAAc,EAAE;IACd,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC;qBAFkB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;uBACjB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;;uBAAnB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;EAmCzC"}

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

@@ -9,8 +9,7 @@ exports.writeNewConfig = writeNewConfig;
 exports.addConfigToTsConfig = addConfigToTsConfig;
 exports.updatePluginFile = updatePluginFile;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 let tsModule;
 let tsquery;
@@ -51,7 +50,7 @@ function createNewCypressConfig(tree, projectConfig, 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', ...restOfConfig } = cypressConfigJson;
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
     const newIntegrationFolder = tree.exists((0, devkit_1.joinPathFragments)(sourceRoot, 'integration'))
         ? 'src/e2e'
         : integrationFolder;
@@ -99,7 +98,7 @@ function createSupportFileImport(oldSupportFilePath, newSupportFilePath, project
 }
 function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfigJson, }) {
     const { integrationFolder, supportFile } = cypressConfigTs['e2e'];
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
     const oldIntegrationFolder = (0, devkit_1.joinPathFragments)(projectConfig.root, cypressConfigJson.integrationFolder);
     const newIntegrationFolder = (0, devkit_1.joinPathFragments)(projectConfig.root, integrationFolder);
     let newSupportFile;
@@ -165,10 +164,10 @@ function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfi
 }
 function updateImports(tree, filePath, oldImportPath, newImportPath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     if (!tsquery) {
-        (0, ensure_typescript_1.ensureTypescript)();
+        (0, internal_1.ensureTypescript)();
         tsquery = require('@phenomnomnominal/tsquery').tsquery;
     }
     const { isCallExpression, isExportDeclaration, isImportDeclaration } = tsModule;

package/src/migrations/update-20-8-0/remove-experimental-fetch-polyfill.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const config_1 = require("../../utils/config");
 const migrations_1 = require("../../utils/migrations");
@@ -15,7 +15,7 @@ async function default_1(tree) {
             // cypress config file doesn't exist, so skip
             continue;
         }
-        ts ??= (0, ensure_typescript_1.ensureTypescript)();
+        ts ??= (0, internal_1.ensureTypescript)();
         printer ??= ts.createPrinter();
         const cypressConfig = tree.read(cypressConfigPath, 'utf-8');
         const updatedConfig = removeExperimentalFetchPolyfill(cypressConfig);

package/src/migrations/update-20-8-0/replace-experimental-just-in-time-compile.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_2 = require("@nx/js/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const node_path_1 = require("node:path");
 const config_1 = require("../../utils/config");
@@ -33,7 +33,7 @@ async function updateCtJustInTimeCompile(tree, cypressConfigPath) {
         // no component config, leave as is
         return cypressConfig;
     }
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_2.ensureTypescript)();
     printer ??= ts.createPrinter();
     const sourceFile = (0, tsquery_1.ast)(cypressConfig);
     let updatedConfig = config;

package/src/migrations/update-20-8-0/set-inject-document-domain.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const config_1 = require("../../utils/config");
 const migrations_1 = require("../../utils/migrations");
@@ -16,7 +16,7 @@ async function default_1(tree) {
             // cypress config file doesn't exist, so skip
             continue;
         }
-        ts ??= (0, ensure_typescript_1.ensureTypescript)();
+        ts ??= (0, internal_1.ensureTypescript)();
         printer ??= ts.createPrinter();
         const cypressConfig = tree.read(cypressConfigPath, 'utf-8');
         const updatedConfig = setInjectDocumentDomain(cypressConfig);

package/src/migrations/update-20-8-0/update-component-testing-mount-imports.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const semver_1 = require("semver");
 const config_1 = require("../../utils/config");
@@ -16,7 +16,7 @@ async function default_1(tree) {
             // cypress config file doesn't exist, so skip
             continue;
         }
-        ts ??= (0, ensure_typescript_1.ensureTypescript)();
+        ts ??= (0, internal_1.ensureTypescript)();
         printer ??= ts.createPrinter();
         const migrationInfo = parseMigrationInfo(tree, cypressConfigPath, projectName, projectGraph);
         if (!migrationInfo) {

package/src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-tsconfig-and-copy-files-options-from-cypress-executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAKpB,yBAA+B,IAAI,EAAE,IAAI,iBA8DxC"}
+{"version":3,"file":"remove-tsconfig-and-copy-files-options-from-cypress-executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EAML,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAKpB,yBAA+B,IAAI,EAAE,IAAI,iBAmExC"}

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

@@ -22,25 +22,37 @@ 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) {
+        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);
                 continue;
             }
-            if (targetConfig.options) {
-                updateOptions(targetConfig);
+            if (entry.options) {
+                updateOptions(entry);
             }
-            Object.keys(targetConfig.configurations ?? {}).forEach((config) => {
-                updateConfiguration(targetConfig, config);
+            Object.keys(entry.configurations ?? {}).forEach((config) => {
+                updateConfiguration(entry, config);
             });
-            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;
-            }
+            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);
         }
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }

package/src/migrations/update-22-1-0/rename-cy-exec-code-property.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = renameCyExecCodeProperty;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const migrations_1 = require("../../utils/migrations");
 let ts;
@@ -28,7 +28,7 @@ function updateCyExecItsCalls(fileContent) {
         !fileContent.includes('its(`code`)')) {
         return fileContent;
     }
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     const sourceFile = (0, tsquery_1.ast)(fileContent);
     const updates = [];
     const callExpressions = (0, tsquery_1.query)(sourceFile, 'CallExpression:has(PropertyAccessExpression > Identifier[name="its"])');
@@ -62,7 +62,7 @@ function shouldUpdateCallExpression(node) {
     if (!node.arguments.length) {
         return false;
     }
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     const firstArg = node.arguments[0];
     if (!(ts.isStringLiteral(firstArg) ||
         ts.isNoSubstitutionTemplateLiteral(firstArg)) ||
@@ -78,7 +78,7 @@ function shouldUpdateCallExpression(node) {
     return isDerivedFromCyExec(node.expression.expression);
 }
 function isDerivedFromCyExec(expression) {
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     if (ts.isCallExpression(expression)) {
         return isDerivedFromCyExec(expression.expression);
     }

package/src/migrations/update-22-1-0/update-angular-component-testing-support.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = updateAngularComponentTestingSupport;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const semver_1 = require("semver");
 const config_1 = require("../../utils/config");
@@ -33,7 +33,7 @@ async function updateAngularComponentTestingSupport(tree) {
     await (0, devkit_1.formatFiles)(tree);
 }
 async function getMigrationInfo(tree, cypressConfigPath, projectName, projectGraph) {
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     const cypressConfig = tree.read(cypressConfigPath, 'utf-8');
     const config = (0, config_1.resolveCypressConfigObject)(cypressConfig);
     if (!config) {
@@ -54,7 +54,7 @@ async function getMigrationInfo(tree, cypressConfigPath, projectName, projectGra
     return (0, semver_1.lt)(angularVersion, DEPRECATED_MAX_ANGULAR_VERSION);
 }
 function migrateProject(tree, projectConfig) {
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     printer ??= ts.createPrinter();
     (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
         if (!isJsTsFile(filePath) || !tree.exists(filePath)) {
@@ -76,7 +76,7 @@ function migrateProject(tree, projectConfig) {
     });
 }
 function resolveFramework(cypressConfig, config, projectName, projectGraph) {
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     const frameworkProperty = (0, tsquery_1.query)(config, 'PropertyAssignment:has(Identifier[name=component]) PropertyAssignment:has(Identifier[name=devServer]) PropertyAssignment:has(Identifier[name=framework])')[0];
     if (frameworkProperty) {
         return ts.isStringLiteral(frameworkProperty.initializer)

package/src/migrations/update-22-1-0/update-selector-playground-api.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = updateSelectorPlaygroundApi;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const migrations_1 = require("../../utils/migrations");
 let printer;
@@ -31,7 +31,7 @@ function migrateSelectorPlaygroundApi(fileContent) {
         !updated.includes('Cypress.SelectorPlayground')) {
         return updated;
     }
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     printer ??= ts.createPrinter();
     const sourceFile = (0, tsquery_1.ast)(updated);
     let hasChanges = false;
@@ -85,7 +85,7 @@ function migrateSelectorPlaygroundApi(fileContent) {
     return hasChanges ? result : updated;
 }
 function isOnElementProperty(name) {
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     if (ts.isIdentifier(name)) {
         return name.text === 'onElement';
     }

package/src/utils/config.js

@@ -40,7 +40,7 @@ exports.addMountDefinition = addMountDefinition;
 exports.getProjectCypressConfigPath = getProjectCypressConfigPath;
 exports.resolveCypressConfigObject = resolveCypressConfigObject;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 exports.CYPRESS_CONFIG_FILE_NAME_PATTERN = 'cypress.config.{js,ts,mjs,cjs}';
 const TS_QUERY_COMMON_JS_EXPORT_SELECTOR = 'BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"])';
 const TS_QUERY_EXPORT_CONFIG_PREFIX = `:matches(ExportAssignment, ${TS_QUERY_COMMON_JS_EXPORT_SELECTOR}) `;
@@ -153,7 +153,7 @@ function getProjectCypressConfigPath(tree, projectRoot) {
     return cypressConfigPaths[0];
 }
 function resolveCypressConfigObject(cypressConfigContents) {
-    const ts = (0, ensure_typescript_1.ensureTypescript)();
+    const ts = (0, internal_1.ensureTypescript)();
     const { tsquery } = (require('@phenomnomnominal/tsquery'));
     const sourceFile = tsquery.ast(cypressConfigContents);
     const exportDefaultStatement = sourceFile.statements.find((statement) => ts.isExportAssignment(statement));
@@ -169,7 +169,7 @@ function resolveCypressConfigObject(cypressConfigContents) {
     return null;
 }
 function resolveCypressConfigObjectFromExportExpression(exportExpression, sourceFile) {
-    const ts = (0, ensure_typescript_1.ensureTypescript)();
+    const ts = (0, internal_1.ensureTypescript)();
     if (ts.isObjectLiteralExpression(exportExpression)) {
         return exportExpression;
     }

package/src/utils/migrations.js

@@ -5,7 +5,7 @@ exports.getObjectProperty = getObjectProperty;
 exports.removeObjectProperty = removeObjectProperty;
 exports.updateObjectProperty = updateObjectProperty;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const config_1 = require("./config");
 let ts;
@@ -40,15 +40,15 @@ async function* cypressProjectConfigs(tree) {
     }
 }
 function getObjectProperty(config, name) {
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     return config.properties.find((p) => ts.isPropertyAssignment(p) && p.name.getText() === name);
 }
 function removeObjectProperty(config, property) {
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     return ts.factory.updateObjectLiteralExpression(config, config.properties.filter((p) => p !== property));
 }
 function updateObjectProperty(config, property, { newName, newValue }) {
-    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    ts ??= (0, internal_1.ensureTypescript)();
     if (!newName && !newValue) {
         throw new Error('newName or newValue must be provided');
     }