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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.8.0-canary.20240917-5b34ea5",
+  "version": "19.8.0-canary.20240919-7f4a877",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -8,9 +8,6 @@
     "url": "https://github.com/nrwl/nx.git",
     "directory": "packages/nx"
   },
-  "scripts": {
-    "postinstall": "node ./bin/post-install"
-  },
   "keywords": [
     "Monorepo",
     "Angular",
@@ -71,7 +68,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.8.0-canary.20240917-5b34ea5"
+    "@nrwl/tao": "19.8.0-canary.20240919-7f4a877"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.8.0-canary.20240917-5b34ea5",
-    "@nx/nx-darwin-arm64": "19.8.0-canary.20240917-5b34ea5",
-    "@nx/nx-linux-x64-gnu": "19.8.0-canary.20240917-5b34ea5",
-    "@nx/nx-linux-x64-musl": "19.8.0-canary.20240917-5b34ea5",
-    "@nx/nx-win32-x64-msvc": "19.8.0-canary.20240917-5b34ea5",
-    "@nx/nx-linux-arm64-gnu": "19.8.0-canary.20240917-5b34ea5",
-    "@nx/nx-linux-arm64-musl": "19.8.0-canary.20240917-5b34ea5",
-    "@nx/nx-linux-arm-gnueabihf": "19.8.0-canary.20240917-5b34ea5",
-    "@nx/nx-win32-arm64-msvc": "19.8.0-canary.20240917-5b34ea5",
-    "@nx/nx-freebsd-x64": "19.8.0-canary.20240917-5b34ea5"
+    "@nx/nx-darwin-x64": "19.8.0-canary.20240919-7f4a877",
+    "@nx/nx-darwin-arm64": "19.8.0-canary.20240919-7f4a877",
+    "@nx/nx-linux-x64-gnu": "19.8.0-canary.20240919-7f4a877",
+    "@nx/nx-linux-x64-musl": "19.8.0-canary.20240919-7f4a877",
+    "@nx/nx-win32-x64-msvc": "19.8.0-canary.20240919-7f4a877",
+    "@nx/nx-linux-arm64-gnu": "19.8.0-canary.20240919-7f4a877",
+    "@nx/nx-linux-arm64-musl": "19.8.0-canary.20240919-7f4a877",
+    "@nx/nx-linux-arm-gnueabihf": "19.8.0-canary.20240919-7f4a877",
+    "@nx/nx-win32-arm64-msvc": "19.8.0-canary.20240919-7f4a877",
+    "@nx/nx-freebsd-x64": "19.8.0-canary.20240919-7f4a877"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -192,5 +189,8 @@
   },
   "main": "./bin/nx.js",
   "type": "commonjs",
-  "types": "./bin/nx.d.ts"
-}
+  "types": "./bin/nx.d.ts",
+  "scripts": {
+    "postinstall": "node ./bin/post-install"
+  }
+}

package/schemas/nx-schema.json

@@ -634,7 +634,7 @@
           "description": "Custom git commit message to use when committing the changes made by this command"
         },
         "commitArgs": {
-          "type": "string",
+          "type": ["string", "array"],
           "description": "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"
         },
         "stageChanges": {
@@ -650,7 +650,7 @@
           "description": "Custom git tag message to use when tagging the changes made by this command. This defaults to be the same value as the tag itself."
         },
         "tagArgs": {
-          "type": "string",
+          "type": ["string", "array"],
           "description": "Additional arguments to pass to the `git tag` command invoked behind the scenes"
         }
       }

package/src/command-line/activate-powerpack/activate-powerpack.d.ts

@@ -0,0 +1,2 @@
+import { ActivatePowerpackOptions } from './command-object';
+export declare function handleActivatePowerpack(options: ActivatePowerpackOptions): Promise<void>;

package/src/command-line/activate-powerpack/activate-powerpack.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleActivatePowerpack = handleActivatePowerpack;
+const workspace_root_1 = require("../../utils/workspace-root");
+const enquirer_1 = require("enquirer");
+const child_process_1 = require("child_process");
+const package_manager_1 = require("../../utils/package-manager");
+async function handleActivatePowerpack(options) {
+    const license = options.license ??
+        (await (0, enquirer_1.prompt)({
+            type: 'input',
+            name: 'license',
+            message: 'Enter your License Key',
+        }));
+    const { activatePowerpack } = await requirePowerpack();
+    activatePowerpack(workspace_root_1.workspaceRoot, license);
+}
+async function requirePowerpack() {
+    // @ts-ignore
+    return Promise.resolve().then(() => require('@nx/powerpack-license')).catch(async (e) => {
+        if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
+            try {
+                (0, child_process_1.execSync)(`${(0, package_manager_1.getPackageManagerCommand)().addDev} @nx/powerpack-license@latest`);
+                // @ts-ignore
+                return await Promise.resolve().then(() => require('@nx/powerpack-license'));
+            }
+            catch (e) {
+                throw new Error('Failed to install @nx/powerpack-license. Please install @nx/powerpack-license and try again.');
+            }
+        }
+    });
+}

package/src/command-line/activate-powerpack/command-object.d.ts

@@ -0,0 +1,6 @@
+import { CommandModule } from 'yargs';
+export interface ActivatePowerpackOptions {
+    license: string;
+    verbose: boolean;
+}
+export declare const yargsActivatePowerpackCommand: CommandModule<{}, ActivatePowerpackOptions>;

package/src/command-line/activate-powerpack/command-object.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.yargsActivatePowerpackCommand = void 0;
+const shared_options_1 = require("../yargs-utils/shared-options");
+const handle_errors_1 = require("../../utils/handle-errors");
+exports.yargsActivatePowerpackCommand = {
+    command: 'activate-powerpack <license>',
+    describe: false,
+    // describe: 'Activate a Nx Powerpack license.',
+    builder: (yargs) => (0, shared_options_1.withVerbose)(yargs)
+        .parserConfiguration({
+        'strip-dashed': true,
+        'unknown-options-as-args': true,
+    })
+        .positional('license', {
+        type: 'string',
+        description: 'This is a License Key for Nx Powerpack.',
+    })
+        .example('$0 activate-powerpack <license key>', 'Activate a Nx Powerpack license'),
+    handler: async (args) => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
+            return (await Promise.resolve().then(() => require('./activate-powerpack'))).handleActivatePowerpack(args);
+        });
+        process.exit(exitCode);
+    },
+};

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

@@ -5,4 +5,4 @@ export interface AddOptions {
     verbose?: boolean;
     __overrides_unparsed__: string[];
 }
-export declare const yargsAddCommand: CommandModule<Record<string, unknown>, AddOptions>;
+export declare const yargsAddCommand: CommandModule<{}, AddOptions>;

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

@@ -7,7 +7,6 @@ const file_utils_1 = require("../../project-graph/file-utils");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const fileutils_1 = require("../../utils/fileutils");
 const ignore_1 = require("../../utils/ignore");
-const prettier = require("prettier");
 const configuration_1 = require("../../config/configuration");
 const typescript_1 = require("../../plugins/js/utils/typescript");
 const affected_project_graph_1 = require("../../project-graph/affected/affected-project-graph");
@@ -18,8 +17,19 @@ const object_sort_1 = require("../../utils/object-sort");
 const output_1 = require("../../utils/output");
 const package_json_1 = require("../../utils/package-json");
 const workspace_root_1 = require("../../utils/workspace-root");
-const PRETTIER_PATH = getPrettierPath();
 async function format(command, args) {
+    try {
+        require('prettier');
+    }
+    catch {
+        output_1.output.error({
+            title: 'Prettier is not installed.',
+            bodyLines: [
+                `Please install "prettier" and try again, or don't run the "nx format:${command}" command.`,
+            ],
+        });
+        process.exit(1);
+    }
     const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: false }, (0, configuration_1.readNxJson)());
     const patterns = (await getPatterns({ ...args, ...nxArgs })).map(
     // prettier removes one of the \
@@ -72,7 +82,7 @@ async function getPatterns(args) {
         }
         const p = (0, command_line_utils_1.parseFiles)(args);
         // In prettier v3 the getSupportInfo result is a promise
-        const supportedExtensions = new Set((await prettier.getSupportInfo()).languages
+        const supportedExtensions = new Set((await require('prettier').getSupportInfo()).languages
             .flatMap((language) => language.extensions)
             .filter((extension) => !!extension)
             // Prettier supports ".swcrc" as a file instead of an extension
@@ -131,11 +141,12 @@ function write(patterns) {
             result[pattern.includes('.swcrc') ? 0 : 1].push(pattern);
             return result;
         }, [[], []]);
-        (0, node_child_process_1.execSync)(`node "${PRETTIER_PATH}" --write --list-different ${regularPatterns.join(' ')}`, {
+        const prettierPath = getPrettierPath();
+        (0, node_child_process_1.execSync)(`node "${prettierPath}" --write --list-different ${regularPatterns.join(' ')}`, {
             stdio: [0, 1, 2],
         });
         if (swcrcPatterns.length > 0) {
-            (0, node_child_process_1.execSync)(`node "${PRETTIER_PATH}" --write --list-different ${swcrcPatterns.join(' ')} --parser json`, {
+            (0, node_child_process_1.execSync)(`node "${prettierPath}" --write --list-different ${swcrcPatterns.join(' ')} --parser json`, {
                 stdio: [0, 1, 2],
             });
         }
@@ -145,8 +156,9 @@ async function check(patterns) {
     if (patterns.length === 0) {
         return [];
     }
+    const prettierPath = getPrettierPath();
     return new Promise((resolve) => {
-        (0, node_child_process_1.exec)(`node "${PRETTIER_PATH}" --list-different ${patterns.join(' ')}`, { encoding: 'utf-8' }, (error, stdout) => {
+        (0, node_child_process_1.exec)(`node "${prettierPath}" --list-different ${patterns.join(' ')}`, { encoding: 'utf-8' }, (error, stdout) => {
             if (error) {
                 // The command failed so there are files with different formatting. Prettier writes them to stdout, newline separated.
                 resolve(stdout.trim().split('\n'));
@@ -170,7 +182,12 @@ function sortTsConfig() {
         // catch noop
     }
 }
+let prettierPath;
 function getPrettierPath() {
+    if (prettierPath) {
+        return prettierPath;
+    }
     const { bin } = (0, package_json_1.readModulePackageJson)('prettier').packageJson;
-    return require.resolve(path.join('prettier', bin));
+    prettierPath = require.resolve(path.join('prettier', bin));
+    return prettierPath;
 }

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

@@ -25,7 +25,12 @@ const needs_install_1 = require("./utils/needs-install");
 const file_utils_1 = require("../../project-graph/file-utils");
 const importRemoteName = '__tmp_nx_import__';
 async function importHandler(options) {
+    process.env.NX_RUNNING_NX_IMPORT = 'true';
     let { sourceRepository, ref, source, destination } = options;
+    const destinationGitClient = new git_utils_1.GitRepository(process.cwd());
+    if (await destinationGitClient.hasUncommittedChanges()) {
+        throw new Error(`You have uncommitted changes in the destination repository. Commit or revert the changes and try again.`);
+    }
     output_1.output.log({
         title: 'Nx will walk you through the process of importing code from the source repository into this repository:',
         bodyLines: [
@@ -120,7 +125,6 @@ async function importHandler(options) {
         throw new Error(`The destination directory must be a relative path in this repository.`);
     }
     const absDestination = (0, path_1.join)(process.cwd(), destination);
-    const destinationGitClient = new git_utils_1.GitRepository(process.cwd());
     await assertDestinationEmpty(destinationGitClient, absDestination);
     const tempImportBranch = getTempImportBranch(ref);
     await sourceGitClient.addFetchRemote(importRemoteName, ref);
@@ -152,7 +156,7 @@ async function importHandler(options) {
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
     (0, workspace_context_1.resetWorkspaceContext)();
-    const { plugins, updatePackageScripts } = await (0, init_v2_1.detectPlugins)(nxJson, options.interactive);
+    const { plugins, updatePackageScripts } = await (0, init_v2_1.detectPlugins)(nxJson, options.interactive, true);
     if (packageManager !== sourcePackageManager) {
         output_1.output.warn({
             title: `Mismatched package managers`,
@@ -232,8 +236,9 @@ async function importHandler(options) {
         title: `Merging these changes into ${(0, command_line_utils_1.getBaseRef)(nxJson)}`,
         bodyLines: [
             `MERGE these changes when merging these changes.`,
-            `Do NOT squash and do NOT rebase these changes when merging these changes.`,
-            `If you would like to UNDO these changes, run "git reset HEAD~1 --hard"`,
+            `Do NOT squash these commits when merging these changes.`,
+            `If you rebase, make sure to use "--rebase-merges" to preserve merge commits.`,
+            `To UNDO these changes, run "git reset HEAD~1 --hard"`,
         ],
     });
 }

package/src/command-line/import/utils/prepare-source-repo.js

@@ -3,46 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareSourceRepo = prepareSourceRepo;
 const createSpinner = require("ora");
 const path_1 = require("path");
-const promises_1 = require("node:fs/promises");
 async function prepareSourceRepo(gitClient, ref, source, relativeDestination, tempImportBranch, sourceRemoteUrl) {
     const spinner = createSpinner().start(`Fetching ${ref} from ${sourceRemoteUrl}`);
     const relativeSourceDir = (0, path_1.relative)(gitClient.root, (0, path_1.join)(gitClient.root, source));
-    if (relativeSourceDir !== '') {
-        if (await gitClient.hasFilterRepoInstalled()) {
-            spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
-            await gitClient.filterRepo(relativeSourceDir);
-        }
-        else {
-            spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
-            await gitClient.filterBranch(relativeSourceDir, tempImportBranch);
-        }
-        spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
+    if (await gitClient.hasFilterRepoInstalled()) {
+        spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
+        await gitClient.filterRepo(relativeSourceDir, relativeDestination);
     }
-    const destinationInSource = (0, path_1.join)(gitClient.root, relativeDestination);
-    spinner.start(`Moving files and git history to ${destinationInSource}`);
-    // The result of filter-branch will contain only the files in the subdirectory at its root.
-    const files = await gitClient.getGitFiles('.');
-    try {
-        await (0, promises_1.rm)(destinationInSource, {
-            recursive: true,
-        });
+    else {
+        spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
+        await gitClient.filterBranch(relativeSourceDir, relativeDestination, tempImportBranch);
     }
-    catch { }
-    await (0, promises_1.mkdir)(destinationInSource, { recursive: true });
-    for (const file of files) {
-        spinner.start(`Moving files and git history to ${destinationInSource}: ${file}`);
-        const newPath = (0, path_1.join)(destinationInSource, file);
-        await (0, promises_1.mkdir)((0, path_1.dirname)(newPath), { recursive: true });
-        try {
-            await gitClient.move(file, newPath);
-        }
-        catch {
-            await wait(100);
-            await gitClient.move(file, newPath);
-        }
-    }
-    await gitClient.commit(`chore(repo): move ${source} to ${relativeDestination} to prepare to be imported`);
-    await gitClient.amendCommit();
+    spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
     spinner.succeed(`${sourceRemoteUrl} has been prepared to be imported into this workspace on a temporary branch: ${tempImportBranch} in ${gitClient.root}`);
 }
 function wait(ms) {

package/src/command-line/init/init-v2.d.ts

@@ -8,7 +8,7 @@ export interface InitArgs {
 }
 export declare function installPlugins(repoRoot: string, plugins: string[], pmc: PackageManagerCommands, updatePackageScripts: boolean): void;
 export declare function initHandler(options: InitArgs): Promise<void>;
-export declare function detectPlugins(nxJson: NxJsonConfiguration, interactive: boolean): Promise<{
+export declare function detectPlugins(nxJson: NxJsonConfiguration, interactive: boolean, includeAngularCli?: boolean): Promise<{
     plugins: string[];
     updatePackageScripts: boolean;
 }>;

package/src/command-line/init/init-v2.js

@@ -127,8 +127,8 @@ const npmPackageToPluginMap = {
     'react-native': '@nx/react-native',
     '@remix-run/dev': '@nx/remix',
 };
-async function detectPlugins(nxJson, interactive) {
-    let files = ['package.json'].concat(await (0, workspace_context_1.globWithWorkspaceContext)(process.cwd(), ['**/*/package.json']));
+async function detectPlugins(nxJson, interactive, includeAngularCli) {
+    let files = ['package.json'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), ['**/*/package.json']));
     const currentPlugins = new Set((nxJson.plugins ?? []).map((p) => {
         const plugin = typeof p === 'string' ? p : p.plugin;
         return (0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(plugin);
@@ -149,13 +149,19 @@ async function detectPlugins(nxJson, interactive) {
             ...packageJson.dependencies,
             ...packageJson.devDependencies,
         };
-        for (const [dep, plugin] of Object.entries(npmPackageToPluginMap)) {
+        const _npmPackageToPluginMap = {
+            ...npmPackageToPluginMap,
+        };
+        if (includeAngularCli) {
+            _npmPackageToPluginMap['@angular/cli'] = '@nx/angular';
+        }
+        for (const [dep, plugin] of Object.entries(_npmPackageToPluginMap)) {
             if (deps[dep]) {
                 detectedPlugins.add(plugin);
             }
         }
     }
-    let gradlewFiles = ['gradlew', 'gradlew.bat'].concat(await (0, workspace_context_1.globWithWorkspaceContext)(process.cwd(), [
+    let gradlewFiles = ['gradlew', 'gradlew.bat'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), [
         '**/gradlew',
         '**/gradlew.bat',
     ]));

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

@@ -6,6 +6,7 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const output_1 = require("../../utils/output");
 const plugins_1 = require("../../utils/plugins");
 const workspace_root_1 = require("../../utils/workspace-root");
+const output_2 = require("../../utils/plugins/output");
 /**
  * List available plugins or capabilities within a specific plugin
  *
@@ -29,6 +30,7 @@ async function listHandler(args) {
         }
         (0, plugins_1.listPlugins)(installedPlugins, 'Installed plugins:');
         (0, plugins_1.listAlsoAvailableCorePlugins)(installedPlugins);
+        (0, output_2.listPowerpackPlugins)();
         output_1.output.note({
             title: 'Community Plugins',
             bodyLines: [

package/src/command-line/nx-commands.d.ts

@@ -7,4 +7,4 @@ export declare const parserConfiguration: Partial<yargs.ParserConfigurationOptio
  * from the `.argv` call, so the object and it's relative scripts can
  * le executed correctly.
  */
-export declare const commandsObject: yargs.Argv<{}>;
+export declare const commandsObject: yargs.Argv<unknown>;

package/src/command-line/nx-commands.js

@@ -3,31 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.commandsObject = exports.parserConfiguration = void 0;
 const chalk = require("chalk");
 const yargs = require("yargs");
-const command_object_1 = require("./affected/command-object");
-const command_object_2 = require("./connect/command-object");
-const command_object_3 = require("./daemon/command-object");
-const command_object_4 = require("./graph/command-object");
-const command_object_5 = require("./exec/command-object");
-const command_object_6 = require("./format/command-object");
-const command_object_7 = require("./generate/command-object");
-const command_object_8 = require("./import/command-object");
-const command_object_9 = require("./init/command-object");
-const command_object_10 = require("./list/command-object");
-const command_object_11 = require("./migrate/command-object");
-const command_object_12 = require("./new/command-object");
-const command_object_13 = require("./repair/command-object");
-const command_object_14 = require("./report/command-object");
-const command_object_15 = require("./run/command-object");
-const command_object_16 = require("./run-many/command-object");
-const command_object_17 = require("./show/command-object");
-const command_object_18 = require("./watch/command-object");
-const command_object_19 = require("./reset/command-object");
-const command_object_20 = require("./release/command-object");
-const command_object_21 = require("./add/command-object");
-const command_object_22 = require("./login/command-object");
-const command_object_23 = require("./logout/command-object");
+const command_object_1 = require("./activate-powerpack/command-object");
+const command_object_2 = require("./affected/command-object");
+const command_object_3 = require("./connect/command-object");
+const command_object_4 = require("./daemon/command-object");
+const command_object_5 = require("./graph/command-object");
+const command_object_6 = require("./exec/command-object");
+const command_object_7 = require("./format/command-object");
+const command_object_8 = require("./generate/command-object");
+const command_object_9 = require("./import/command-object");
+const command_object_10 = require("./init/command-object");
+const command_object_11 = require("./list/command-object");
+const command_object_12 = require("./migrate/command-object");
+const command_object_13 = require("./new/command-object");
+const command_object_14 = require("./repair/command-object");
+const command_object_15 = require("./report/command-object");
+const command_object_16 = require("./run/command-object");
+const command_object_17 = require("./run-many/command-object");
+const command_object_18 = require("./show/command-object");
+const command_object_19 = require("./watch/command-object");
+const command_object_20 = require("./reset/command-object");
+const command_object_21 = require("./release/command-object");
+const command_object_22 = require("./add/command-object");
+const command_object_23 = require("./login/command-object");
+const command_object_24 = require("./logout/command-object");
 const command_objects_1 = require("./deprecated/command-objects");
-const command_object_24 = require("./sync/command-object");
+const command_object_25 = require("./sync/command-object");
 // Ensure that the output takes up the available width of the terminal.
 yargs.wrap(yargs.terminalWidth());
 exports.parserConfiguration = {
@@ -44,44 +45,63 @@ exports.commandsObject = yargs
     .parserConfiguration(exports.parserConfiguration)
     .usage(chalk.bold('Smart Monorepos · Fast CI'))
     .demandCommand(1, '')
-    .command(command_object_21.yargsAddCommand)
-    .command(command_object_1.yargsAffectedBuildCommand)
-    .command(command_object_1.yargsAffectedCommand)
-    .command(command_object_1.yargsAffectedE2ECommand)
-    .command(command_object_1.yargsAffectedLintCommand)
-    .command(command_object_1.yargsAffectedTestCommand)
+    .command(command_object_1.yargsActivatePowerpackCommand)
+    .command(command_object_22.yargsAddCommand)
+    .command(command_object_2.yargsAffectedBuildCommand)
+    .command(command_object_2.yargsAffectedCommand)
+    .command(command_object_2.yargsAffectedE2ECommand)
+    .command(command_object_2.yargsAffectedLintCommand)
+    .command(command_object_2.yargsAffectedTestCommand)
     .command(command_objects_1.yargsAffectedGraphCommand)
-    .command(command_object_2.yargsConnectCommand)
-    .command(command_object_3.yargsDaemonCommand)
-    .command(command_object_4.yargsGraphCommand)
-    .command(command_object_5.yargsExecCommand)
-    .command(command_object_6.yargsFormatCheckCommand)
-    .command(command_object_6.yargsFormatWriteCommand)
-    .command(command_object_7.yargsGenerateCommand)
-    .command(command_object_8.yargsImportCommand)
-    .command(command_object_9.yargsInitCommand)
-    .command(command_object_11.yargsInternalMigrateCommand)
-    .command(command_object_10.yargsListCommand)
-    .command(command_object_11.yargsMigrateCommand)
-    .command(command_object_12.yargsNewCommand)
+    .command(command_object_3.yargsConnectCommand)
+    .command(command_object_4.yargsDaemonCommand)
+    .command(command_object_5.yargsGraphCommand)
+    .command(command_object_6.yargsExecCommand)
+    .command(command_object_7.yargsFormatCheckCommand)
+    .command(command_object_7.yargsFormatWriteCommand)
+    .command(command_object_8.yargsGenerateCommand)
+    .command(command_object_9.yargsImportCommand)
+    .command(command_object_10.yargsInitCommand)
+    .command(command_object_12.yargsInternalMigrateCommand)
+    .command(command_object_11.yargsListCommand)
+    .command(command_object_12.yargsMigrateCommand)
+    .command(command_object_13.yargsNewCommand)
     .command(command_objects_1.yargsPrintAffectedCommand)
-    .command(command_object_20.yargsReleaseCommand)
-    .command(command_object_13.yargsRepairCommand)
-    .command(command_object_14.yargsReportCommand)
-    .command(command_object_19.yargsResetCommand)
-    .command(command_object_15.yargsRunCommand)
-    .command(command_object_16.yargsRunManyCommand)
-    .command(command_object_17.yargsShowCommand)
-    .command(command_object_24.yargsSyncCommand)
-    .command(command_object_24.yargsSyncCheckCommand)
-    .command(command_object_2.yargsViewLogsCommand)
-    .command(command_object_18.yargsWatchCommand)
-    .command(command_object_15.yargsNxInfixCommand)
-    .command(command_object_22.yargsLoginCommand)
-    .command(command_object_23.yargsLogoutCommand)
+    .command(command_object_21.yargsReleaseCommand)
+    .command(command_object_14.yargsRepairCommand)
+    .command(command_object_15.yargsReportCommand)
+    .command(command_object_20.yargsResetCommand)
+    .command(command_object_16.yargsRunCommand)
+    .command(command_object_17.yargsRunManyCommand)
+    .command(command_object_18.yargsShowCommand)
+    .command(command_object_25.yargsSyncCommand)
+    .command(command_object_25.yargsSyncCheckCommand)
+    .command(command_object_3.yargsViewLogsCommand)
+    .command(command_object_19.yargsWatchCommand)
+    .command(command_object_16.yargsNxInfixCommand)
+    .command(command_object_23.yargsLoginCommand)
+    .command(command_object_24.yargsLogoutCommand)
+    .command(resolveConformanceCommandObject())
     .scriptName('nx')
     .help()
     // NOTE: we handle --version in nx.ts, this just tells yargs that the option exists
     // so that it shows up in help. The default yargs implementation of --version is not
     // hit, as the implementation in nx.ts is hit first and calls process.exit(0).
     .version();
+function resolveConformanceCommandObject() {
+    try {
+        const { yargsConformanceCommand } = require('@nx/powerpack-conformance');
+        return yargsConformanceCommand;
+    }
+    catch (e) {
+        return {
+            command: 'conformance',
+            // Hide from --help output in the common case of not having the plugin installed
+            describe: false,
+            handler: () => {
+                // TODO: Add messaging to help with learning more about powerpack and conformance
+                process.exit(1);
+            },
+        };
+    }
+}

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

@@ -14,10 +14,10 @@ interface GitCommitAndTagOptions {
     stageChanges?: boolean;
     gitCommit?: boolean;
     gitCommitMessage?: string;
-    gitCommitArgs?: string;
+    gitCommitArgs?: string | string[];
     gitTag?: boolean;
     gitTagMessage?: string;
-    gitTagArgs?: string;
+    gitTagArgs?: string | string[];
 }
 export type VersionOptions = NxReleaseArgs & GitCommitAndTagOptions & VersionPlanArgs & FirstReleaseArgs & {
     specifier?: string;

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

@@ -155,6 +155,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             conventionalCommits: false,
             generator: '@nx/js:release-version',
             generatorOptions: {},
+            groupPreVersionCommand: '',
         },
         changelog: {
             createRelease: false,
@@ -206,7 +207,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         WORKSPACE_DEFAULTS.versionPlans);
     const rootConventionalCommitsConfig = deepMergeDefaults([WORKSPACE_DEFAULTS.conventionalCommits], fillUnspecifiedConventionalCommitsProperties(normalizeConventionalCommitsConfig(userConfig.conventionalCommits)));
     // these options are not supported at the group level, only the root/command level
-    const rootVersionWithoutGlobalOptions = { ...rootVersionConfig };
+    const rootVersionWithoutGlobalOptions = {
+        ...rootVersionConfig,
+    };
     delete rootVersionWithoutGlobalOptions.git;
     delete rootVersionWithoutGlobalOptions.preVersionCommand;
     // Apply conventionalCommits shorthand to the final group defaults if explicitly configured in the original user config
@@ -316,7 +319,10 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             projects: matchingProjects,
             version: deepMergeDefaults(
             // First apply any group level defaults, then apply actual root level config, then group level config
-            [GROUP_DEFAULTS.version, rootVersionWithoutGlobalOptions], releaseGroup.version),
+            [
+                GROUP_DEFAULTS.version,
+                { ...rootVersionWithoutGlobalOptions, groupPreVersionCommand: '' },
+            ], releaseGroup.version),
             // If the user has set any changelog config at all, including at the root level, then use one set of defaults, otherwise default to false for the whole feature
             changelog: releaseGroup.changelog || rootChangelogConfig.projectChangelogs
                 ? deepMergeDefaults(groupChangelogDefaults, releaseGroup.changelog || {})

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

@@ -37,7 +37,7 @@ export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, lo
 }): Promise<string>;
 export declare function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, }: {
     messages: string[];
-    additionalArgs?: string;
+    additionalArgs?: string | string[];
     dryRun?: boolean;
     verbose?: boolean;
     logFn?: (message: string) => void;
@@ -45,7 +45,7 @@ export declare function gitCommit({ messages, additionalArgs, dryRun, verbose, l
 export declare function gitTag({ tag, message, additionalArgs, dryRun, verbose, logFn, }: {
     tag: string;
     message?: string;
-    additionalArgs?: string;
+    additionalArgs?: string | string[];
     dryRun?: boolean;
     verbose?: boolean;
     logFn?: (message: string) => void;