nx 19.8.0-canary.20240917-5b34ea5 → 19.8.0-canary.20240919-7f4a877

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

@@ -188,7 +188,12 @@ async function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, })
         commandArgs.push('--message', message);
     }
     if (additionalArgs) {
-        commandArgs.push(...additionalArgs.split(' '));
+        if (Array.isArray(additionalArgs)) {
+            commandArgs.push(...additionalArgs);
+        }
+        else {
+            commandArgs.push(...additionalArgs.split(' '));
+        }
     }
     if (verbose) {
         logFn(dryRun
@@ -224,7 +229,12 @@ async function gitTag({ tag, message, additionalArgs, dryRun, verbose, logFn, })
         message || tag,
     ];
     if (additionalArgs) {
-        commandArgs.push(...additionalArgs.split(' '));
+        if (Array.isArray(additionalArgs)) {
+            commandArgs.push(...additionalArgs);
+        }
+        else {
+            commandArgs.push(...additionalArgs.split(' '));
+        }
     }
     if (verbose) {
         logFn(dryRun

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

@@ -45,7 +45,7 @@ export declare function commitChanges({ changedFiles, deletedFiles, isDryRun, is
     isDryRun?: boolean;
     isVerbose?: boolean;
     gitCommitMessages?: string[];
-    gitCommitArgs?: string;
+    gitCommitArgs?: string | string[];
 }): Promise<void>;
 export declare function createCommitMessageValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData, commitMessage: string): string[];
 export declare function createGitTagValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData): string[];

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

@@ -207,6 +207,10 @@ function createAPI(overrideReleaseConfig) {
          */
         for (const releaseGroup of releaseGroups) {
             const releaseGroupName = releaseGroup.name;
+            runPreVersionCommand(releaseGroup.version.groupPreVersionCommand, {
+                dryRun: args.dryRun,
+                verbose: args.verbose,
+            });
             const projectBatches = (0, batch_projects_by_generator_config_1.batchProjectsByGeneratorConfig)(projectGraph, releaseGroup, 
             // Batch based on all projects within the release group
             releaseGroup.projects);

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

@@ -15,6 +15,8 @@ export declare function reportHandler(): Promise<void>;
 export interface ReportData {
     pm: PackageManager;
     pmVersion: string;
+    powerpackLicense: any | null;
+    powerpackPlugins: PackageJson[];
     localPlugins: string[];
     communityPlugins: PackageJson[];
     registeredPlugins: string[];
@@ -43,6 +45,7 @@ interface OutOfSyncPackageGroup {
     migrateTarget: string;
 }
 export declare function findMisalignedPackagesForPackage(base: PackageJson): undefined | OutOfSyncPackageGroup;
+export declare function findInstalledPowerpackPlugins(): PackageJson[];
 export declare function findInstalledCommunityPlugins(): PackageJson[];
 export declare function findRegisteredPluginsBeingUsed(nxJson: NxJsonConfiguration): string[];
 export declare function findInstalledPackagesWeCareAbout(): {

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

@@ -4,6 +4,7 @@ exports.patternsWeIgnoreInCommunityReport = exports.packagesWeCareAbout = void 0
 exports.reportHandler = reportHandler;
 exports.getReportData = getReportData;
 exports.findMisalignedPackagesForPackage = findMisalignedPackagesForPackage;
+exports.findInstalledPowerpackPlugins = findInstalledPowerpackPlugins;
 exports.findInstalledCommunityPlugins = findInstalledCommunityPlugins;
 exports.findRegisteredPluginsBeingUsed = findRegisteredPluginsBeingUsed;
 exports.findInstalledPackagesWeCareAbout = findInstalledPackagesWeCareAbout;
@@ -20,6 +21,7 @@ const installed_plugins_1 = require("../../utils/plugins/installed-plugins");
 const installation_directory_1 = require("../../utils/installation-directory");
 const nx_json_1 = require("../../config/nx-json");
 const error_types_1 = require("../../project-graph/error-types");
+const powerpack_1 = require("../../utils/powerpack");
 const nxPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '../../../package.json'));
 exports.packagesWeCareAbout = [
     'lerna',
@@ -29,6 +31,7 @@ exports.packagesWeCareAbout = [
 ];
 exports.patternsWeIgnoreInCommunityReport = [
     ...exports.packagesWeCareAbout,
+    new RegExp('@nx/powerpack*'),
     '@schematics/angular',
     new RegExp('@angular/*'),
     '@nestjs/schematics',
@@ -43,7 +46,7 @@ const LINE_SEPARATOR = '---------------------------------------';
  *
  */
 async function reportHandler() {
-    const { pm, pmVersion, localPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, } = await getReportData();
+    const { pm, pmVersion, powerpackLicense, localPlugins, powerpackPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, } = await getReportData();
     const fields = [
         ['Node', process.versions.node],
         ['OS', `${process.platform}-${process.arch}`],
@@ -58,6 +61,17 @@ async function reportHandler() {
     packageVersionsWeCareAbout.forEach((p) => {
         bodyLines.push(`${chalk.green(p.package.padEnd(padding))} : ${chalk.bold(p.version)}`);
     });
+    if (powerpackLicense) {
+        bodyLines.push(LINE_SEPARATOR);
+        bodyLines.push(chalk.green('Nx Powerpack'));
+        bodyLines.push(`Licensed to ${powerpackLicense.organizationName} for ${powerpackLicense.seatCount} user${powerpackLicense.seatCount > 1 ? 's' : ''} in ${powerpackLicense.workspaceCount} workspace${powerpackLicense.workspaceCount > 1 ? 's' : ''} until ${new Date(powerpackLicense.expiresAt * 1000).toLocaleDateString()}`);
+        bodyLines.push('');
+        padding =
+            Math.max(...powerpackPlugins.map((powerpackPlugin) => powerpackPlugin.name.length)) + 1;
+        for (const powerpackPlugin of powerpackPlugins) {
+            bodyLines.push(`${chalk.green(powerpackPlugin.name.padEnd(padding))} : ${chalk.bold(powerpackPlugin.version)}`);
+        }
+    }
     if (registeredPlugins.length) {
         bodyLines.push(LINE_SEPARATOR);
         bodyLines.push('Registered Plugins:');
@@ -106,6 +120,7 @@ async function getReportData() {
     const { graph, error: projectGraphError } = await tryGetProjectGraph();
     const nxJson = (0, nx_json_1.readNxJson)();
     const localPlugins = await findLocalPlugins(graph, nxJson);
+    const powerpackPlugins = findInstalledPowerpackPlugins();
     const communityPlugins = findInstalledCommunityPlugins();
     const registeredPlugins = findRegisteredPluginsBeingUsed(nxJson);
     const packageVersionsWeCareAbout = findInstalledPackagesWeCareAbout();
@@ -121,8 +136,15 @@ async function getReportData() {
     }
     const outOfSyncPackageGroup = findMisalignedPackagesForPackage(nxPackageJson);
     const native = isNativeAvailable();
+    let powerpackLicense = null;
+    try {
+        powerpackLicense = await (0, powerpack_1.getPowerpackLicenseInformation)();
+    }
+    catch { }
     return {
         pm,
+        powerpackLicense,
+        powerpackPlugins,
         pmVersion,
         localPlugins,
         communityPlugins,
@@ -197,6 +219,10 @@ function findMisalignedPackagesForPackage(base) {
         }
         : undefined;
 }
+function findInstalledPowerpackPlugins() {
+    const installedPlugins = (0, installed_plugins_1.findInstalledPlugins)();
+    return installedPlugins.filter((dep) => new RegExp('@nx/powerpack*').test(dep.name));
+}
 function findInstalledCommunityPlugins() {
     const installedPlugins = (0, installed_plugins_1.findInstalledPlugins)();
     return installedPlugins.filter((dep) => dep.name !== 'nx' &&

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

@@ -101,9 +101,9 @@ export interface NxReleaseGitConfiguration {
      */
     commitMessage?: string;
     /**
-     * Additional arguments (added after the --message argument, which may or may not be customized with --git-commit-message) to pass to the `git commit` command invoked behind the scenes
+     * Additional arguments (added after the --message argument, which may or may not be customized with --git-commit-message) to pass to the `git commit` command invoked behind the scenes. May be a string or array of strings.
      */
-    commitArgs?: string;
+    commitArgs?: string | string[];
     /**
      * Whether or not to stage the changes made by this command. Always treated as true if commit is true.
      */
@@ -117,9 +117,9 @@ export interface NxReleaseGitConfiguration {
      */
     tagMessage?: string;
     /**
-     * Additional arguments to pass to the `git tag` command invoked behind the scenes
+     * Additional arguments to pass to the `git tag` command invoked behind the scenes. . May be a string or array of strings.
      */
-    tagArgs?: string;
+    tagArgs?: string | string[];
 }
 export interface NxReleaseConventionalCommitsConfiguration {
     types?: Record<string, 
@@ -179,7 +179,15 @@ export interface NxReleaseConfiguration {
          *
          * NOTE: git configuration is not supported at the group level, only the root/command level
          */
-        version?: NxReleaseVersionConfiguration;
+        version?: NxReleaseVersionConfiguration & {
+            /**
+             * A command to run after validation of nx release configuration, but before versioning begins.
+             * Used for preparing build artifacts. If --dry-run is passed, the command is still executed, but
+             * with the NX_DRY_RUN environment variable set to 'true'.
+             * It will run in addition to the global `preVersionCommand`
+             */
+            groupPreVersionCommand?: string;
+        };
         /**
          * Project changelogs are disabled by default.
          *