nx 23.0.0-rc.2 → 23.0.0-rc.4

package/dist/src/command-line/completion/command-object.js

@@ -10,25 +10,16 @@ const SHELL_CHOICES = ['bash', 'zsh', 'fish', 'powershell'];
 exports.yargsCompletionCommand = {
     command: 'completion [shell]',
     describe: 'Install shell completion for bash, zsh, fish, or powershell. Omit the shell to pick interactively.',
-    builder: (yargs) => yargs
-        .positional('shell', {
-        type: 'string',
-        choices: SHELL_CHOICES,
-        describe: 'Shell to install completion for.',
-    })
-        .option('force', {
-        type: 'boolean',
-        default: false,
-        describe: 'Install the completion script even if `nx` is not found on PATH.',
-    })
-        .option('stdout', {
-        type: 'boolean',
-        default: false,
-        describe: 'Print the completion script to stdout instead of writing to the shell rc file.',
-    })
-        .example('$0 completion bash', 'Install bash completion to ~/.bashrc')
-        .example('$0 completion', 'Pick shells interactively and install completion for each')
-        .example('$0 completion bash --stdout >> ~/.bash_profile', 'Print to stdout for a custom rc location'),
+    builder: (yargs) => {
+        const y = withCompletionOptions(yargs);
+        // Yargs' built-in help is disabled (see nx-commands.ts) and this command
+        // skips initLocal's --help handling, so handle it in the builder like init.
+        if (process.argv.includes('--help') || process.argv.includes('-h')) {
+            y.showHelp();
+            process.exit(0);
+        }
+        return y;
+    },
     handler: async (args) => {
         const scripts = await (0, handle_import_1.handleImport)('./scripts.js', __dirname);
         const shells = args.shell ? [args.shell] : await pickShellsInteractively();
@@ -51,6 +42,27 @@ exports.yargsCompletionCommand = {
         process.exit(0);
     },
 };
+function withCompletionOptions(yargs) {
+    return yargs
+        .positional('shell', {
+        type: 'string',
+        choices: SHELL_CHOICES,
+        describe: 'Shell to install completion for.',
+    })
+        .option('force', {
+        type: 'boolean',
+        default: false,
+        describe: 'Install the completion script even if `nx` is not found on PATH.',
+    })
+        .option('stdout', {
+        type: 'boolean',
+        default: false,
+        describe: 'Print the completion script to stdout instead of writing to the shell rc file.',
+    })
+        .example('$0 completion bash', 'Install bash completion to ~/.bashrc')
+        .example('$0 completion', 'Pick shells interactively and install completion for each')
+        .example('$0 completion bash --stdout >> ~/.bash_profile', 'Print to stdout for a custom rc location');
+}
 async function pickShellsInteractively() {
     if (!process.stdin.isTTY || !process.stderr.isTTY) {
         console.warn('nx: please specify a shell — `nx completion <bash|zsh|fish|powershell>`.');

package/dist/src/command-line/configure-ai-agents/command-object.js

@@ -6,7 +6,22 @@ const handle_import_1 = require("../../utils/handle-import");
 exports.yargsConfigureAiAgentsCommand = {
     command: 'configure-ai-agents',
     describe: 'Configure and update AI agent configurations for your workspace.',
-    builder: (yargs) => (0, shared_options_1.withVerbose)(yargs)
+    builder: (yargs) => {
+        const y = withConfigureAiAgentsOptions(yargs);
+        // Yargs' built-in help is disabled (see nx-commands.ts) and this command
+        // skips initLocal's --help handling, so handle it in the builder like init.
+        if (process.argv.includes('--help') || process.argv.includes('-h')) {
+            y.showHelp();
+            process.exit(0);
+        }
+        return y;
+    },
+    handler: async (args) => {
+        await (await (0, handle_import_1.handleImport)('./configure-ai-agents.js', __dirname)).configureAiAgentsHandler(args);
+    },
+};
+function withConfigureAiAgentsOptions(yargs) {
+    return (0, shared_options_1.withVerbose)(yargs)
         .option('agents', {
         type: 'array',
         string: true,
@@ -40,8 +55,5 @@ exports.yargsConfigureAiAgentsCommand = {
         .example('$0 configure-ai-agents --agents claude gemini', 'Prompts for updates and and configuration of Claude and Gemini AI agents')
         .example('$0 configure-ai-agents --check', 'Checks if any configured agents are out of date and need to be updated')
         .example('$0 configure-ai-agents --check=all', 'Checks if any agents are not configured, out of date or partially configured')
-        .example('$0 configure-ai-agents --agents claude gemini --no-interactive', 'Configures and updates Claude and Gemini AI agents without prompts'), // because of the coerce function
-    handler: async (args) => {
-        await (await (0, handle_import_1.handleImport)('./configure-ai-agents.js', __dirname)).configureAiAgentsHandler(args);
-    },
-};
+        .example('$0 configure-ai-agents --agents claude gemini --no-interactive', 'Configures and updates Claude and Gemini AI agents without prompts'); // because of the coerce function
+}

package/dist/src/command-line/init/implementation/angular/standalone-workspace.js

@@ -54,26 +54,29 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
                 : []),
         ].filter(Boolean),
     };
-    const defaults = Array.isArray(nxJson.targetDefaults)
-        ? [...nxJson.targetDefaults]
-        : [];
+    nxJson.targetDefaults ??= {};
     if (workspaceTargets.includes('build')) {
-        (0, utils_1.upsertTargetDefaultEntry)(defaults, 'build', {
+        nxJson.targetDefaults.build = {
+            ...nxJson.targetDefaults.build,
             dependsOn: ['^build'],
             inputs: ['production', '^production'],
-        });
+        };
     }
     if (workspaceTargets.includes('server')) {
-        (0, utils_1.upsertTargetDefaultEntry)(defaults, 'server', {
+        nxJson.targetDefaults.server = {
+            ...nxJson.targetDefaults.server,
             inputs: ['production', '^production'],
-        });
+        };
     }
     if (workspaceTargets.includes('test')) {
         const inputs = ['default', '^production'];
         if ((0, fileutils_1.fileExists)((0, node_path_1.join)(repoRoot, 'karma.conf.js'))) {
             inputs.push('{workspaceRoot}/karma.conf.js');
         }
-        (0, utils_1.upsertTargetDefaultEntry)(defaults, 'test', { inputs });
+        nxJson.targetDefaults.test = {
+            ...nxJson.targetDefaults.test,
+            inputs,
+        };
     }
     if (workspaceTargets.includes('lint')) {
         const inputs = ['default'];
@@ -83,15 +86,16 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
         if ((0, fileutils_1.fileExists)((0, node_path_1.join)(repoRoot, 'eslint.config.cjs'))) {
             inputs.push('{workspaceRoot}/eslint.config.cjs');
         }
-        (0, utils_1.upsertTargetDefaultEntry)(defaults, 'lint', { inputs });
+        nxJson.targetDefaults.lint = {
+            ...nxJson.targetDefaults.lint,
+            inputs,
+        };
     }
     if (workspaceTargets.includes('e2e')) {
-        (0, utils_1.upsertTargetDefaultEntry)(defaults, 'e2e', {
+        nxJson.targetDefaults.e2e = {
+            ...nxJson.targetDefaults.e2e,
             inputs: ['default', '^production'],
-        });
-    }
-    if (defaults.length > 0) {
-        nxJson.targetDefaults = defaults;
+        };
     }
     (0, fileutils_1.writeJsonFile)((0, node_path_1.join)(repoRoot, 'nx.json'), nxJson);
 }

package/dist/src/command-line/init/implementation/utils.d.ts

@@ -1,15 +1,9 @@
-import { NxJsonConfiguration, TargetDefaultEntry } from '../../../config/nx-json';
+import { NxJsonConfiguration } from '../../../config/nx-json';
 import { PackageJson } from '../../../utils/package-json';
 import { PackageManagerCommands } from '../../../utils/package-manager';
 export declare function createNxJsonFile(repoRoot: string, topologicalTargets: string[], cacheableOperations: string[], scriptOutputs: {
     [name: string]: string;
 }): void;
-/**
- * Locate-by-target upsert against an in-memory `targetDefaults` array.
- * Used by `nx init` code paths that operate on raw JSON before a Tree
- * exists — generators should use `upsertTargetDefault` from devkit instead.
- */
-export declare function upsertTargetDefaultEntry(entries: TargetDefaultEntry[], target: string, patch: Partial<TargetDefaultEntry>): void;
 export declare function createNxJsonFromTurboJson(turboJson: Record<string, any>): NxJsonConfiguration;
 export declare function addDepsToPackageJson(repoRoot: string, additionalPackages?: string[]): void;
 export declare function updateGitIgnore(root: string): void;

package/dist/src/command-line/init/implementation/utils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNxJsonFile = createNxJsonFile;
-exports.upsertTargetDefaultEntry = upsertTargetDefaultEntry;
 exports.createNxJsonFromTurboJson = createNxJsonFromTurboJson;
 exports.addDepsToPackageJson = addDepsToPackageJson;
 exports.updateGitIgnore = updateGitIgnore;
@@ -35,37 +34,27 @@ function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scr
     }
     catch { }
     nxJson.$schema = './node_modules/nx/schemas/nx-schema.json';
-    const entries = Array.isArray(nxJson.targetDefaults)
-        ? [...nxJson.targetDefaults]
-        : [];
+    nxJson.targetDefaults ??= {};
     if (topologicalTargets.length > 0) {
         for (const scriptName of topologicalTargets) {
-            upsertTargetDefaultEntry(entries, scriptName, {
-                dependsOn: [`^${scriptName}`],
-            });
+            nxJson.targetDefaults[scriptName] ??= {};
+            nxJson.targetDefaults[scriptName] = { dependsOn: [`^${scriptName}`] };
         }
     }
     for (const [scriptName, output] of Object.entries(scriptOutputs)) {
         if (!output) {
             continue;
         }
-        upsertTargetDefaultEntry(entries, scriptName, {
-            outputs: [`{projectRoot}/${output}`],
-        });
+        nxJson.targetDefaults[scriptName] ??= {};
+        nxJson.targetDefaults[scriptName].outputs = [`{projectRoot}/${output}`];
     }
     for (const target of cacheableOperations) {
-        const existing = findUnfilteredTargetEntry(entries, target);
-        if (existing)
-            existing.cache ??= true;
-        else
-            entries.push({ target, cache: true });
+        nxJson.targetDefaults[target] ??= {};
+        nxJson.targetDefaults[target].cache ??= true;
     }
-    if (entries.length === 0) {
+    if (Object.keys(nxJson.targetDefaults).length === 0) {
         delete nxJson.targetDefaults;
     }
-    else {
-        nxJson.targetDefaults = entries;
-    }
     const defaultBase = (0, deduce_default_base_1.deduceDefaultBase)();
     // Do not add defaultBase if it is inferred to be the Nx default value of main
     if (defaultBase !== 'main') {
@@ -73,21 +62,6 @@ function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scr
     }
     (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
 }
-/**
- * Locate-by-target upsert against an in-memory `targetDefaults` array.
- * Used by `nx init` code paths that operate on raw JSON before a Tree
- * exists — generators should use `upsertTargetDefault` from devkit instead.
- */
-function upsertTargetDefaultEntry(entries, target, patch) {
-    const existing = findUnfilteredTargetEntry(entries, target);
-    if (existing)
-        Object.assign(existing, patch, { target });
-    else
-        entries.push({ ...patch, target });
-}
-function findUnfilteredTargetEntry(entries, target) {
-    return entries.find((e) => e.target === target && e.projects === undefined && e.plugin === undefined);
-}
 function createNxJsonFromTurboJson(turboJson) {
     const nxJson = {
         $schema: './node_modules/nx/schemas/nx-schema.json',
@@ -114,20 +88,20 @@ function createNxJsonFromTurboJson(turboJson) {
     }
     // Handle task configurations
     if (turboJson.tasks) {
-        const entries = [];
+        nxJson.targetDefaults = {};
         for (const [taskName, taskConfig] of Object.entries(turboJson.tasks)) {
             // Skip project-specific tasks (containing #)
             if (taskName.includes('#'))
                 continue;
             const config = taskConfig;
-            const entry = { target: taskName };
+            nxJson.targetDefaults[taskName] = {};
             // Handle dependsOn
             if (config.dependsOn?.length > 0) {
-                entry.dependsOn = config.dependsOn;
+                nxJson.targetDefaults[taskName].dependsOn = config.dependsOn;
             }
             // Handle inputs
             if (config.inputs?.length > 0) {
-                entry.inputs = config.inputs
+                nxJson.targetDefaults[taskName].inputs = config.inputs
                     .map((input) => {
                     if (input === '$TURBO_DEFAULT$') {
                         return '{projectRoot}/**/*';
@@ -150,7 +124,7 @@ function createNxJsonFromTurboJson(turboJson) {
             }
             // Handle outputs
             if (config.outputs?.length > 0) {
-                entry.outputs = config.outputs.map((output) => {
+                nxJson.targetDefaults[taskName].outputs = config.outputs.map((output) => {
                     // Don't add projectRoot if it's already there
                     if (output.startsWith('{projectRoot}/'))
                         return output;
@@ -162,11 +136,7 @@ function createNxJsonFromTurboJson(turboJson) {
                 });
             }
             // Handle cache setting - true by default in Turbo
-            entry.cache = config.cache !== false;
-            entries.push(entry);
-        }
-        if (entries.length > 0) {
-            nxJson.targetDefaults = entries;
+            nxJson.targetDefaults[taskName].cache = config.cache !== false;
         }
     }
     /**

package/dist/src/command-line/show/show-target/info.js

@@ -20,9 +20,10 @@ function resolveTargetInfoData(t) {
             allTargetNames.add(name);
         }
     }
-    const depConfigs = (0, utils_1.getDependencyConfigs)({ project: projectName, target: targetName }, 
-    // no programmatic extras — `dependsOn` is already merged into the graph node
-    {}, graph, [...allTargetNames]) ?? [];
+    const extraTargetDeps = Object.fromEntries(Object.entries(nxJson.targetDefaults ?? {})
+        .filter(([, config]) => config.dependsOn)
+        .map(([name, config]) => [name, config.dependsOn]));
+    const depConfigs = (0, utils_1.getDependencyConfigs)({ project: projectName, target: targetName }, extraTargetDeps, graph, [...allTargetNames]) ?? [];
     // Determine the hoisted command value and which option key it came from
     let command;
     let commandSourceKey;
@@ -43,7 +44,7 @@ function resolveTargetInfoData(t) {
         command = targetConfig.options.script;
         commandSourceKey = 'options.script';
     }
-    const { dependsOn, depSourceIndices, transitiveTasks } = resolveTaskGraphDependencies(graph, {}, projectName, targetName, configuration, depConfigs);
+    const { dependsOn, depSourceIndices, transitiveTasks } = resolveTaskGraphDependencies(graph, extraTargetDeps, projectName, targetName, configuration, depConfigs);
     const configurations = Object.keys(targetConfig.configurations ?? {});
     const targetSourceMap = extractTargetSourceMap(node.data.root, targetName, sourceMaps);
     const usesCustomHasher = (0, utils_2.hasCustomHasher)(projectName, targetName, graph);

package/dist/src/config/nx-json.d.ts

@@ -20,43 +20,7 @@ export interface NxAffectedConfig {
      */
     defaultBase?: string;
 }
-/**
- * A single entry in the array-shaped `targetDefaults` configuration.
- * Supports filtering the default's applicability by project set and/or the
- * plugin that originated the target.
- *
- * Either `target` or `executor` must be set. An entry with both narrows
- * the match further (target name AND executor must agree).
- */
-export type TargetDefaultEntry = {
-    /**
-     * Target name or glob pattern (e.g. `build`, `e2e-ci--*`). When omitted,
-     * the entry matches by `executor` alone.
-     */
-    target?: string;
-    /**
-     * Restrict the default to a subset of projects. Accepts any pattern
-     * supported by `findMatchingProjects` (project names, globs, `tag:foo`,
-     * directory globs, negation with `!`).
-     */
-    projects?: string | string[];
-    /**
-     * Restrict the default to targets originated by a specific plugin
-     * (e.g. `@nx/vite`). Matches against the plugin that wrote the target's
-     * `executor` or `command`.
-     */
-    plugin?: string;
-} & Partial<TargetConfiguration>;
-/**
- * @deprecated Use the array-shaped {@link TargetDefaultEntry}[] form instead.
- * Retained so devkit helpers can still read nx.json files that predate the
- * migration.
- * @todo(v24) Remove this type and all branches that read it.
- */
-export type TargetDefaultsRecord = Record<string, Partial<TargetConfiguration>>;
-export type TargetDefaults = TargetDefaultEntry[] | TargetDefaultsRecord;
-/** Internal-only: the post-normalization shape consumed by the nx core matcher. */
-export type NormalizedTargetDefaults = TargetDefaultEntry[];
+export type TargetDefaults = Record<string, Partial<TargetConfiguration>>;
 export type TargetDependencies = Record<string, (TargetDependencyConfig | string)[]>;
 export interface NrwlJsPluginConfig {
     analyzeSourceFiles?: boolean;