nx 19.6.4 → 19.6.6

package/src/command-line/release/utils/get-touched-projects-for-group.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createGetTouchedProjectsForGroup = createGetTouchedProjectsForGroup;
+const workspace_projects_1 = require("../../../project-graph/affected/locators/workspace-projects");
+const file_utils_1 = require("../../../project-graph/file-utils");
+const ignore_1 = require("../../../utils/ignore");
+const output_1 = require("../../../utils/output");
+const config_1 = require("../config/config");
+/**
+ * Create a function that returns the touched projects for a given release group. Only relevant when version plans are enabled.
+ */
+function createGetTouchedProjectsForGroup(nxArgs, projectGraph, changedFiles, fileData) {
+    /**
+     * Create a minimal subset of touched projects based on the configured ignore patterns, we only need
+     * to recompute when the ignorePatternsForPlanCheck differs between release groups.
+     */
+    const serializedIgnorePatternsToTouchedProjects = new Map();
+    return async function getTouchedProjectsForGroup(releaseGroup, 
+    // We don't access releaseGroups.projects directly, because we need to take the --projects filter into account
+    releaseGroupFilteredProjectNames, hasProjectsFilter) {
+        // The current release group doesn't leverage version plans
+        if (!releaseGroup.versionPlans) {
+            return [];
+        }
+        // Exclude patterns from .nxignore, .gitignore and explicit version plan config
+        let serializedIgnorePatterns = '[]';
+        const ignore = (0, ignore_1.getIgnoreObject)();
+        if (typeof releaseGroup.versionPlans !== 'boolean' &&
+            Array.isArray(releaseGroup.versionPlans.ignorePatternsForPlanCheck) &&
+            releaseGroup.versionPlans.ignorePatternsForPlanCheck.length) {
+            output_1.output.note({
+                title: `Applying configured ignore patterns to changed files${releaseGroup.name !== config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
+                    ? ` for release group "${releaseGroup.name}"`
+                    : ''}`,
+                bodyLines: [
+                    ...releaseGroup.versionPlans.ignorePatternsForPlanCheck.map((pattern) => `  - ${pattern}`),
+                ],
+            });
+            ignore.add(releaseGroup.versionPlans.ignorePatternsForPlanCheck);
+            serializedIgnorePatterns = JSON.stringify(releaseGroup.versionPlans.ignorePatternsForPlanCheck);
+        }
+        let touchedProjects = {};
+        if (serializedIgnorePatternsToTouchedProjects.has(serializedIgnorePatterns)) {
+            touchedProjects = serializedIgnorePatternsToTouchedProjects.get(serializedIgnorePatterns);
+        }
+        else {
+            // We only care about directly touched projects, not implicitly affected ones etc
+            const touchedProjectsArr = await (0, workspace_projects_1.getTouchedProjects)((0, file_utils_1.calculateFileChanges)(changedFiles, fileData, nxArgs, undefined, ignore), projectGraph.nodes);
+            touchedProjects = touchedProjectsArr.reduce((acc, project) => ({ ...acc, [project]: true }), {});
+            serializedIgnorePatternsToTouchedProjects.set(serializedIgnorePatterns, touchedProjects);
+        }
+        const touchedProjectsUnderReleaseGroup = releaseGroupFilteredProjectNames.filter((project) => touchedProjects[project]);
+        if (touchedProjectsUnderReleaseGroup.length) {
+            output_1.output.log({
+                title: `Touched projects${hasProjectsFilter ? ` (after --projects filter applied)` : ''} based on changed files${releaseGroup.name !== config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
+                    ? ` under release group "${releaseGroup.name}"`
+                    : ''}`,
+                bodyLines: [
+                    ...touchedProjectsUnderReleaseGroup.map((project) => `  - ${project}`),
+                    '',
+                    'NOTE: You can adjust your "versionPlans.ignorePatternsForPlanCheck" config to stop certain files from resulting in projects being classed as touched for the purposes of this command.',
+                ],
+            });
+        }
+        else {
+            output_1.output.log({
+                title: `No touched projects${hasProjectsFilter ? ` (after --projects filter applied)` : ''} found based on changed files${typeof releaseGroup.versionPlans !== 'boolean' &&
+                    Array.isArray(releaseGroup.versionPlans.ignorePatternsForPlanCheck) &&
+                    releaseGroup.versionPlans.ignorePatternsForPlanCheck.length
+                    ? ' combined with configured ignore patterns'
+                    : ''}${releaseGroup.name !== config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
+                    ? ` under release group "${releaseGroup.name}"`
+                    : ''}`,
+            });
+        }
+        return touchedProjectsUnderReleaseGroup;
+    };
+}

package/src/command-line/release/utils/git.d.ts

@@ -62,6 +62,6 @@ export declare function parseConventionalCommitsMessage(message: string): {
     description: string;
     breaking: boolean;
 } | null;
-export declare function parseGitCommit(commit: RawGitCommit): GitCommit | null;
+export declare function parseGitCommit(commit: RawGitCommit, isVersionPlanCommit?: boolean): GitCommit | null;
 export declare function getCommitHash(ref: string): Promise<string>;
 export declare function getFirstGitCommit(): Promise<string>;

package/src/command-line/release/utils/git.js

@@ -136,7 +136,7 @@ async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, cwd,
                 ignoredFiles.push(f);
                 // git add will fail if trying to add an untracked file that doesn't exist
             }
-            else if (changedTrackedFiles.has(f)) {
+            else if (changedTrackedFiles.has(f) || dryRun) {
                 filesToAdd.push(f);
             }
         }
@@ -281,6 +281,30 @@ function parseConventionalCommitsMessage(message) {
         breaking: Boolean(match.groups.breaking),
     };
 }
+function extractReferencesFromCommitMessage(message, shortHash) {
+    const references = [];
+    for (const m of message.matchAll(PullRequestRE)) {
+        references.push({ type: 'pull-request', value: m[1] });
+    }
+    for (const m of message.matchAll(IssueRE)) {
+        if (!references.some((i) => i.value === m[1])) {
+            references.push({ type: 'issue', value: m[1] });
+        }
+    }
+    references.push({ value: shortHash, type: 'hash' });
+    return references;
+}
+function getAllAuthorsForCommit(commit) {
+    const authors = [commit.author];
+    // Additional authors can be specified in the commit body (depending on the VCS provider)
+    for (const match of commit.body.matchAll(CoAuthoredByRegex)) {
+        authors.push({
+            name: (match.groups.name || '').trim(),
+            email: (match.groups.email || '').trim(),
+        });
+    }
+    return authors;
+}
 // https://www.conventionalcommits.org/en/v1.0.0/
 // https://regex101.com/r/FSfNvA/1
 const ConventionalCommitRegex = /(?<type>[a-z]+)(\((?<scope>.+)\))?(?<breaking>!)?: (?<description>.+)/i;
@@ -289,7 +313,25 @@ const PullRequestRE = /\([ a-z]*(#\d+)\s*\)/gm;
 const IssueRE = /(#\d+)/gm;
 const ChangedFileRegex = /(A|M|D|R\d*|C\d*)\t([^\t\n]*)\t?(.*)?/gm;
 const RevertHashRE = /This reverts commit (?<hash>[\da-f]{40})./gm;
-function parseGitCommit(commit) {
+function parseGitCommit(commit, isVersionPlanCommit = false) {
+    // For version plans, we do not require conventional commits and therefore cannot extract data based on that format
+    if (isVersionPlanCommit) {
+        return {
+            ...commit,
+            description: commit.message,
+            type: '',
+            scope: '',
+            references: extractReferencesFromCommitMessage(commit.message, commit.shortHash),
+            // The commit message is not the source of truth for a breaking (major) change in version plans, so the value is not relevant
+            // TODO(v20): Make the current GitCommit interface more clearly tied to conventional commits
+            isBreaking: false,
+            authors: getAllAuthorsForCommit(commit),
+            // Not applicable to version plans
+            affectedFiles: [],
+            // Not applicable, a version plan cannot have been added in a commit that also reverts another commit
+            revertedHashes: [],
+        };
+    }
     const parsedMessage = parseConventionalCommitsMessage(commit.message);
     if (!parsedMessage) {
         return null;
@@ -298,16 +340,7 @@ function parseGitCommit(commit) {
     const isBreaking = parsedMessage.breaking || commit.body.includes('BREAKING CHANGE:');
     let description = parsedMessage.description;
     // Extract references from message
-    const references = [];
-    for (const m of description.matchAll(PullRequestRE)) {
-        references.push({ type: 'pull-request', value: m[1] });
-    }
-    for (const m of description.matchAll(IssueRE)) {
-        if (!references.some((i) => i.value === m[1])) {
-            references.push({ type: 'issue', value: m[1] });
-        }
-    }
-    references.push({ value: commit.shortHash, type: 'hash' });
+    const references = extractReferencesFromCommitMessage(description, commit.shortHash);
     // Remove references and normalize
     description = description.replace(PullRequestRE, '').trim();
     let type = parsedMessage.type;
@@ -322,13 +355,7 @@ function parseGitCommit(commit) {
         description = commit.message;
     }
     // Find all authors
-    const authors = [commit.author];
-    for (const match of commit.body.matchAll(CoAuthoredByRegex)) {
-        authors.push({
-            name: (match.groups.name || '').trim(),
-            email: (match.groups.email || '').trim(),
-        });
-    }
+    const authors = getAllAuthorsForCommit(commit);
     // Extract file changes from commit body
     const affectedFiles = Array.from(commit.body.matchAll(ChangedFileRegex)).reduce((prev, [fullLine, changeType, file1, file2]) => 
     // file2 only exists for some change types, such as renames

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

@@ -82,7 +82,7 @@ function createAPI(overrideReleaseConfig) {
         }
         if (!args.specifier) {
             const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
-            (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes));
+            await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
         }
         else {
             if (args.verbose && releaseGroups.some((g) => !!g.versionPlans)) {

package/src/command-line/yargs-utils/shared-options.d.ts

@@ -3,7 +3,7 @@ interface ExcludeOptions {
     exclude: string[];
 }
 export declare const defaultYargsParserConfiguration: Partial<ParserConfigurationOptions>;
-export declare function withExcludeOption(yargs: Argv): Argv<ExcludeOptions>;
+export declare function withExcludeOption<T>(yargs: Argv<T>): Argv<T & ExcludeOptions>;
 export interface RunOptions {
     exclude: string;
     parallel: string;
@@ -20,6 +20,7 @@ export interface RunOptions {
     batch: boolean;
     useAgents: boolean;
     excludeTaskDependencies: boolean;
+    skipSync: boolean;
 }
 export declare function withRunOptions<T>(yargs: Argv<T>): Argv<T & RunOptions>;
 export declare function withTargetAndConfigurationOption(yargs: Argv, demandOption?: boolean): Argv<{

package/src/command-line/yargs-utils/shared-options.js

@@ -79,6 +79,11 @@ function withRunOptions(yargs) {
         describe: 'Skips running dependent tasks first',
         type: 'boolean',
         default: false,
+    })
+        .option('skipSync', {
+        type: 'boolean',
+        // TODO(leo): add description and make it visible once it is stable
+        hidden: true,
     })
         .options('cloud', {
         type: 'boolean',