nx 17.0.3 → 17.0.5

package/src/command-line/affected/print-affected.js

@@ -9,6 +9,8 @@ const package_manager_1 = require("../../utils/package-manager");
 const command_object_1 = require("./command-object");
 const logger_1 = require("../../utils/logger");
 const task_env_1 = require("../../tasks-runner/task-env");
+const build_project_graph_1 = require("../../project-graph/build-project-graph");
+const client_1 = require("../../daemon/client/client");
 /**
  * @deprecated Use showProjectsHandler, generateGraph, or affected (without the print-affected mode) instead.
  */
@@ -35,7 +37,14 @@ exports.printAffected = printAffected;
 async function createTasks(affectedProjectsWithTargetAndConfig, projectGraph, nxArgs, nxJson, overrides) {
     const defaultDependencyConfigs = (0, create_task_graph_1.mapTargetDefaultsToDependencies)(nxJson.targetDefaults);
     const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, affectedProjectsWithTargetAndConfig.map((p) => p.name), nxArgs.targets, nxArgs.configuration, overrides);
-    const hasher = new task_hasher_1.InProcessTaskHasher({}, [], projectGraph, nxJson, {});
+    let hasher;
+    if (client_1.daemonClient.enabled()) {
+        hasher = new task_hasher_1.DaemonBasedTaskHasher(client_1.daemonClient, {});
+    }
+    else {
+        const { fileMap, allWorkspaceFiles, rustReferences } = (0, build_project_graph_1.getFileMap)();
+        hasher = new task_hasher_1.InProcessTaskHasher(fileMap?.projectFileMap, allWorkspaceFiles, projectGraph, nxJson, rustReferences, {});
+    }
     const execCommand = (0, package_manager_1.getPackageManagerCommand)().exec;
     const tasks = Object.values(taskGraph.tasks);
     await Promise.all(tasks.map((t) => (0, hash_task_1.hashTask)(hasher, projectGraph, taskGraph, t, 

package/src/command-line/connect/command-object.d.ts

@@ -1,4 +1,3 @@
 import { CommandModule } from 'yargs';
-import type { ConnectToNxCloudOptions } from './connect-to-nx-cloud';
-export declare const yargsConnectCommand: CommandModule<{}, ConnectToNxCloudOptions>;
+export declare const yargsConnectCommand: CommandModule;
 export declare const yargsViewLogsCommand: CommandModule;

package/src/command-line/connect/command-object.js

@@ -6,13 +6,9 @@ exports.yargsConnectCommand = {
     command: 'connect',
     aliases: ['connect-to-nx-cloud'],
     describe: `Connect workspace to Nx Cloud`,
-    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(yargs.option('interactive', {
-        type: 'boolean',
-        description: 'Prompt for confirmation',
-        default: true,
-    }), 'connect-to-nx-cloud'),
-    handler: async (options) => {
-        await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand(options);
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(yargs, 'connect-to-nx-cloud'),
+    handler: async () => {
+        await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand();
         process.exit(0);
     },
 };

package/src/command-line/connect/connect-to-nx-cloud.d.ts

@@ -1,9 +1,8 @@
 import { NxJsonConfiguration } from '../../config/nx-json';
 import { NxArgs } from '../../utils/command-line-utils';
+import { MessageKey } from '../../utils/ab-testing';
 export declare function onlyDefaultRunnerIsUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function connectToNxCloudIfExplicitlyAsked(opts: NxArgs): Promise<void>;
-export interface ConnectToNxCloudOptions {
-    interactive: boolean;
-    promptOverride?: string;
-}
-export declare function connectToNxCloudCommand({ promptOverride, interactive, }: ConnectToNxCloudOptions): Promise<boolean>;
+export declare function connectToNxCloudCommand(): Promise<boolean>;
+export declare function connectToNxCloudWithPrompt(command: string): Promise<void>;
+export declare function connectExistingRepoToNxCloudPrompt(key?: MessageKey): Promise<boolean>;

package/src/command-line/connect/connect-to-nx-cloud.js

@@ -1,17 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.connectToNxCloudCommand = exports.connectToNxCloudIfExplicitlyAsked = exports.onlyDefaultRunnerIsUsed = void 0;
+exports.connectExistingRepoToNxCloudPrompt = exports.connectToNxCloudWithPrompt = exports.connectToNxCloudCommand = exports.connectToNxCloudIfExplicitlyAsked = exports.onlyDefaultRunnerIsUsed = void 0;
 const output_1 = require("../../utils/output");
 const configuration_1 = require("../../config/configuration");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 const child_process_1 = require("../../utils/child-process");
+const ab_testing_1 = require("../../utils/ab-testing");
+const versions_1 = require("../../utils/versions");
+const chalk = require("chalk");
 function onlyDefaultRunnerIsUsed(nxJson) {
     const defaultRunner = nxJson.tasksRunnerOptions?.default?.runner;
     if (!defaultRunner) {
         // No tasks runner options OR no default runner defined:
         // - If access token defined, uses cloud runner
         // - If no access token defined, uses default
-        return !nxJson.nxCloudAccessToken;
+        return !(nxJson.nxCloudAccessToken ?? process.env.NX_CLOUD_ACCESS_TOKEN);
     }
     return defaultRunner === 'nx/tasks-runners/default';
 }
@@ -34,48 +37,57 @@ async function connectToNxCloudIfExplicitlyAsked(opts) {
     }
 }
 exports.connectToNxCloudIfExplicitlyAsked = connectToNxCloudIfExplicitlyAsked;
-async function connectToNxCloudCommand({ promptOverride, interactive, }) {
+async function connectToNxCloudCommand() {
     const nxJson = (0, configuration_1.readNxJson)();
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
         output_1.output.log({
-            title: '✅ This workspace is already connected to Nx Cloud.',
+            title: '✔ This workspace already has Nx Cloud set up',
             bodyLines: [
-                'This means your workspace can use computation caching, distributed task execution, and show you run analytics.',
-                'Go to https://nx.app to learn more.',
-                ' ',
-                'If you have not done so already, please claim this workspace:',
-                `${(0, nx_cloud_utils_1.getNxCloudUrl)(nxJson)}/orgs/workspace-setup?accessToken=${(0, nx_cloud_utils_1.getNxCloudToken)(nxJson)}`,
+                'If you have not done so already, connect your workspace to your Nx Cloud account:',
+                `- Login at ${(0, nx_cloud_utils_1.getNxCloudUrl)(nxJson)} to connect your repository`,
             ],
         });
         return false;
     }
-    const res = interactive ? await connectToNxCloudPrompt(promptOverride) : true;
-    if (!res)
-        return false;
     (0, child_process_1.runNxSync)(`g nx:connect-to-nx-cloud --quiet --no-interactive`, {
         stdio: [0, 1, 2],
     });
     return true;
 }
 exports.connectToNxCloudCommand = connectToNxCloudCommand;
-async function connectToNxCloudPrompt(prompt) {
+async function connectToNxCloudWithPrompt(command) {
+    const setNxCloud = await nxCloudPrompt('setupNxCloud');
+    const useCloud = setNxCloud === 'yes' ? await connectToNxCloudCommand() : false;
+    await (0, ab_testing_1.recordStat)({
+        command,
+        nxVersion: versions_1.nxVersion,
+        useCloud,
+        meta: ab_testing_1.messages.codeOfSelectedPromptMessage('setupNxCloud'),
+    });
+}
+exports.connectToNxCloudWithPrompt = connectToNxCloudWithPrompt;
+async function connectExistingRepoToNxCloudPrompt(key = 'setupNxCloud') {
+    return nxCloudPrompt(key).then((value) => value === 'yes');
+}
+exports.connectExistingRepoToNxCloudPrompt = connectExistingRepoToNxCloudPrompt;
+async function nxCloudPrompt(key) {
+    const { message, choices, initial, footer, hint } = ab_testing_1.messages.getPrompt(key);
+    const promptConfig = {
+        name: 'NxCloud',
+        message,
+        type: 'autocomplete',
+        choices,
+        initial,
+    }; // meeroslav: types in enquirer are not up to date
+    if (footer) {
+        promptConfig.footer = () => chalk.dim(footer);
+    }
+    if (hint) {
+        promptConfig.hint = () => chalk.dim(hint);
+    }
     return await (await Promise.resolve().then(() => require('enquirer')))
-        .prompt([
-        {
-            name: 'NxCloud',
-            message: prompt ?? `Enable distributed caching to make your CI faster`,
-            type: 'autocomplete',
-            choices: [
-                {
-                    name: 'Yes',
-                    hint: 'I want faster builds',
-                },
-                {
-                    name: 'No',
-                },
-            ],
-            initial: 'Yes',
-        },
-    ])
-        .then((a) => a.NxCloud === 'Yes');
+        .prompt([promptConfig])
+        .then((a) => {
+        return a.NxCloud;
+    });
 }

package/src/command-line/connect/view-logs.js

@@ -7,6 +7,7 @@ const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 const output_1 = require("../../utils/output");
 const child_process_2 = require("../../utils/child-process");
 const nx_json_1 = require("../../config/nx-json");
+const connect_to_nx_cloud_1 = require("./connect-to-nx-cloud");
 async function viewLogs() {
     const cloudUsed = (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)());
     if (cloudUsed) {
@@ -18,28 +19,10 @@ async function viewLogs() {
         });
         return 1;
     }
-    const installCloud = await (await Promise.resolve().then(() => require('enquirer')))
-        .prompt([
-        {
-            name: 'NxCloud',
-            message: `To view the logs, Nx needs to connect your workspace to Nx Cloud and upload the most recent run details.`,
-            type: 'autocomplete',
-            choices: [
-                {
-                    name: 'Yes',
-                    hint: 'Connect to Nx Cloud and upload the run details',
-                },
-                {
-                    name: 'No',
-                },
-            ],
-            initial: 'Yes',
-        },
-    ])
-        .then((a) => a.NxCloud === 'Yes');
-    if (!installCloud)
+    const setupNxCloud = await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)('setupViewLogs');
+    if (!setupNxCloud) {
         return;
-    const pmc = (0, package_manager_1.getPackageManagerCommand)();
+    }
     try {
         output_1.output.log({
             title: 'Connecting to Nx Cloud',
@@ -55,6 +38,7 @@ async function viewLogs() {
         console.log(e);
         return 1;
     }
+    const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, child_process_1.execSync)(`${pmc.exec} nx-cloud upload-and-show-run-details`, {
         stdio: [0, 1, 2],
     });

package/src/command-line/examples.js

@@ -311,6 +311,10 @@ exports.examples = {
             command: 'show project my-app --json false',
             description: 'Show information about "my-app" in a human readable format.',
         },
+        {
+            command: 'show project my-app --web',
+            description: 'Opens a web browser to explore the configuration of "my-app"',
+        },
     ],
     watch: [
         {
@@ -326,4 +330,18 @@ exports.examples = {
             description: 'Watch all projects (including newly created projects) in the workspace',
         },
     ],
+    add: [
+        {
+            command: 'add @nx/react',
+            description: 'Install the `@nx/react` package matching the installed version of the `nx` package and run its `@nx/react:init` generator',
+        },
+        {
+            command: 'add non-core-nx-plugin',
+            description: 'Install the latest version of the `non-core-nx-plugin` package and run its `non-core-nx-plugin:init` generator if available',
+        },
+        {
+            command: 'add @nx/react@17.0.0',
+            description: 'Install version `17.0.0` of the `@nx/react` package and run its `@nx/react:init` generator',
+        },
+    ],
 };

package/src/command-line/exec/command-object.js

@@ -5,13 +5,14 @@ const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsExecCommand = {
     command: 'exec',
     describe: 'Executes any command as if it was a target on the project',
-    builder: (yargs) => (0, shared_options_1.withRunOneOptions)(yargs),
+    builder: (yargs) => (0, shared_options_1.withRunManyOptions)(yargs),
     handler: async (args) => {
         try {
             await (await Promise.resolve().then(() => require('./exec'))).nxExecCommand((0, shared_options_1.withOverrides)(args));
             process.exit(0);
         }
         catch (e) {
+            console.error(e);
             process.exit(1);
         }
     },

package/src/command-line/exec/exec.d.ts

@@ -1 +1 @@
-export declare function nxExecCommand(args: Record<string, string[]>): Promise<unknown>;
+export declare function nxExecCommand(args: Record<string, string | string[] | boolean>): Promise<unknown>;

package/src/command-line/exec/exec.js

@@ -5,6 +5,8 @@ const child_process_1 = require("child_process");
 const path_1 = require("path");
 const process_1 = require("process");
 const yargs = require("yargs-parser");
+const fs_1 = require("fs");
+const find_matching_projects_1 = require("../../utils/find-matching-projects");
 const configuration_1 = require("../../config/configuration");
 const project_graph_1 = require("../../project-graph/project-graph");
 const command_line_utils_1 = require("../../utils/command-line-utils");
@@ -12,9 +14,17 @@ const fileutils_1 = require("../../utils/fileutils");
 const output_1 = require("../../utils/output");
 const package_manager_1 = require("../../utils/package-manager");
 const workspace_root_1 = require("../../utils/workspace-root");
+const path_2 = require("../../utils/path");
 const calculate_default_project_name_1 = require("../../config/calculate-default-project-name");
+const get_command_projects_1 = require("../../commands-runner/get-command-projects");
 async function nxExecCommand(args) {
-    const scriptArgV = readScriptArgV(args);
+    const nxJson = (0, configuration_1.readNxJson)();
+    const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'run-many', { printWarnings: args.graph !== 'stdout' }, nxJson);
+    if (nxArgs.verbose) {
+        process.env.NX_VERBOSE_LOGGING = 'true';
+    }
+    const scriptArgV = readScriptArgV(overrides);
+    const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
     // NX is already running
     if (process.env.NX_TASK_TARGET_PROJECT) {
         const command = scriptArgV
@@ -22,32 +32,58 @@ async function nxExecCommand(args) {
             .trim();
         (0, child_process_1.execSync)(command, {
             stdio: 'inherit',
-            env: process.env,
+            env: {
+                ...process.env,
+                NX_PROJECT_NAME: process.env.NX_TASK_TARGET_PROJECT,
+                NX_PROJECT_ROOT_PATH: projectGraph.nodes?.[process.env.NX_TASK_TARGET_PROJECT]?.data?.root,
+            },
         });
     }
     else {
         // nx exec is being ran inside of Nx's context
-        return runScriptAsNxTarget(scriptArgV);
+        return runScriptAsNxTarget(projectGraph, scriptArgV, nxArgs);
     }
 }
 exports.nxExecCommand = nxExecCommand;
-async function runScriptAsNxTarget(argv) {
-    const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
-    const { projectName, project } = getProject(projectGraph);
+async function runScriptAsNxTarget(projectGraph, argv, nxArgs) {
     // NPM, Yarn, and PNPM set this to the name of the currently executing script. Lets use it if we can.
     const targetName = process.env.npm_lifecycle_event;
-    const scriptDefinition = getScriptDefinition(project, targetName);
+    if (targetName) {
+        const defaultPorject = getDefaultProject(projectGraph);
+        const scriptDefinition = getScriptDefinition(targetName, defaultPorject);
+        if (scriptDefinition) {
+            runTargetOnProject(scriptDefinition, targetName, defaultPorject, defaultPorject.name, argv);
+            return;
+        }
+    }
+    const projects = getProjects(projectGraph, nxArgs);
+    const projectsToRun = (0, get_command_projects_1.getCommandProjects)(projectGraph, projects, nxArgs);
+    projectsToRun.forEach((projectName) => {
+        const command = argv.reduce((cmd, arg) => cmd + `"${arg}" `, '').trim();
+        (0, child_process_1.execSync)(command, {
+            stdio: 'inherit',
+            env: {
+                ...process.env,
+                NX_PROJECT_NAME: projectGraph.nodes?.[projectName]?.name,
+                NX_PROJECT_ROOT_PATH: projectGraph.nodes?.[projectName]?.data?.root,
+            },
+            cwd: projectGraph.nodes?.[projectName]?.data?.root
+                ? (0, path_2.joinPathFragments)(workspace_root_1.workspaceRoot, projectGraph.nodes?.[projectName]?.data?.root)
+                : workspace_root_1.workspaceRoot,
+        });
+    });
+}
+function runTargetOnProject(scriptDefinition, targetName, project, projectName, argv) {
     ensureNxTarget(project, targetName);
     // Get ArgV that is provided in npm script definition
     const providedArgs = yargs(scriptDefinition)._.slice(2);
     const extraArgs = providedArgs.length === argv.length ? [] : argv.slice(providedArgs.length);
     const pm = (0, package_manager_1.getPackageManagerCommand)();
     // `targetName` might be an npm script with `:` like: `start:dev`, `start:debug`.
-    let command = `${pm.exec} nx run ${projectName}:\\\"${targetName}\\\" ${extraArgs.join(' ')}`;
-    return (0, child_process_1.execSync)(command, { stdio: 'inherit' });
+    const command = `${pm.exec} nx run ${projectName}:\\\"${targetName}\\\" ${extraArgs.join(' ')}`;
+    (0, child_process_1.execSync)(command, { stdio: 'inherit' });
 }
-function readScriptArgV(args) {
-    const { overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'run-one', { printWarnings: false }, (0, configuration_1.readNxJson)());
+function readScriptArgV(overrides) {
     const scriptSeparatorIdx = process.argv.findIndex((el) => el === '--');
     if (scriptSeparatorIdx === -1) {
         output_1.output.error({
@@ -57,18 +93,15 @@ function readScriptArgV(args) {
     }
     return overrides.__overrides_unparsed__;
 }
-function getScriptDefinition(project, targetName) {
-    const scriptDefinition = (0, fileutils_1.readJsonFile)((0, path_1.join)(workspace_root_1.workspaceRoot, project.data.root, 'package.json')).scripts[targetName];
-    if (!scriptDefinition) {
-        output_1.output.error({
-            title: "`nx exec` is meant to be used in a project's package.json scripts",
-            bodyLines: [
-                `Nx was unable to find a npm script matching ${targetName} for ${project.name}`,
-            ],
-        });
-        process.exit(1);
+function getScriptDefinition(targetName, project) {
+    if (!project) {
+        return;
+    }
+    const packageJsonPath = (0, path_1.join)(workspace_root_1.workspaceRoot, project.data.root, 'package.json');
+    if ((0, fs_1.existsSync)(packageJsonPath)) {
+        const scriptDefinition = (0, fileutils_1.readJsonFile)(packageJsonPath).scripts?.[targetName];
+        return scriptDefinition;
     }
-    return scriptDefinition;
 }
 function ensureNxTarget(project, targetName) {
     if (!project.data.targets[targetName]) {
@@ -81,18 +114,28 @@ function ensureNxTarget(project, targetName) {
         (0, process_1.exit)(1);
     }
 }
-function getProject(projectGraph) {
-    const projectName = (0, calculate_default_project_name_1.calculateDefaultProjectName)(process.cwd(), workspace_root_1.workspaceRoot, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), (0, configuration_1.readNxJson)());
-    if (!projectName) {
-        output_1.output.error({
-            title: 'Unable to determine project name for `nx exec`',
-            bodyLines: [
-                "`nx exec` should be ran from within an Nx project's root directory.",
-                'Does this package.json belong to an Nx project?',
-            ],
-        });
-        process.exit(1);
+function getDefaultProject(projectGraph) {
+    const defaultProjectName = (0, calculate_default_project_name_1.calculateDefaultProjectName)(process.cwd(), workspace_root_1.workspaceRoot, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), (0, configuration_1.readNxJson)());
+    if (defaultProjectName && projectGraph.nodes[defaultProjectName]) {
+        return projectGraph.nodes[defaultProjectName];
+    }
+}
+function getProjects(projectGraph, nxArgs) {
+    let selectedProjects = {};
+    // get projects matched
+    if (nxArgs.projects?.length) {
+        const matchingProjects = (0, find_matching_projects_1.findMatchingProjects)(nxArgs.projects, projectGraph.nodes);
+        for (const project of matchingProjects) {
+            selectedProjects[project] = projectGraph.nodes[project];
+        }
+    }
+    else {
+        // if no project specified, return all projects
+        selectedProjects = { ...projectGraph.nodes };
+    }
+    const excludedProjects = (0, find_matching_projects_1.findMatchingProjects)(nxArgs.exclude, selectedProjects);
+    for (const excludedProject of excludedProjects) {
+        delete selectedProjects[excludedProject];
     }
-    const project = projectGraph.nodes[projectName];
-    return { projectName, project };
+    return Object.values(selectedProjects);
 }

package/src/command-line/format/format.js

@@ -16,6 +16,8 @@ const affected_project_graph_1 = require("../../project-graph/affected/affected-
 const configuration_1 = require("../../config/configuration");
 const chunkify_1 = require("../../utils/chunkify");
 const all_file_data_1 = require("../../utils/all-file-data");
+const workspace_root_1 = require("../../utils/workspace-root");
+const output_1 = require("../../utils/output");
 const PRETTIER_PATH = getPrettierPath();
 async function format(command, args) {
     const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: false }, (0, configuration_1.readNxJson)());
@@ -52,21 +54,28 @@ async function getPatterns(args) {
         }
         const p = (0, command_line_utils_1.parseFiles)(args);
         // In prettier v3 the getSupportInfo result is a promise
-        const supportedExtensions = (await prettier.getSupportInfo()).languages
+        const supportedExtensions = new Set((await prettier.getSupportInfo()).languages
             .flatMap((language) => language.extensions)
             .filter((extension) => !!extension)
             // Prettier supports ".swcrc" as a file instead of an extension
             // So we add ".swcrc" as a supported extension manually
             // which allows it to be considered for calculating "patterns"
-            .concat('.swcrc');
-        const patterns = p.files.filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.includes(path.extname(f)));
+            .concat('.swcrc'));
+        const patterns = p.files
+            .map((f) => path.relative(workspace_root_1.workspaceRoot, f))
+            .filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.has(path.extname(f)));
         // exclude patterns in .nxignore or .gitignore
         const nonIgnoredPatterns = (0, ignore_1.getIgnoreObject)().filter(patterns);
         return args.libsAndApps
             ? await getPatternsFromApps(nonIgnoredPatterns, await (0, all_file_data_1.allFileData)(), graph)
             : nonIgnoredPatterns;
     }
-    catch {
+    catch (err) {
+        output_1.output.error({
+            title: err?.message ||
+                'Something went wrong when resolving the list of files for the formatter',
+            bodyLines: [`Defaulting to all files pattern: "${allFilesPattern}"`],
+        });
         return allFilesPattern;
     }
 }

package/src/command-line/generate/generate.js

@@ -36,7 +36,7 @@ async function promptForCollection(generatorName, interactive, projectsConfigura
     const deprecatedChoices = new Set();
     for (const collectionName of installedCollections) {
         try {
-            const { resolvedCollectionName, normalizedGeneratorName, generatorConfiguration: { ['x-deprecated']: deprecated, hidden }, } = (0, generator_utils_1.getGeneratorInformation)(collectionName, generatorName, workspace_root_1.workspaceRoot);
+            const { resolvedCollectionName, normalizedGeneratorName, generatorConfiguration: { ['x-deprecated']: deprecated, hidden }, } = (0, generator_utils_1.getGeneratorInformation)(collectionName, generatorName, workspace_root_1.workspaceRoot, projectsConfiguration.projects);
             if (hidden) {
                 continue;
             }
@@ -52,7 +52,7 @@ async function promptForCollection(generatorName, interactive, projectsConfigura
     const choicesFromLocalPlugins = [];
     for (const [name] of localPlugins) {
         try {
-            const { resolvedCollectionName, normalizedGeneratorName, generatorConfiguration: { ['x-deprecated']: deprecated, hidden }, } = (0, generator_utils_1.getGeneratorInformation)(name, generatorName, workspace_root_1.workspaceRoot);
+            const { resolvedCollectionName, normalizedGeneratorName, generatorConfiguration: { ['x-deprecated']: deprecated, hidden }, } = (0, generator_utils_1.getGeneratorInformation)(name, generatorName, workspace_root_1.workspaceRoot, projectsConfiguration.projects);
             if (hidden) {
                 continue;
             }
@@ -106,7 +106,7 @@ async function promptForCollection(generatorName, interactive, projectsConfigura
                         return true;
                     }
                     try {
-                        (0, generator_utils_1.getGeneratorInformation)(value, generatorName, workspace_root_1.workspaceRoot);
+                        (0, generator_utils_1.getGeneratorInformation)(value, generatorName, workspace_root_1.workspaceRoot, projectsConfiguration.projects);
                         return true;
                     }
                     catch {
@@ -210,12 +210,12 @@ async function generate(cwd, args) {
         process.env.NX_VERBOSE_LOGGING = 'true';
     }
     const verbose = process.env.NX_VERBOSE_LOGGING === 'true';
-    const nxJsonConfiguration = (0, configuration_1.readNxJson)();
-    const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
-    const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     return (0, params_1.handleErrors)(verbose, async () => {
+        const nxJsonConfiguration = (0, configuration_1.readNxJson)();
+        const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
+        const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
         const opts = await convertToGenerateOptions(args, 'generate', projectsConfigurations);
-        const { normalizedGeneratorName, schema, implementationFactory, generatorConfiguration: { aliases, hidden, ['x-deprecated']: deprecated, ['x-use-standalone-layout']: isStandalonePreset, }, } = (0, generator_utils_1.getGeneratorInformation)(opts.collectionName, opts.generatorName, workspace_root_1.workspaceRoot);
+        const { normalizedGeneratorName, schema, implementationFactory, generatorConfiguration: { aliases, hidden, ['x-deprecated']: deprecated, ['x-use-standalone-layout']: isStandalonePreset, }, } = (0, generator_utils_1.getGeneratorInformation)(opts.collectionName, opts.generatorName, workspace_root_1.workspaceRoot, projectsConfigurations.projects);
         if (deprecated) {
             logger_1.logger.warn([
                 `${logger_1.NX_PREFIX}: ${opts.collectionName}:${normalizedGeneratorName} is deprecated`,
@@ -230,7 +230,7 @@ async function generate(cwd, args) {
             return 0;
         }
         const combinedOpts = await (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, projectsConfigurations, nxJsonConfiguration, schema, opts.interactive, (0, calculate_default_project_name_1.calculateDefaultProjectName)(cwd, workspace_root_1.workspaceRoot, projectsConfigurations, nxJsonConfiguration), (0, path_1.relative)(workspace_root_1.workspaceRoot, cwd), verbose);
-        if ((0, generator_utils_1.getGeneratorInformation)(opts.collectionName, normalizedGeneratorName, workspace_root_1.workspaceRoot).isNxGenerator) {
+        if ((0, generator_utils_1.getGeneratorInformation)(opts.collectionName, normalizedGeneratorName, workspace_root_1.workspaceRoot, projectsConfigurations.projects).isNxGenerator) {
             const host = new tree_1.FsTree(workspace_root_1.workspaceRoot, verbose, `generating (${opts.collectionName}:${normalizedGeneratorName})`);
             const implementation = implementationFactory();
             // @todo(v17): Remove this, isStandalonePreset property is defunct.
@@ -259,7 +259,7 @@ async function generate(cwd, args) {
             return (await Promise.resolve().then(() => require('../../adapter/ngcli-adapter'))).generate(workspace_root_1.workspaceRoot, {
                 ...opts,
                 generatorOptions: combinedOpts,
-            }, verbose);
+            }, projectsConfigurations.projects, verbose);
         }
     });
 }

package/src/command-line/generate/generator-utils.d.ts

@@ -1,5 +1,6 @@
 import { Generator, GeneratorsJson, GeneratorsJsonEntry } from '../../config/misc-interfaces';
-export declare function getGeneratorInformation(collectionName: string, generatorName: string, root: string | null): {
+import { ProjectConfiguration } from '../../config/workspace-json-project-json';
+export declare function getGeneratorInformation(collectionName: string, generatorName: string, root: string | null, projects: Record<string, ProjectConfiguration>): {
     resolvedCollectionName: string;
     normalizedGeneratorName: string;
     schema: any;
@@ -8,7 +9,7 @@ export declare function getGeneratorInformation(collectionName: string, generato
     isNxGenerator: boolean;
     generatorConfiguration: GeneratorsJsonEntry;
 };
-export declare function readGeneratorsJson(collectionName: string, generator: string, root: string | null): {
+export declare function readGeneratorsJson(collectionName: string, generator: string, root: string | null, projects: Record<string, ProjectConfiguration>): {
     generatorsFilePath: string;
     generatorsJson: GeneratorsJson;
     normalizedGeneratorName: string;

package/src/command-line/generate/generator-utils.js

@@ -5,9 +5,9 @@ const path_1 = require("path");
 const schema_utils_1 = require("../../config/schema-utils");
 const fileutils_1 = require("../../utils/fileutils");
 const nx_plugin_1 = require("../../utils/nx-plugin");
-function getGeneratorInformation(collectionName, generatorName, root) {
+function getGeneratorInformation(collectionName, generatorName, root, projects) {
     try {
-        const { generatorsFilePath, generatorsJson, resolvedCollectionName, normalizedGeneratorName, } = readGeneratorsJson(collectionName, generatorName, root);
+        const { generatorsFilePath, generatorsJson, resolvedCollectionName, normalizedGeneratorName, } = readGeneratorsJson(collectionName, generatorName, root, projects);
         const generatorsDir = (0, path_1.dirname)(generatorsFilePath);
         const generatorConfig = generatorsJson.generators?.[normalizedGeneratorName] ||
             generatorsJson.schematics?.[normalizedGeneratorName];
@@ -40,7 +40,7 @@ function getGeneratorInformation(collectionName, generatorName, root) {
     }
 }
 exports.getGeneratorInformation = getGeneratorInformation;
-function readGeneratorsJson(collectionName, generator, root) {
+function readGeneratorsJson(collectionName, generator, root, projects) {
     let generatorsFilePath;
     if (collectionName.endsWith('.json')) {
         generatorsFilePath = require.resolve(collectionName, {
@@ -48,7 +48,7 @@ function readGeneratorsJson(collectionName, generator, root) {
         });
     }
     else {
-        const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(collectionName, root ? [root, __dirname] : [__dirname]);
+        const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(collectionName, projects, root ? [root, __dirname] : [__dirname]);
         const generatorsFile = packageJson.generators ?? packageJson.schematics;
         if (!generatorsFile) {
             throw new Error(`The "${collectionName}" package does not support Nx generators.`);
@@ -61,7 +61,7 @@ function readGeneratorsJson(collectionName, generator, root) {
     if (!normalizedGeneratorName) {
         for (let parent of generatorsJson.extends || []) {
             try {
-                return readGeneratorsJson(parent, generator, root);
+                return readGeneratorsJson(parent, generator, root, projects);
             }
             catch (e) { }
         }

package/src/command-line/graph/graph.d.ts

@@ -29,7 +29,7 @@ export declare function generateGraph(args: {
     groupByFolder?: boolean;
     watch?: boolean;
     open?: boolean;
-    view: 'projects' | 'tasks';
+    view: 'projects' | 'tasks' | 'project-details';
     projects?: string[];
     all?: boolean;
     targets?: string[];