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

package/dist/internal.d.ts

@@ -7,8 +7,7 @@ export { migrateProjectExecutorsToPlugin, migrateProjectExecutorsToPluginV1, NoT
 export { processTargetOutputs, deleteMatchingProperties, toProjectRelativePath, } from './src/generators/plugin-migrations/plugin-migration-utils';
 export { determineProjectNameAndRootOptions, ensureRootProjectName, resolveImportPath, } from './src/generators/project-name-and-root-utils';
 export { promptWhenInteractive } from './src/generators/prompt';
-export { addBuildTargetDefaults, addE2eCiTargetDefaults, findTargetDefault, readTargetDefaultsForTarget, upsertTargetDefault, } from './src/generators/target-defaults-utils';
-export { downgradeTargetDefaults, normalizeTargetDefaults, } from './src/utils/normalize-target-defaults';
+export { addBuildTargetDefaults, addE2eCiTargetDefaults, } from './src/generators/target-defaults-utils';
 export { addPlugin } from './src/utils/add-plugin';
 export { getDeclaredPackageVersion, getInstalledPackageVersion, } from './src/utils/installed-version';
 export { assertSupportedInstalledPackageVersion, assertSupportedPackageVersion, } from './src/utils/version-floor';

package/dist/internal.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eachValueFrom = exports.logShowProjectCommand = exports.getNamedInputs = exports.findPluginForConfigFile = exports.clearRequireCache = exports.loadConfigFile = exports.getCatalogManager = exports.calculateHashesForCreateNodes = exports.calculateHashForCreateNodes = exports.mapAsyncIterable = exports.combineAsyncIterables = exports.createAsyncIterable = exports.assertSupportedPackageVersion = exports.assertSupportedInstalledPackageVersion = exports.getInstalledPackageVersion = exports.getDeclaredPackageVersion = exports.addPlugin = exports.normalizeTargetDefaults = exports.downgradeTargetDefaults = exports.upsertTargetDefault = exports.readTargetDefaultsForTarget = exports.findTargetDefault = exports.addE2eCiTargetDefaults = exports.addBuildTargetDefaults = exports.promptWhenInteractive = exports.resolveImportPath = exports.ensureRootProjectName = exports.determineProjectNameAndRootOptions = exports.toProjectRelativePath = exports.deleteMatchingProperties = exports.processTargetOutputs = exports.NoTargetsToMigrateError = exports.migrateProjectExecutorsToPluginV1 = exports.migrateProjectExecutorsToPlugin = exports.AggregatedLog = exports.forEachExecutorOptions = exports.getE2EWebServerInfo = exports.getRelativeCwd = exports.determineArtifactNameAndDirectoryOptions = exports.PromptResolutionError = exports.resolvePrompt = exports.SchemaResolutionError = exports.ImplementationResolutionError = exports.resolveSchema = exports.resolveImplementation = exports.emitPluginWorkerLog = exports.safeWriteFileCache = exports.PluginCache = exports.createProjectRootMappingsFromProjectConfigurations = exports.signalToCode = void 0;
-exports.dasherize = exports.classify = exports.capitalize = exports.camelize = exports.checkAndCleanWithSemver = void 0;
+exports.dasherize = exports.classify = exports.capitalize = exports.camelize = exports.checkAndCleanWithSemver = exports.eachValueFrom = exports.logShowProjectCommand = exports.getNamedInputs = exports.findPluginForConfigFile = exports.clearRequireCache = exports.loadConfigFile = exports.getCatalogManager = exports.calculateHashesForCreateNodes = exports.calculateHashForCreateNodes = exports.mapAsyncIterable = exports.combineAsyncIterables = exports.createAsyncIterable = exports.assertSupportedPackageVersion = exports.assertSupportedInstalledPackageVersion = exports.getInstalledPackageVersion = exports.getDeclaredPackageVersion = exports.addPlugin = exports.addE2eCiTargetDefaults = exports.addBuildTargetDefaults = exports.promptWhenInteractive = exports.resolveImportPath = exports.ensureRootProjectName = exports.determineProjectNameAndRootOptions = exports.toProjectRelativePath = exports.deleteMatchingProperties = exports.processTargetOutputs = exports.NoTargetsToMigrateError = exports.migrateProjectExecutorsToPluginV1 = exports.migrateProjectExecutorsToPlugin = exports.AggregatedLog = exports.forEachExecutorOptions = exports.getE2EWebServerInfo = exports.getRelativeCwd = exports.determineArtifactNameAndDirectoryOptions = exports.PromptResolutionError = exports.resolvePrompt = exports.SchemaResolutionError = exports.ImplementationResolutionError = exports.resolveSchema = exports.resolveImplementation = exports.emitPluginWorkerLog = exports.safeWriteFileCache = exports.PluginCache = exports.createProjectRootMappingsFromProjectConfigurations = exports.signalToCode = void 0;
 var devkit_internals_1 = require("nx/src/devkit-internals");
 Object.defineProperty(exports, "signalToCode", { enumerable: true, get: function () { return devkit_internals_1.signalToCode; } });
 Object.defineProperty(exports, "createProjectRootMappingsFromProjectConfigurations", { enumerable: true, get: function () { return devkit_internals_1.createProjectRootMappingsFromProjectConfigurations; } });
@@ -41,12 +40,6 @@ Object.defineProperty(exports, "promptWhenInteractive", { enumerable: true, get:
 var target_defaults_utils_1 = require("./src/generators/target-defaults-utils");
 Object.defineProperty(exports, "addBuildTargetDefaults", { enumerable: true, get: function () { return target_defaults_utils_1.addBuildTargetDefaults; } });
 Object.defineProperty(exports, "addE2eCiTargetDefaults", { enumerable: true, get: function () { return target_defaults_utils_1.addE2eCiTargetDefaults; } });
-Object.defineProperty(exports, "findTargetDefault", { enumerable: true, get: function () { return target_defaults_utils_1.findTargetDefault; } });
-Object.defineProperty(exports, "readTargetDefaultsForTarget", { enumerable: true, get: function () { return target_defaults_utils_1.readTargetDefaultsForTarget; } });
-Object.defineProperty(exports, "upsertTargetDefault", { enumerable: true, get: function () { return target_defaults_utils_1.upsertTargetDefault; } });
-var normalize_target_defaults_1 = require("./src/utils/normalize-target-defaults");
-Object.defineProperty(exports, "downgradeTargetDefaults", { enumerable: true, get: function () { return normalize_target_defaults_1.downgradeTargetDefaults; } });
-Object.defineProperty(exports, "normalizeTargetDefaults", { enumerable: true, get: function () { return normalize_target_defaults_1.normalizeTargetDefaults; } });
 // Utils
 var add_plugin_1 = require("./src/utils/add-plugin");
 Object.defineProperty(exports, "addPlugin", { enumerable: true, get: function () { return add_plugin_1.addPlugin; } });

package/dist/src/generators/e2e-web-server-info-utils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getE2EWebServerInfo = getE2EWebServerInfo;
 const devkit_exports_1 = require("nx/src/devkit-exports");
-const target_defaults_utils_1 = require("./target-defaults-utils");
 const find_plugin_for_config_file_1 = require("../utils/find-plugin-for-config-file");
 async function getE2EWebServerInfo(tree, projectName, pluginOptions, defaultValues, isPluginBeingAdded) {
     const pm = (0, devkit_exports_1.getPackageManagerCommand)((0, devkit_exports_1.detectPackageManager)(tree.root));
@@ -34,18 +33,23 @@ async function getE2EWebServerInfoForPlugin(tree, projectName, pluginOptions, de
     }
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     let e2ePort = defaultValues.defaultE2EPort ?? 4200;
-    const serveTargetName = foundPlugin.options[pluginOptions.serveTargetName] ??
-        defaultValues.defaultServeTargetName;
-    e2ePort =
-        (0, target_defaults_utils_1.readTargetDefaultsForTarget)(serveTargetName, nxJson.targetDefaults)?.options
-            ?.port ?? e2ePort;
+    if (nxJson.targetDefaults?.[foundPlugin.options[pluginOptions.serveTargetName] ??
+        defaultValues.defaultServeTargetName] &&
+        nxJson.targetDefaults?.[foundPlugin.options[pluginOptions.serveTargetName] ??
+            defaultValues.defaultServeTargetName].options?.port) {
+        e2ePort =
+            nxJson.targetDefaults?.[foundPlugin.options[pluginOptions.serveTargetName] ??
+                defaultValues.defaultServeTargetName].options?.port;
+    }
     const e2eWebServerAddress = defaultValues.defaultE2EWebServerAddress.replace(/:\d+/, `:${e2ePort}`);
     return {
         e2eWebServerAddress,
-        e2eWebServerCommand: `${pm.exec} nx run ${projectName}:${serveTargetName}`,
+        e2eWebServerCommand: `${pm.exec} nx run ${projectName}:${foundPlugin.options[pluginOptions.serveTargetName] ??
+            defaultValues.defaultServeTargetName}`,
         e2eCiWebServerCommand: `${pm.exec} nx run ${projectName}:${foundPlugin.options[pluginOptions.serveStaticTargetName] ??
             defaultValues.defaultServeStaticTargetName}`,
         e2eCiBaseUrl: defaultValues.defaultE2ECiBaseUrl,
-        e2eDevServerTarget: `${projectName}:${serveTargetName}`,
+        e2eDevServerTarget: `${projectName}:${foundPlugin.options[pluginOptions.serveTargetName] ??
+            defaultValues.defaultServeTargetName}`,
     };
 }

package/dist/src/generators/plugin-migrations/executor-to-plugin-migrator.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
-import { type CreateNodes, type NxJsonConfiguration, type ProjectGraph, type TargetConfiguration, type Tree } from 'nx/src/devkit-exports';
+import { type CreateNodes, type ProjectGraph, type TargetConfiguration, type Tree } from 'nx/src/devkit-exports';
 import { logger as devkitLogger } from 'nx/src/devkit-exports';
 export type InferredTargetConfiguration = TargetConfiguration & {
     name: string;
@@ -13,7 +13,6 @@ type SkipProjectFilter = (projectConfiguration: ProjectConfiguration) => false |
 export declare class NoTargetsToMigrateError extends Error {
     constructor();
 }
-export declare function readTargetDefaultsForExecutor(executor: string, targetDefaults: NxJsonConfiguration['targetDefaults'] | undefined): Partial<TargetConfiguration> | undefined;
 export declare function migrateProjectExecutorsToPlugin<T>(tree: Tree, projectGraph: ProjectGraph, pluginPath: string, createNodesV2: CreateNodes<T>, defaultPluginOptions: T, migrations: Array<{
     executors: string[];
     targetPluginOptionMapper: (targetName: string) => Partial<T>;

package/dist/src/generators/plugin-migrations/executor-to-plugin-migrator.js

@@ -2,7 +2,6 @@
 var _ExecutorToPluginMigrator_instances, _ExecutorToPluginMigrator_projectGraph, _ExecutorToPluginMigrator_executor, _ExecutorToPluginMigrator_pluginPath, _ExecutorToPluginMigrator_pluginOptionsBuilder, _ExecutorToPluginMigrator_postTargetTransformer, _ExecutorToPluginMigrator_skipTargetFilter, _ExecutorToPluginMigrator_skipProjectFilter, _ExecutorToPluginMigrator_specificProjectToMigrate, _ExecutorToPluginMigrator_logger, _ExecutorToPluginMigrator_nxJson, _ExecutorToPluginMigrator_targetDefaultsForExecutor, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, _ExecutorToPluginMigrator_createNodes, _ExecutorToPluginMigrator_createNodesV2, _ExecutorToPluginMigrator_createNodesResultsForTargets, _ExecutorToPluginMigrator_skippedProjects, _ExecutorToPluginMigrator_init, _ExecutorToPluginMigrator_migrateTarget, _ExecutorToPluginMigrator_migrateProject, _ExecutorToPluginMigrator_mergeInputs, _ExecutorToPluginMigrator_getTargetAndProjectsToMigrate, _ExecutorToPluginMigrator_getTargetDefaultsForExecutor, _ExecutorToPluginMigrator_getCreatedTargetForProjectRoot, _ExecutorToPluginMigrator_getCreateNodesResults;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoTargetsToMigrateError = void 0;
-exports.readTargetDefaultsForExecutor = readTargetDefaultsForExecutor;
 exports.migrateProjectExecutorsToPlugin = migrateProjectExecutorsToPlugin;
 exports.migrateProjectExecutorsToPluginV1 = migrateProjectExecutorsToPluginV1;
 const tslib_1 = require("tslib");
@@ -12,7 +11,6 @@ const posix_1 = require("node:path/posix");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const executor_options_utils_1 = require("../executor-options-utils");
-const target_defaults_utils_1 = require("../target-defaults-utils");
 const plugin_migration_utils_1 = require("./plugin-migration-utils");
 const devkit_exports_2 = require("nx/src/devkit-exports");
 class ExecutorToPluginMigrator {
@@ -171,7 +169,7 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
         }
     });
 }, _ExecutorToPluginMigrator_getTargetDefaultsForExecutor = function _ExecutorToPluginMigrator_getTargetDefaultsForExecutor() {
-    tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_targetDefaultsForExecutor, structuredClone(readTargetDefaultsForExecutor(tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_executor, "f"), tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f").targetDefaults) ?? {}), "f");
+    tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_targetDefaultsForExecutor, structuredClone(tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f").targetDefaults?.[tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_executor, "f")]), "f");
 }, _ExecutorToPluginMigrator_getCreatedTargetForProjectRoot = function _ExecutorToPluginMigrator_getCreatedTargetForProjectRoot(targetName, projectRoot) {
     const entry = Object.entries(tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodesResultsForTargets, "f").get(targetName)?.projects ?? {}).find(([root]) => root === projectRoot);
     if (!entry) {
@@ -206,22 +204,6 @@ class NoTargetsToMigrateError extends Error {
     }
 }
 exports.NoTargetsToMigrateError = NoTargetsToMigrateError;
-function readTargetDefaultsForExecutor(executor, targetDefaults) {
-    // Preserve the legacy record-shape semantics this migrator used before
-    // array support: only an unfiltered default keyed directly by executor
-    // applies here. Target-scoped or filtered array entries remain opt-in
-    // behaviors for callers that can evaluate them in project context.
-    const entry = (0, target_defaults_utils_1.findTargetDefault)(targetDefaults, { executor });
-    if (!entry) {
-        return undefined;
-    }
-    const config = { ...entry };
-    delete config.target;
-    delete config.executor;
-    delete config.projects;
-    delete config.plugin;
-    return config;
-}
 async function migrateProjectExecutorsToPlugin(tree, projectGraph, pluginPath, createNodesV2, defaultPluginOptions, migrations, specificProjectToMigrate, logger) {
     const projects = await migrateProjects(tree, projectGraph, pluginPath, undefined, createNodesV2, defaultPluginOptions, migrations, specificProjectToMigrate, logger);
     return projects;

package/dist/src/generators/target-defaults-utils.d.ts

@@ -1,31 +1,3 @@
-import { type NxJsonConfiguration, type TargetConfiguration, type TargetDefaultEntry, type TargetDefaults, type Tree } from 'nx/src/devkit-exports';
-import { readTargetDefaultsForTarget as readTargetDefaultsForTargetFromNx } from 'nx/src/devkit-internals';
-/**
- * Upsert a `targetDefaults` entry on the provided `nxJson`. Mutates
- * `nxJson` in place and returns it so the caller can chain or batch
- * other edits before persisting via `updateNxJson` exactly once.
- *
- * Always writes the array shape — if the underlying value still uses
- * the legacy record shape, it is upgraded in place. Finds a matching
- * entry by the `(target, executor, projects, plugin)` tuple and merges
- * the given config into it, or appends a new entry. The entry must set
- * at least one of `target` / `executor`.
- */
-export declare function upsertTargetDefault(tree: Tree, nxJson: NxJsonConfiguration, options: TargetDefaultEntry): NxJsonConfiguration;
-/**
- * Find a `targetDefaults` entry by its locator tuple
- * `(target, executor, projects, plugin)`. Locator keys default to
- * `undefined`, matching only entries that also leave them unset — same
- * semantics as `upsertTargetDefault`. Accepts either array or legacy
- * record shape.
- *
- * Throws when called with an empty locator (no `target`, `executor`,
- * `projects`, or `plugin`). An empty locator is almost always a bug —
- * the caller intended to find a specific entry but forgot to populate
- * the lookup. Returning the first matching entry (or `undefined`) would
- * silently mask the mistake.
- */
-export declare function findTargetDefault(targetDefaults: TargetDefaults | undefined, locator: Pick<TargetDefaultEntry, 'target' | 'executor' | 'projects' | 'plugin'>): TargetDefaultEntry | undefined;
-export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults | undefined, executor?: string, opts?: Parameters<typeof readTargetDefaultsForTargetFromNx>[3]): Partial<TargetConfiguration> | null;
+import { type TargetConfiguration, type Tree } from 'nx/src/devkit-exports';
 export declare function addBuildTargetDefaults(tree: Tree, executorName: string, buildTargetName?: string, extraInputs?: TargetConfiguration['inputs']): void;
 export declare function addE2eCiTargetDefaults(tree: Tree, e2ePlugin: string, buildTarget: string, pathToE2EConfigFile: string): Promise<void>;

package/dist/src/generators/target-defaults-utils.js

@@ -1,168 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsertTargetDefault = upsertTargetDefault;
-exports.findTargetDefault = findTargetDefault;
-exports.readTargetDefaultsForTarget = readTargetDefaultsForTarget;
 exports.addBuildTargetDefaults = addBuildTargetDefaults;
 exports.addE2eCiTargetDefaults = addE2eCiTargetDefaults;
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const minimatch_1 = require("minimatch");
-const semver_1 = require("semver");
-const package_json_1 = require("../utils/package-json");
-const normalize_target_defaults_1 = require("../utils/normalize-target-defaults");
-// Only write the array shape on nx >= 23 (workspace placeholder "0.0.1"
-// counts as modern); older nx can't validate it. Major-only compare so
-// pre-release tags like `23.0.0-beta.8` count as nx 23.
-const SUPPORTS_ARRAY_TARGET_DEFAULTS = !(0, semver_1.valid)(package_json_1.NX_VERSION) || package_json_1.NX_VERSION === '0.0.1' || (0, semver_1.major)(package_json_1.NX_VERSION) >= 23;
-/**
- * Upsert a `targetDefaults` entry on the provided `nxJson`. Mutates
- * `nxJson` in place and returns it so the caller can chain or batch
- * other edits before persisting via `updateNxJson` exactly once.
- *
- * Always writes the array shape — if the underlying value still uses
- * the legacy record shape, it is upgraded in place. Finds a matching
- * entry by the `(target, executor, projects, plugin)` tuple and merges
- * the given config into it, or appends a new entry. The entry must set
- * at least one of `target` / `executor`.
- */
-function upsertTargetDefault(tree, nxJson, options) {
-    if (options.target === undefined && options.executor === undefined) {
-        throw new Error('upsertTargetDefault requires at least one of `target` or `executor` to be set.');
-    }
-    const { target, executor, projects, plugin, ...config } = options;
-    const originalShape = nxJson.targetDefaults;
-    // Copy — `normalizeTargetDefaults` returns the input array as-is when
-    // it's already array shape. Without the spread, `entries[matchIndex] = ...`
-    // and `entries.push(...)` would mutate the user's array reference (and
-    // any other holders of the same `nxJson.targetDefaults` reference).
-    const entries = [...normalizeTargetDefaultsForUpsert(tree, originalShape)];
-    const matchIndex = entries.findIndex((e) => e.target === target &&
-        e.executor === executor &&
-        projectsEqual(e.projects, projects) &&
-        e.plugin === plugin);
-    if (matchIndex >= 0) {
-        const existing = entries[matchIndex];
-        const { target: et, executor: ee, projects: ep, plugin: ep2, ...existingRest } = existing;
-        entries[matchIndex] = buildTargetDefaultEntry(target ?? et, projects ?? ep, plugin ?? ep2, executor ?? ee, { ...existingRest, ...config });
-    }
-    else {
-        entries.push(buildTargetDefaultEntry(target, projects, plugin, executor, config));
-    }
-    // Preserve the record shape on pre-v23 nx when possible; promote to
-    // array if any entry can't be represented in record form.
-    if (SUPPORTS_ARRAY_TARGET_DEFAULTS || Array.isArray(originalShape)) {
-        nxJson.targetDefaults = entries;
-    }
-    else {
-        try {
-            nxJson.targetDefaults = (0, normalize_target_defaults_1.downgradeTargetDefaults)(entries);
-        }
-        catch {
-            nxJson.targetDefaults = entries;
-        }
-    }
-    return nxJson;
-}
-/**
- * Find a `targetDefaults` entry by its locator tuple
- * `(target, executor, projects, plugin)`. Locator keys default to
- * `undefined`, matching only entries that also leave them unset — same
- * semantics as `upsertTargetDefault`. Accepts either array or legacy
- * record shape.
- *
- * Throws when called with an empty locator (no `target`, `executor`,
- * `projects`, or `plugin`). An empty locator is almost always a bug —
- * the caller intended to find a specific entry but forgot to populate
- * the lookup. Returning the first matching entry (or `undefined`) would
- * silently mask the mistake.
- */
-function findTargetDefault(targetDefaults, locator) {
-    if (locator.target === undefined &&
-        locator.executor === undefined &&
-        locator.projects === undefined &&
-        locator.plugin === undefined) {
-        throw new Error('findTargetDefault requires at least one of `target`, `executor`, `projects`, or `plugin` on the locator.');
-    }
-    return (0, normalize_target_defaults_1.normalizeTargetDefaults)(targetDefaults).find((e) => e.target === locator.target &&
-        e.executor === locator.executor &&
-        projectsEqual(e.projects, locator.projects) &&
-        e.plugin === locator.plugin);
-}
-function readTargetDefaultsForTarget(targetName, targetDefaults, executor, opts) {
-    if (targetDefaults &&
-        !Array.isArray(targetDefaults) &&
-        Object.prototype.hasOwnProperty.call(targetDefaults, targetName)) {
-        return targetDefaults[targetName] ?? null;
-    }
-    return (0, devkit_internals_1.readTargetDefaultsForTarget)(targetName, targetDefaults, executor, opts);
-}
-function normalizeTargetDefaultsForUpsert(tree, targetDefaults) {
-    if (!targetDefaults) {
-        return [];
-    }
-    if (Array.isArray(targetDefaults)) {
-        return targetDefaults;
-    }
-    return (0, devkit_internals_1.normalizeTargetDefaultsAgainstRootMaps)(targetDefaults, buildProjectRootMap((0, devkit_exports_1.getProjects)(tree)));
-}
-function buildProjectRootMap(projects) {
-    return Object.fromEntries([...projects.values()].map((project) => [project.root, project]));
-}
-/**
- * Construct a `TargetDefaultEntry` with the canonical key order
- * `target → projects → plugin → executor → ...rest`. Locators land first
- * so an entry's filter shape is obvious at a glance; `executor` follows
- * because it doubles as a payload field.
- */
-function buildTargetDefaultEntry(target, projects, plugin, executor, rest) {
-    return {
-        ...(target !== undefined ? { target } : {}),
-        ...(projects !== undefined ? { projects } : {}),
-        ...(plugin !== undefined ? { plugin } : {}),
-        ...(executor !== undefined ? { executor } : {}),
-        ...rest,
-    };
-}
-// Order-insensitive equality so re-upserts with reordered patterns
-// merge into the same entry rather than appending a duplicate.
-function projectsEqual(a, b) {
-    if (a === b)
-        return true;
-    const aArr = a === undefined ? undefined : Array.isArray(a) ? a : [a];
-    const bArr = b === undefined ? undefined : Array.isArray(b) ? b : [b];
-    if (!aArr || !bArr)
-        return false;
-    if (aArr.length !== bArr.length)
-        return false;
-    const aSet = new Set(aArr);
-    if (aSet.size !== aArr.length) {
-        // Duplicates inside one array — fall back to positional comparison so
-        // we don't silently merge `['a','a']` with `['a']`.
-        for (let i = 0; i < aArr.length; i++)
-            if (aArr[i] !== bArr[i])
-                return false;
-        return true;
-    }
-    for (const item of bArr)
-        if (!aSet.has(item))
-            return false;
-    return true;
-}
 function addBuildTargetDefaults(tree, executorName, buildTargetName = 'build', extraInputs = []) {
-    const nxJson = (0, devkit_exports_1.readNxJson)(tree) ?? {};
-    const entries = (0, normalize_target_defaults_1.normalizeTargetDefaults)(nxJson.targetDefaults);
-    // Only skip when an *unfiltered* entry already covers this executor.
-    // A filtered entry (`projects:` or `plugin:`) only applies to a subset
-    // of targets, so it doesn't satisfy the workspace-wide default this
-    // helper writes — we still need to add the unfiltered baseline.
-    if (entries.some((e) => e.executor === executorName &&
-        e.projects === undefined &&
-        e.plugin === undefined)) {
-        return;
-    }
-    upsertTargetDefault(tree, nxJson, {
-        executor: executorName,
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults[executorName] ??= {
         cache: true,
         dependsOn: [`^${buildTargetName}`],
         inputs: [
@@ -171,12 +17,12 @@ function addBuildTargetDefaults(tree, executorName, buildTargetName = 'build', e
                 : ['default', '^default']),
             ...extraInputs,
         ],
-    });
+    };
     (0, devkit_exports_1.updateNxJson)(tree, nxJson);
 }
 async function addE2eCiTargetDefaults(tree, e2ePlugin, buildTarget, pathToE2EConfigFile) {
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
-    if (!nxJson?.plugins) {
+    if (!nxJson.plugins) {
         return;
     }
     const e2ePluginRegistrations = nxJson.plugins.filter((p) => typeof p === 'string' ? p === e2ePlugin : p.plugin === e2ePlugin);
@@ -212,13 +58,18 @@ async function addE2eCiTargetDefaults(tree, e2ePlugin, buildTarget, pathToE2ECon
         ? 'e2e-ci'
         : (foundPluginForApplication.options?.ciTargetName ?? 'e2e-ci');
     const ciTargetNameGlob = `${ciTargetName}--**/**`;
-    const existing = findTargetDefault(nxJson.targetDefaults, {
-        target: ciTargetNameGlob,
-    });
-    const dependsOn = [...(existing?.dependsOn ?? [])];
-    if (!dependsOn.includes(buildTarget)) {
-        dependsOn.push(buildTarget);
+    nxJson.targetDefaults ??= {};
+    const e2eCiTargetDefaults = nxJson.targetDefaults[ciTargetNameGlob];
+    if (!e2eCiTargetDefaults) {
+        nxJson.targetDefaults[ciTargetNameGlob] = {
+            dependsOn: [buildTarget],
+        };
+    }
+    else {
+        e2eCiTargetDefaults.dependsOn ??= [];
+        if (!e2eCiTargetDefaults.dependsOn.includes(buildTarget)) {
+            e2eCiTargetDefaults.dependsOn.push(buildTarget);
+        }
     }
-    upsertTargetDefault(tree, nxJson, { target: ciTargetNameGlob, dependsOn });
     (0, devkit_exports_1.updateNxJson)(tree, nxJson);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "23.0.0-rc.3",
+  "version": "23.0.0-rc.4",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -60,7 +60,7 @@
   },
   "devDependencies": {
     "jest": "30.3.0",
-    "nx": "23.0.0-rc.3"
+    "nx": "23.0.0-rc.4"
   },
   "peerDependencies": {
     "nx": ">= 22 <= 24 || ^23.0.0-0"

package/dist/src/utils/normalize-target-defaults.d.ts

@@ -1,32 +0,0 @@
-import type { TargetDefaultEntry, TargetDefaults, TargetDefaultsRecord } from 'nx/src/devkit-exports';
-/**
- * Convert an nx.json `targetDefaults` value (either the legacy record shape
- * or the new array shape) into the normalized array shape.
- *
- * Record entries become `{ target: key, ...value }` preserving insertion
- * order — except executor-shaped keys (e.g. `@nx/vite:test`,
- * `nx:run-commands`), which become `{ executor: key, ...value }`.
- *
- * Returns the array directly when already normalized — callers must not
- * mutate the result if they want to preserve the underlying nx.json.
- */
-export declare function normalizeTargetDefaults(raw: TargetDefaults | undefined): TargetDefaultEntry[];
-/**
- * Project an array of `TargetDefaultEntry` back into the legacy
- * record shape. The intended caller is a pre-v23 migration that
- * normalized to array internally but wants to preserve the original
- * on-disk record shape so it remains valid against pre-v23 nx.json
- * schemas.
- *
- * Each entry's key is its `target` (if set) or `executor`. Entries that
- * have both keep the locator role on `target` and retain `executor` as
- * a value field.
- *
- * Throws when the input contains entries that the record shape cannot
- * represent — `projects`/`plugin` filters, two entries that would collapse
- * to the same key, or entries with neither `target` nor `executor`. The
- * caller must keep array shape in those cases (or refuse to write the
- * change). Silently dropping these entries would corrupt nx.json without
- * the user noticing.
- */
-export declare function downgradeTargetDefaults(entries: TargetDefaultEntry[]): TargetDefaultsRecord;

package/dist/src/utils/normalize-target-defaults.js

@@ -1,84 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeTargetDefaults = normalizeTargetDefaults;
-exports.downgradeTargetDefaults = downgradeTargetDefaults;
-// Mirrors `GLOB_CHARACTERS` / `isGlobPattern` from
-// `nx/src/utils/globs.ts`. We can't import from there directly: devkit
-// supports nx +/- 1 major version and that file isn't part of the
-// devkit-exports surface guaranteed across the range. Keeping a local
-// copy that exactly matches the canonical implementation avoids the
-// import while staying behaviorally aligned.
-const GLOB_CHARACTERS = new Set(['*', '|', '{', '}', '(', ')', '[']);
-/**
- * Convert an nx.json `targetDefaults` value (either the legacy record shape
- * or the new array shape) into the normalized array shape.
- *
- * Record entries become `{ target: key, ...value }` preserving insertion
- * order — except executor-shaped keys (e.g. `@nx/vite:test`,
- * `nx:run-commands`), which become `{ executor: key, ...value }`.
- *
- * Returns the array directly when already normalized — callers must not
- * mutate the result if they want to preserve the underlying nx.json.
- */
-function normalizeTargetDefaults(raw) {
-    if (!raw)
-        return [];
-    if (Array.isArray(raw))
-        return raw;
-    const out = [];
-    const record = raw;
-    for (const key of Object.keys(record)) {
-        const value = record[key] ?? {};
-        out.push(isExecutorLikeKey(key)
-            ? { ...value, executor: key }
-            : { ...value, target: key });
-    }
-    return out;
-}
-function isExecutorLikeKey(key) {
-    if (!key.includes(':'))
-        return false;
-    for (const c of key)
-        if (GLOB_CHARACTERS.has(c))
-            return false;
-    return true;
-}
-/**
- * Project an array of `TargetDefaultEntry` back into the legacy
- * record shape. The intended caller is a pre-v23 migration that
- * normalized to array internally but wants to preserve the original
- * on-disk record shape so it remains valid against pre-v23 nx.json
- * schemas.
- *
- * Each entry's key is its `target` (if set) or `executor`. Entries that
- * have both keep the locator role on `target` and retain `executor` as
- * a value field.
- *
- * Throws when the input contains entries that the record shape cannot
- * represent — `projects`/`plugin` filters, two entries that would collapse
- * to the same key, or entries with neither `target` nor `executor`. The
- * caller must keep array shape in those cases (or refuse to write the
- * change). Silently dropping these entries would corrupt nx.json without
- * the user noticing.
- */
-function downgradeTargetDefaults(entries) {
-    const out = {};
-    for (const entry of entries) {
-        if (entry.projects !== undefined || entry.plugin !== undefined) {
-            throw new Error(`Cannot downgrade targetDefaults to legacy record shape: entry ${JSON.stringify(entry)} uses a \`projects\`/\`plugin\` filter, which is only supported in the array shape.`);
-        }
-        const { target, executor, projects, plugin, ...rest } = entry;
-        const key = target ?? executor;
-        if (key === undefined) {
-            throw new Error(`Cannot downgrade targetDefaults to legacy record shape: entry ${JSON.stringify(entry)} has neither \`target\` nor \`executor\` to use as the record key.`);
-        }
-        if (Object.prototype.hasOwnProperty.call(out, key)) {
-            throw new Error(`Cannot downgrade targetDefaults to legacy record shape: two entries collapse to the same key \`${key}\`. Keep the array shape so both can coexist.`);
-        }
-        const value = { ...rest };
-        if (target && executor)
-            value.executor = executor;
-        out[key] = value;
-    }
-    return out;
-}