nx 21.2.0-beta.2 → 21.2.0-beta.4

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.2",
+  "version": "21.2.0-beta.4",
   "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.2",
-    "@nx/nx-darwin-x64": "21.2.0-beta.2",
-    "@nx/nx-freebsd-x64": "21.2.0-beta.2",
-    "@nx/nx-linux-arm-gnueabihf": "21.2.0-beta.2",
-    "@nx/nx-linux-arm64-gnu": "21.2.0-beta.2",
-    "@nx/nx-linux-arm64-musl": "21.2.0-beta.2",
-    "@nx/nx-linux-x64-gnu": "21.2.0-beta.2",
-    "@nx/nx-linux-x64-musl": "21.2.0-beta.2",
-    "@nx/nx-win32-arm64-msvc": "21.2.0-beta.2",
-    "@nx/nx-win32-x64-msvc": "21.2.0-beta.2"
+    "@nx/nx-darwin-arm64": "21.2.0-beta.4",
+    "@nx/nx-darwin-x64": "21.2.0-beta.4",
+    "@nx/nx-freebsd-x64": "21.2.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "21.2.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "21.2.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "21.2.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "21.2.0-beta.4",
+    "@nx/nx-linux-x64-musl": "21.2.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "21.2.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "21.2.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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;