nx 21.2.0-beta.1 → 21.2.0-beta.3

package/README.md

@@ -22,7 +22,7 @@
 
 # Nx: Smart Repos · Fast Builds
 
-Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
+An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
 
 ## Getting Started
 

package/bin/init-local.d.ts

@@ -4,5 +4,5 @@ import { WorkspaceTypeAndRoot } from '../src/utils/find-workspace-root';
  *
  * @param workspace Relevant local workspace properties
  */
-export declare function initLocal(workspace: WorkspaceTypeAndRoot): void;
+export declare function initLocal(workspace: WorkspaceTypeAndRoot): Promise<void>;
 export declare function rewriteTargetsAndProjects(args: string[]): string[];

package/bin/init-local.js

@@ -5,12 +5,13 @@ exports.rewriteTargetsAndProjects = rewriteTargetsAndProjects;
 const perf_hooks_1 = require("perf_hooks");
 const nx_commands_1 = require("../src/command-line/nx-commands");
 const strip_indents_1 = require("../src/utils/strip-indents");
+const nx_console_prompt_1 = require("../src/utils/nx-console-prompt");
 /**
  * Nx is being run inside a workspace.
  *
  * @param workspace Relevant local workspace properties
  */
-function initLocal(workspace) {
+async function initLocal(workspace) {
     process.env.NX_CLI_SET = 'true';
     try {
         perf_hooks_1.performance.mark('init-local');
@@ -20,6 +21,11 @@ function initLocal(workspace) {
             handleAngularCLIFallbacks(workspace);
             return;
         }
+        // Ensure NxConsole is installed if the user has it configured.
+        try {
+            await (0, nx_console_prompt_1.ensureNxConsoleInstalled)();
+        }
+        catch { }
         const command = process.argv[2];
         if (command === 'run' || command === 'g' || command === 'generate') {
             nx_commands_1.commandsObject.parse(process.argv.slice(2));

package/bin/nx.js

@@ -23,7 +23,7 @@ process.on('exit', (...args) => {
         globalThis.tuiOnProcessExit(...args);
     }
 });
-function main() {
+async function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
         process.argv[2] !== '--help' &&
@@ -32,12 +32,12 @@ function main() {
     }
     require('nx/src/utils/perf-logging');
     const workspace = (0, find_workspace_root_1.findWorkspaceRoot)(process.cwd());
-    perf_hooks_1.performance.mark('loading dotenv files:start');
     if (workspace) {
+        perf_hooks_1.performance.mark('loading dotenv files:start');
         (0, dotenv_1.loadRootEnvFiles)(workspace.dir);
+        perf_hooks_1.performance.mark('loading dotenv files:end');
+        perf_hooks_1.performance.measure('loading dotenv files', 'loading dotenv files:start', 'loading dotenv files:end');
     }
-    perf_hooks_1.performance.mark('loading dotenv files:end');
-    perf_hooks_1.performance.measure('loading dotenv files', 'loading dotenv files:start', 'loading dotenv files:end');
     // new is a special case because there is no local workspace to load
     if (process.argv[2] === 'new' ||
         process.argv[2] === '_migrate' ||
@@ -75,7 +75,7 @@ function main() {
         }
         // this file is already in the local workspace
         if (isLocalInstall) {
-            (0, init_local_1.initLocal)(workspace);
+            await (0, init_local_1.initLocal)(workspace);
         }
         else {
             // Nx is being run from globally installed CLI - hand off to the local
@@ -223,4 +223,7 @@ const getLatestVersionOfNx = ((fn) => {
 process.on('exit', () => {
     (0, db_connection_1.removeDbConnections)();
 });
-main();
+main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.2.0-beta.1",
+  "version": "21.2.0-beta.3",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.2.0-beta.1",
-    "@nx/nx-darwin-x64": "21.2.0-beta.1",
-    "@nx/nx-freebsd-x64": "21.2.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "21.2.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "21.2.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "21.2.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "21.2.0-beta.1",
-    "@nx/nx-linux-x64-musl": "21.2.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "21.2.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "21.2.0-beta.1"
+    "@nx/nx-darwin-arm64": "21.2.0-beta.3",
+    "@nx/nx-darwin-x64": "21.2.0-beta.3",
+    "@nx/nx-freebsd-x64": "21.2.0-beta.3",
+    "@nx/nx-linux-arm-gnueabihf": "21.2.0-beta.3",
+    "@nx/nx-linux-arm64-gnu": "21.2.0-beta.3",
+    "@nx/nx-linux-arm64-musl": "21.2.0-beta.3",
+    "@nx/nx-linux-x64-gnu": "21.2.0-beta.3",
+    "@nx/nx-linux-x64-musl": "21.2.0-beta.3",
+    "@nx/nx-win32-arm64-msvc": "21.2.0-beta.3",
+    "@nx/nx-win32-x64-msvc": "21.2.0-beta.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -6,7 +6,7 @@ const documentation_1 = require("../yargs-utils/documentation");
 const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsAffectedCommand = {
     command: 'affected',
-    describe: 'Run target for affected projects. See https://nx.dev/ci/features/affected for more details.',
+    describe: 'Run target for affected projects. Affected projects are projects that have been changed and projects that depend on the changed projects. See https://nx.dev/ci/features/affected for more details.',
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withTuiOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withTargetAndConfigurationOption)((0, shared_options_1.withBatch)(yargs))))))
         .option('all', {
         type: 'boolean',

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

@@ -36,6 +36,7 @@ export interface ExpandedTaskInputsReponse {
 }
 export declare function generateGraph(args: {
     file?: string;
+    print?: boolean;
     host?: string;
     port?: number;
     groupByFolder?: boolean;

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

@@ -9,6 +9,7 @@ const minimatch_1 = require("minimatch");
 const node_url_1 = require("node:url");
 const open = require("open");
 const path_1 = require("path");
+const net = require("net");
 const perf_hooks_1 = require("perf_hooks");
 const configuration_1 = require("../../config/configuration");
 const fileutils_1 = require("../../utils/fileutils");
@@ -207,7 +208,7 @@ async function generateGraph(args, affectedProjects) {
         }
     }
     if (args.affected) {
-        affectedProjects = (await (0, affected_1.getAffectedGraphNodes)((0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: args.file !== 'stdout' }, (0, configuration_1.readNxJson)()).nxArgs, rawGraph)).map((n) => n.name);
+        affectedProjects = (await (0, affected_1.getAffectedGraphNodes)((0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: !args.print && args.file !== 'stdout' }, (0, configuration_1.readNxJson)()).nxArgs, rawGraph)).map((n) => n.name);
     }
     if (args.exclude) {
         const invalidExcludes = [];
@@ -226,13 +227,12 @@ async function generateGraph(args, affectedProjects) {
     }
     let html = (0, node_fs_1.readFileSync)((0, path_1.join)(__dirname, '../../core/graph/index.html'), 'utf-8');
     prunedGraph = filterGraph(prunedGraph, args.focus || null, args.exclude || []);
+    if (args.print || args.file === 'stdout') {
+        console.log(JSON.stringify(await createJsonOutput(prunedGraph, rawGraph, args.projects, args.targets), null, 2));
+        await output_1.output.drain();
+        process.exit(0);
+    }
     if (args.file) {
-        // stdout is a magical constant that doesn't actually write a file
-        if (args.file === 'stdout') {
-            console.log(JSON.stringify(await createJsonOutput(prunedGraph, rawGraph, args.projects, args.targets), null, 2));
-            await output_1.output.drain();
-            process.exit(0);
-        }
         const workspaceFolder = workspace_root_1.workspaceRoot;
         const ext = (0, path_1.extname)(args.file);
         const fullFilePath = (0, path_1.isAbsolute)(args.file)
@@ -287,7 +287,20 @@ async function generateGraph(args, affectedProjects) {
     }
     else {
         const environmentJs = buildEnvironmentJs(args.exclude || [], args.watch, !!args.file && args.file.endsWith('html') ? 'build' : 'serve');
-        const { app, url } = await startServer(html, environmentJs, args.host || '127.0.0.1', args.port || 4211, args.watch, affectedProjects, args.focus, args.groupByFolder, args.exclude);
+        let app;
+        let url;
+        try {
+            const result = await startServer(html, environmentJs, args.host || '127.0.0.1', args.port || 4211, args.watch, affectedProjects, args.focus, args.groupByFolder, args.exclude);
+            app = result.app;
+            url = result.url;
+        }
+        catch (err) {
+            output_1.output.error({
+                title: 'Failed to start graph server',
+                bodyLines: [err.message],
+            });
+            process.exit(1);
+        }
         url.pathname = args.view;
         if (args.focus) {
             url.pathname += '/' + encodeURIComponent(args.focus);
@@ -318,6 +331,28 @@ async function generateGraph(args, affectedProjects) {
         });
     }
 }
+function findAvailablePort(startPort, host = '127.0.0.1') {
+    return new Promise((resolve, reject) => {
+        const server = net.createServer();
+        server.listen(startPort, host, () => {
+            const port = server.address().port;
+            server.close(() => {
+                resolve(port);
+            });
+        });
+        server.on('error', (err) => {
+            if (err.code === 'EADDRINUSE') {
+                // Port is in use, try the next one
+                findAvailablePort(startPort + 1, host)
+                    .then(resolve)
+                    .catch(reject);
+            }
+            else {
+                reject(err);
+            }
+        });
+    });
+}
 async function startServer(html, environmentJs, host, port = 4211, watchForChanges = true, affected = [], focus = null, groupByFolder = false, exclude = []) {
     let unregisterFileWatcher;
     if (watchForChanges && !client_1.daemonClient.enabled()) {
@@ -418,9 +453,19 @@ async function startServer(html, environmentJs, host, port = 4211, watchForChang
     };
     process.on('SIGINT', () => handleTermination(128 + 2));
     process.on('SIGTERM', () => handleTermination(128 + 15));
-    return new Promise((res) => {
-        app.listen(port, host, () => {
-            res({ app, url: new node_url_1.URL(`http://${host}:${port}`) });
+    // Find an available port starting from the requested port
+    const availablePort = await findAvailablePort(port, host);
+    return new Promise((res, rej) => {
+        app.on('error', (err) => {
+            rej(err);
+        });
+        app.listen(availablePort, host, () => {
+            if (availablePort !== port) {
+                output_1.output.note({
+                    title: `Port ${port} was already in use, using port ${availablePort} instead`,
+                });
+            }
+            res({ app, url: new node_url_1.URL(`http://${host}:${availablePort}`) });
         });
     });
 }

package/src/command-line/init/implementation/angular/legacy-angular-versions.js

@@ -5,28 +5,47 @@ const child_process_1 = require("child_process");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const fileutils_1 = require("../../../../utils/fileutils");
+const installation_directory_1 = require("../../../../utils/installation-directory");
 const object_sort_1 = require("../../../../utils/object-sort");
 const output_1 = require("../../../../utils/output");
 const package_json_1 = require("../../../../utils/package-json");
 const package_manager_1 = require("../../../../utils/package-manager");
-const utils_1 = require("../utils");
 const connect_to_nx_cloud_1 = require("../../../connect/connect-to-nx-cloud");
+const utils_1 = require("../utils");
 // map of Angular major versions to Nx versions to use for legacy `nx init` migrations,
 // key is major Angular version and value is Nx version to use
 const nxAngularLegacyVersionMap = {
     14: '~17.0.0',
     15: '~19.0.0',
     16: '~20.1.0',
+    17: '~21.1.0',
 };
 // min major angular version supported in latest Nx
-const minMajorAngularVersionSupported = 17;
+const minMajorAngularVersionSupported = Math.max(...Object.keys(nxAngularLegacyVersionMap).map(Number)) + 1;
 // version when the Nx CLI changed from @nrwl/tao & @nrwl/cli to nx
 const versionWithConsolidatedPackages = '13.9.0';
 // version when packages were rescoped from @nrwl/* to @nx/*
 const versionWithRescopeToNx = '16.0.0-beta.2';
 async function getLegacyMigrationFunctionIfApplicable(repoRoot, options) {
-    const angularVersion = (0, package_json_1.readModulePackageJson)('@angular/core').packageJson.version;
-    const majorAngularVersion = (0, semver_1.major)(angularVersion);
+    let majorAngularVersion;
+    try {
+        const angularVersion = (0, package_json_1.readModulePackageJson)('@angular/core', [
+            repoRoot,
+            ...(0, installation_directory_1.getNxRequirePaths)(),
+        ]).packageJson.version;
+        majorAngularVersion = (0, semver_1.major)(angularVersion);
+    }
+    catch {
+        output_1.output.error({
+            title: 'Could not determine the existing Angular version',
+            bodyLines: [
+                'Please ensure "@angular/core" is installed in the workspace and you are running this command from the root of the workspace.',
+            ],
+        });
+        // errors are caught in the initHandler and not logged to the user, so we
+        // log it first and then throw to ensure it is logged to the user
+        throw new Error('Could not determine the existing Angular version');
+    }
     if (majorAngularVersion >= minMajorAngularVersionSupported) {
         // non-legacy
         return null;

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

@@ -1175,6 +1175,7 @@ function getImplementationPath(collection, collectionPath, name) {
 }
 function nxCliPath(nxWorkspaceRoot) {
     const version = process.env.NX_MIGRATE_CLI_VERSION || 'latest';
+    const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
     try {
         const packageManager = (0, package_manager_1.detectPackageManager)();
         const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
@@ -1187,25 +1188,30 @@ function nxCliPath(nxWorkspaceRoot) {
             license: 'MIT',
         });
         (0, package_manager_1.copyPackageManagerConfigurationFiles)(nxWorkspaceRoot ?? workspace_root_1.workspaceRoot, tmpDir);
+        // Let's print the output of the install process to the console when verbose
+        // is enabled, so it's easier to debug issues with the installation process
+        const stdio = isVerbose
+            ? ['ignore', 'inherit', 'inherit']
+            : 'ignore';
         if (pmc.preInstall) {
             // ensure package.json and repo in tmp folder is set to a proper package manager state
             (0, child_process_1.execSync)(pmc.preInstall, {
                 cwd: tmpDir,
-                stdio: ['ignore', 'ignore', 'ignore'],
+                stdio,
                 windowsHide: false,
             });
             // if it's berry ensure we set the node_linker to node-modules
             if (packageManager === 'yarn' && pmc.ciInstall.includes('immutable')) {
                 (0, child_process_1.execSync)('yarn config set nodeLinker node-modules', {
                     cwd: tmpDir,
-                    stdio: ['ignore', 'ignore', 'ignore'],
+                    stdio,
                     windowsHide: false,
                 });
             }
         }
         (0, child_process_1.execSync)(pmc.install, {
             cwd: tmpDir,
-            stdio: ['ignore', 'ignore', 'ignore'],
+            stdio,
             windowsHide: false,
         });
         // Set NODE_PATH so that these modules can be used for module resolution
@@ -1215,7 +1221,7 @@ function nxCliPath(nxWorkspaceRoot) {
     }
     catch (e) {
         console.error(`Failed to install the ${version} version of the migration script. Using the current version.`);
-        if (process.env.NX_VERBOSE_LOGGING === 'true') {
+        if (isVerbose) {
             console.error(e);
         }
         return null;

package/src/command-line/release/changelog.js

@@ -330,19 +330,25 @@ function createAPI(overrideReleaseConfig) {
                             }, releaseGroup.releaseTagPatternCheckAllBranchesWhen))?.tag;
                         if (!fromRef && useAutomaticFromRef) {
                             const firstCommit = await (0, git_1.getFirstGitCommit)();
-                            const allCommits = await getCommits(firstCommit, toSHA);
-                            const commitsForProject = allCommits.filter((c) => c.affectedFiles.find((f) => f.startsWith(project.data.root)));
-                            fromRef = commitsForProject[0]?.shortHash;
+                            commits = await filterProjectCommits({
+                                fromSHA: firstCommit,
+                                toSHA,
+                                projectPath: project.data.root,
+                            });
+                            fromRef = commits[0]?.shortHash;
                             if (args.verbose) {
                                 console.log(`Determined --from ref for ${project.name} from the first commit in which it exists: ${fromRef}`);
                             }
-                            commits = commitsForProject;
                         }
                         if (!fromRef && !commits) {
                             throw new Error(`Unable to determine the previous git tag. If this is the first release of your workspace, use the --first-release option or set the "release.changelog.automaticFromRef" config property in nx.json to generate a changelog from the first commit. Otherwise, be sure to configure the "release.releaseTagPattern" property in nx.json to match the structure of your repository's git tags.`);
                         }
                         if (!commits) {
-                            commits = await getCommits(fromRef, toSHA);
+                            commits = await filterProjectCommits({
+                                fromSHA: fromRef,
+                                toSHA,
+                                projectPath: project.data.root,
+                            });
                         }
                         const { fileMap } = await (0, file_map_utils_1.createFileMapUsingProjectGraph)(projectGraph);
                         const fileToProjectMap = createFileToProjectMap(fileMap.projectFileMap);
@@ -903,6 +909,10 @@ async function getCommits(fromSHA, toSHA) {
     // Parse as conventional commits
     return (0, git_1.parseCommits)(rawCommits);
 }
+async function filterProjectCommits({ fromSHA, toSHA, projectPath, }) {
+    const allCommits = await getCommits(fromSHA, toSHA);
+    return allCommits.filter((c) => c.affectedFiles.find((f) => f.startsWith(projectPath)));
+}
 function filterHiddenChanges(changes, conventionalCommitsConfig) {
     return changes.filter((change) => {
         const type = change.type;

package/src/command-line/release/version/release-group-processor.js

@@ -956,7 +956,7 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
         let bumpType = 'none';
         if (releaseGroup.projectsRelationship === 'fixed') {
             // For fixed groups, we only need to check one project
-            const project = releaseGroupFilteredProjects[0];
+            const project = releaseGroupFilteredProjects.values().next().value;
             const dependencies = this.projectGraph.dependencies[project] || [];
             const hasDependencyInChangedGroup = dependencies.some((dep) => this.getReleaseGroupNameForProject(dep.target) ===
                 changedDependencyGroup);

package/src/command-line/release/version/topological-sort.js

@@ -37,5 +37,5 @@ function topologicalSort(nodes, getEdges) {
             visit(node);
         }
     }
-    return result.reverse();
+    return result;
 }

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

@@ -123,7 +123,7 @@ async function reportHandler() {
         bodyLines.push(LINE_SEPARATOR);
         bodyLines.push('Local workspace plugins:');
         for (const plugin of localPlugins) {
-            bodyLines.push(`\t ${chalk.green(plugin)}`);
+            bodyLines.push(`${chalk.green(plugin)}`);
         }
     }
     if (cache) {

package/src/command-line/run/run-one.d.ts

@@ -1,3 +1,5 @@
+import { ProjectGraph } from '../../config/project-graph';
+import { NxJsonConfiguration } from '../../config/nx-json';
 import { TargetDependencyConfig } from '../../config/workspace-json-project-json';
 export declare function runOne(cwd: string, args: {
     [k: string]: any;
@@ -5,3 +7,11 @@ export declare function runOne(cwd: string, args: {
     excludeTaskDependencies: boolean;
     loadDotEnvFiles: boolean;
 }): Promise<void>;
+export declare function parseRunOneOptions(cwd: string, parsedArgs: {
+    [k: string]: any;
+}, projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): {
+    project: any;
+    target: any;
+    configuration: any;
+    parsedArgs: any;
+};

package/src/command-line/run/run-one.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runOne = runOne;
+exports.parseRunOneOptions = parseRunOneOptions;
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
-const perf_hooks_1 = require("perf_hooks");
 const project_graph_1 = require("../../project-graph/project-graph");
 const workspace_root_1 = require("../../utils/workspace-root");
 const split_target_1 = require("../../utils/split-target");
@@ -17,8 +17,8 @@ async function runOne(cwd, args, extraTargetDependencies = {}, extraOptions = {
     excludeTaskDependencies: args.excludeTaskDependencies,
     loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',
 }) {
-    perf_hooks_1.performance.mark('code-loading:end');
-    perf_hooks_1.performance.measure('code-loading', 'init-local', 'code-loading:end');
+    performance.mark('code-loading:end');
+    performance.measure('code-loading', 'init-local', 'code-loading:end');
     const nxJson = (0, configuration_1.readNxJson)();
     const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
     const opts = parseRunOneOptions(cwd, args, projectGraph, nxJson);
@@ -107,8 +107,19 @@ function parseRunOneOptions(cwd, parsedArgs, projectGraph, nxJson) {
             project = defaultProjectName;
         }
     }
-    else {
-        target = parsedArgs.target ?? parsedArgs['project:target:configuration'];
+    else if (parsedArgs.target) {
+        target = parsedArgs.target;
+    }
+    else if (parsedArgs['project:target:configuration']) {
+        // If project:target:configuration exists but has no colon, check if it's a project with run target
+        if (projectGraph.nodes[parsedArgs['project:target:configuration']]?.data
+            ?.targets?.run) {
+            target = 'run';
+            project = parsedArgs['project:target:configuration'];
+        }
+        else {
+            target = parsedArgs['project:target:configuration'];
+        }
     }
     if (parsedArgs.project) {
         project = parsedArgs.project;