nx 19.7.1 → 19.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.7.1",
+  "version": "19.7.3",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.7.1"
+    "@nrwl/tao": "19.7.3"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.7.1",
-    "@nx/nx-darwin-arm64": "19.7.1",
-    "@nx/nx-linux-x64-gnu": "19.7.1",
-    "@nx/nx-linux-x64-musl": "19.7.1",
-    "@nx/nx-win32-x64-msvc": "19.7.1",
-    "@nx/nx-linux-arm64-gnu": "19.7.1",
-    "@nx/nx-linux-arm64-musl": "19.7.1",
-    "@nx/nx-linux-arm-gnueabihf": "19.7.1",
-    "@nx/nx-win32-arm64-msvc": "19.7.1",
-    "@nx/nx-freebsd-x64": "19.7.1"
+    "@nx/nx-darwin-x64": "19.7.3",
+    "@nx/nx-darwin-arm64": "19.7.3",
+    "@nx/nx-linux-x64-gnu": "19.7.3",
+    "@nx/nx-linux-x64-musl": "19.7.3",
+    "@nx/nx-win32-x64-msvc": "19.7.3",
+    "@nx/nx-linux-arm64-gnu": "19.7.3",
+    "@nx/nx-linux-arm64-musl": "19.7.3",
+    "@nx/nx-linux-arm-gnueabihf": "19.7.3",
+    "@nx/nx-win32-arm64-msvc": "19.7.3",
+    "@nx/nx-freebsd-x64": "19.7.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -12,13 +12,13 @@ const fileutils_1 = require("../../utils/fileutils");
 const logger_1 = require("../../utils/logger");
 const output_1 = require("../../utils/output");
 const package_manager_1 = require("../../utils/package-manager");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const plugins_1 = require("../../utils/plugins");
 const versions_1 = require("../../utils/versions");
 const workspace_root_1 = require("../../utils/workspace-root");
 const add_nx_scripts_1 = require("../init/implementation/dot-nx/add-nx-scripts");
 function addHandler(options) {
-    return (0, params_1.handleErrors)(options.verbose, async () => {
+    return (0, handle_errors_1.handleErrors)(options.verbose, async () => {
         output_1.output.addNewline();
         const [pkgName, version] = parsePackageSpecifier(options.packageSpecifier);
         const nxJson = (0, nx_json_1.readNxJson)();

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsAffectedE2ECommand = exports.yargsAffectedLintCommand = exports.yargsAffectedBuildCommand = exports.yargsAffectedTestCommand = exports.yargsAffectedCommand = void 0;
 const documentation_1 = require("../yargs-utils/documentation");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsAffectedCommand = {
     command: 'affected',
     describe: 'Run target for affected projects.',
@@ -18,7 +18,7 @@ exports.yargsAffectedCommand = {
         }
     }), 'affected'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             return (await Promise.resolve().then(() => require('./affected'))).affected('affected', (0, shared_options_1.withOverrides)(args));
         });
         process.exit(exitCode);
@@ -29,7 +29,7 @@ exports.yargsAffectedTestCommand = {
     describe: false,
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs)))), 'affected'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             return (await Promise.resolve().then(() => require('./affected'))).affected('affected', {
                 ...(0, shared_options_1.withOverrides)(args),
                 target: 'test',
@@ -43,7 +43,7 @@ exports.yargsAffectedBuildCommand = {
     describe: false,
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs)))), 'affected'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             return (await Promise.resolve().then(() => require('./affected'))).affected('affected', {
                 ...(0, shared_options_1.withOverrides)(args),
                 target: 'build',
@@ -57,7 +57,7 @@ exports.yargsAffectedLintCommand = {
     describe: false,
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs)))), 'affected'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             return (await Promise.resolve().then(() => require('./affected'))).affected('affected', {
                 ...(0, shared_options_1.withOverrides)(args),
                 target: 'lint',
@@ -71,7 +71,7 @@ exports.yargsAffectedE2ECommand = {
     describe: false,
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs)))), 'affected'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             return (await Promise.resolve().then(() => require('./affected'))).affected('affected', {
                 ...(0, shared_options_1.withOverrides)(args),
                 target: 'e2e',

package/src/command-line/deprecated/command-objects.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsPrintAffectedCommand = exports.yargsAffectedGraphCommand = void 0;
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const shared_options_1 = require("../yargs-utils/shared-options");
 const command_object_1 = require("../graph/command-object");
 const affectedGraphDeprecationMessage = 'Use `nx graph --affected`, or `nx affected --graph` instead depending on which best suits your use case. The `affected:graph` command has been removed in Nx 19.';
@@ -15,7 +15,7 @@ exports.yargsAffectedGraphCommand = {
     aliases: ['affected:dep-graph'],
     builder: (yargs) => (0, shared_options_1.withAffectedOptions)((0, command_object_1.withGraphOptions)(yargs)),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(false, () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(false, () => {
             throw new Error(affectedGraphDeprecationMessage);
         });
         process.exit(exitCode);
@@ -39,7 +39,7 @@ exports.yargsPrintAffectedCommand = {
         describe: 'Select the type of projects to be returned (e.g., --type=app).',
     }),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(false, () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(false, () => {
             throw new Error(printAffectedDeprecationMessage);
         });
         process.exit(exitCode);

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

@@ -12,6 +12,7 @@ const tree_1 = require("../../generators/tree");
 const project_graph_1 = require("../../project-graph/project-graph");
 const logger_1 = require("../../utils/logger");
 const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const local_plugins_1 = require("../../utils/plugins/local-plugins");
 const print_help_1 = require("../../utils/print-help");
 const workspace_root_1 = require("../../utils/workspace-root");
@@ -206,7 +207,7 @@ function printGenHelp(opts, schema, normalizedGeneratorName, aliases) {
     });
 }
 async function generate(cwd, args) {
-    return (0, params_1.handleErrors)(args.verbose, async () => {
+    return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
         const nxJsonConfiguration = (0, configuration_1.readNxJson)();
         const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
         const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);

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

@@ -3,21 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsImportCommand = void 0;
 const documentation_1 = require("../yargs-utils/documentation");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsImportCommand = {
-    command: 'import [sourceRemoteUrl] [destination]',
+    command: 'import [sourceRepository] [destinationDirectory]',
     describe: false,
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withVerbose)(yargs
-        .positional('sourceRemoteUrl', {
+        .positional('sourceRepository', {
         type: 'string',
         description: 'The remote URL of the source to import.',
     })
-        .positional('destination', {
+        .positional('destinationDirectory', {
         type: 'string',
+        alias: 'destination',
         description: 'The directory in the current workspace to import into.',
     })
-        .option('source', {
+        .option('sourceDirectory', {
         type: 'string',
+        alias: 'source',
         description: 'The directory in the source repository to import from.',
     })
         .option('ref', {
@@ -34,7 +36,7 @@ exports.yargsImportCommand = {
         default: true,
     })), 'import'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose, async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
             return (await Promise.resolve().then(() => require('./import'))).importHandler(args);
         });
         process.exit(exitCode);

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

@@ -2,7 +2,7 @@ export interface ImportOptions {
     /**
      * The remote URL of the repository to import
      */
-    sourceRemoteUrl: string;
+    sourceRepository: string;
     /**
      * The branch or reference to import
      */

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

@@ -25,41 +25,40 @@ 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) {
-    let { sourceRemoteUrl, ref, source, destination } = options;
+    let { sourceRepository, ref, source, destination } = options;
     output_1.output.log({
-        title: 'Nx will walk you through the process of importing code from another repository into this workspace:',
+        title: 'Nx will walk you through the process of importing code from the source repository into this repository:',
         bodyLines: [
-            `1. Nx will clone the other repository into a temporary directory`,
-            `2. Code to be imported will be moved to the same directory it will be imported into on a temporary branch`,
-            `3. The code will be merged into the current branch in this workspace`,
-            `4. Nx will recommend plugins to integrate tools used in the imported code with Nx`,
-            `5. The code will be successfully imported into this workspace`,
+            `1. Nx will clone the source repository into a temporary directory`,
+            `2. The project code from the sourceDirectory will be moved to the destinationDirectory on a temporary branch in this repository`,
+            `3. The temporary branch will be merged into the current branch in this repository`,
+            `4. Nx will recommend plugins to integrate any new tools used in the imported code`,
             '',
-            `Git history will be preserved during this process`,
+            `Git history will be preserved during this process as long as you MERGE these changes. Do NOT squash and do NOT rebase the changes when merging branches.  If you would like to UNDO these changes, run "git reset HEAD~1 --hard"`,
         ],
     });
     const tempImportDirectory = (0, path_1.join)(tmp_1.tmpdir, 'nx-import');
-    if (!sourceRemoteUrl) {
-        sourceRemoteUrl = (await (0, enquirer_1.prompt)([
+    if (!sourceRepository) {
+        sourceRepository = (await (0, enquirer_1.prompt)([
             {
                 type: 'input',
-                name: 'sourceRemoteUrl',
+                name: 'sourceRepository',
                 message: 'What is the URL of the repository you want to import? (This can be a local git repository or a git remote URL)',
                 required: true,
             },
-        ])).sourceRemoteUrl;
+        ])).sourceRepository;
     }
     try {
-        const maybeLocalDirectory = await (0, promises_1.stat)(sourceRemoteUrl);
+        const maybeLocalDirectory = await (0, promises_1.stat)(sourceRepository);
         if (maybeLocalDirectory.isDirectory()) {
-            sourceRemoteUrl = (0, path_1.resolve)(sourceRemoteUrl);
+            sourceRepository = (0, path_1.resolve)(sourceRepository);
         }
     }
     catch (e) {
         // It's a remote url
     }
-    const sourceRepoPath = (0, path_1.join)(tempImportDirectory, 'repo');
-    const spinner = createSpinner(`Cloning ${sourceRemoteUrl} into a temporary directory: ${sourceRepoPath} (Use --depth to limit commit history and speed up clone times)`).start();
+    const sourceTempRepoPath = (0, path_1.join)(tempImportDirectory, 'repo');
+    const spinner = createSpinner(`Cloning ${sourceRepository} into a temporary directory: ${sourceTempRepoPath} (Use --depth to limit commit history and speed up clone times)`).start();
     try {
         await (0, promises_1.rm)(tempImportDirectory, { recursive: true });
     }
@@ -67,17 +66,17 @@ async function importHandler(options) {
     await (0, promises_1.mkdir)(tempImportDirectory, { recursive: true });
     let sourceGitClient;
     try {
-        sourceGitClient = await (0, git_utils_1.cloneFromUpstream)(sourceRemoteUrl, sourceRepoPath, {
+        sourceGitClient = await (0, git_utils_1.cloneFromUpstream)(sourceRepository, sourceTempRepoPath, {
             originName: importRemoteName,
             depth: options.depth,
         });
     }
     catch (e) {
-        spinner.fail(`Failed to clone ${sourceRemoteUrl} into ${sourceRepoPath}`);
-        let errorMessage = `Failed to clone ${sourceRemoteUrl} into ${sourceRepoPath}. Please double check the remote and try again.\n${e.message}`;
+        spinner.fail(`Failed to clone ${sourceRepository} into ${sourceTempRepoPath}`);
+        let errorMessage = `Failed to clone ${sourceRepository} into ${sourceTempRepoPath}. Please double check the remote and try again.\n${e.message}`;
         throw new Error(errorMessage);
     }
-    spinner.succeed(`Cloned into ${sourceRepoPath}`);
+    spinner.succeed(`Cloned into ${sourceTempRepoPath}`);
     // Detecting the package manager before preparing the source repo for import.
     const sourcePackageManager = (0, package_manager_1.detectPackageManager)(sourceGitClient.root);
     if (!ref) {
@@ -116,14 +115,17 @@ async function importHandler(options) {
             },
         ])).destination;
     }
-    const absSource = (0, path_1.join)(sourceRepoPath, source);
+    const absSource = (0, path_1.join)(sourceTempRepoPath, source);
+    if ((0, path_1.isAbsolute)(destination)) {
+        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);
     await sourceGitClient.fetch(importRemoteName, ref);
-    spinner.succeed(`Fetched ${ref} from ${sourceRemoteUrl}`);
+    spinner.succeed(`Fetched ${ref} from ${sourceRepository}`);
     spinner.start(`Checking out a temporary branch, ${tempImportBranch} based on ${ref}`);
     await sourceGitClient.checkout(tempImportBranch, {
         new: true,
@@ -134,14 +136,15 @@ async function importHandler(options) {
         await (0, promises_1.stat)(absSource);
     }
     catch (e) {
-        throw new Error(`The source directory ${source} does not exist in ${sourceRemoteUrl}. Please double check to make sure it exists.`);
+        throw new Error(`The source directory ${source} does not exist in ${sourceRepository}. Please double check to make sure it exists.`);
     }
     const packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot);
     const originalPackageWorkspaces = await (0, needs_install_1.getPackagesInPackageManagerWorkspace)(packageManager);
+    const sourceIsNxWorkspace = (0, node_fs_1.existsSync)((0, path_1.join)(sourceGitClient.root, 'nx.json'));
     const relativeDestination = (0, path_1.relative)(destinationGitClient.root, absDestination);
-    await (0, prepare_source_repo_1.prepareSourceRepo)(sourceGitClient, ref, source, relativeDestination, tempImportBranch, sourceRemoteUrl);
-    await createTemporaryRemote(destinationGitClient, (0, path_1.join)(sourceRepoPath, '.git'), importRemoteName);
-    await (0, merge_remote_source_1.mergeRemoteSource)(destinationGitClient, sourceRemoteUrl, tempImportBranch, destination, importRemoteName, ref);
+    await (0, prepare_source_repo_1.prepareSourceRepo)(sourceGitClient, ref, source, relativeDestination, tempImportBranch, sourceRepository);
+    await createTemporaryRemote(destinationGitClient, (0, path_1.join)(sourceTempRepoPath, '.git'), importRemoteName);
+    await (0, merge_remote_source_1.mergeRemoteSource)(destinationGitClient, sourceRepository, tempImportBranch, destination, importRemoteName, ref);
     spinner.start('Cleaning up temporary files and remotes');
     await (0, promises_1.rm)(tempImportDirectory, { recursive: true });
     await destinationGitClient.deleteGitRemote(importRemoteName);
@@ -202,13 +205,25 @@ async function importHandler(options) {
         });
     }
     await warnOnMissingWorkspacesEntry(packageManager, pmc, relativeDestination);
+    if (source != destination) {
+        output_1.output.warn({
+            title: `Check configuration files`,
+            bodyLines: [
+                `The source directory (${source}) and destination directory (${destination}) are different.`,
+                `You may need to update configuration files to match the directory in this repository.`,
+                sourceIsNxWorkspace
+                    ? `For example, path options in project.json such as "main", "tsConfig", and "outputPath" need to be updated.`
+                    : `For example, relative paths in tsconfig.json and other tooling configuration files may need to be updated.`,
+            ],
+        });
+    }
     // When only a subdirectory is imported, there might be devDependencies in the root package.json file
     // that needs to be ported over as well.
     if (ref) {
         output_1.output.log({
             title: `Check root dependencies`,
             bodyLines: [
-                `"dependencies" and "devDependencies" are not imported from the source repository (${sourceRemoteUrl}).`,
+                `"dependencies" and "devDependencies" are not imported from the source repository (${sourceRepository}).`,
                 `You may need to add some of those dependencies to this workspace in order to run tasks successfully.`,
             ],
         });

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

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loginHandler = loginHandler;
 const update_manager_1 = require("../../nx-cloud/update-manager");
 const get_cloud_options_1 = require("../../nx-cloud/utilities/get-cloud-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 function loginHandler(args) {
     if (args.nxCloudUrl) {
         process.env.NX_CLOUD_API = args.nxCloudUrl;
     }
-    return (0, params_1.handleErrors)(args.verbose, async () => {
+    return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
         const nxCloudClient = (await (0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()))
             .nxCloudClient;
         await nxCloudClient.commands.login();

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logoutHandler = logoutHandler;
 const update_manager_1 = require("../../nx-cloud/update-manager");
 const get_cloud_options_1 = require("../../nx-cloud/utilities/get-cloud-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 function logoutHandler(args) {
-    return (0, params_1.handleErrors)(args.verbose, async () => {
+    return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
         const nxCloudClient = (await (0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()))
             .nxCloudClient;
         await nxCloudClient.commands.logout();

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

@@ -18,7 +18,7 @@ const logger_1 = require("../../utils/logger");
 const git_utils_1 = require("../../utils/git-utils");
 const package_json_1 = require("../../utils/package-json");
 const package_manager_1 = require("../../utils/package-manager");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
 const output_1 = require("../../utils/output");
 const fs_1 = require("fs");
@@ -1041,7 +1041,7 @@ async function runNxMigration(root, collectionPath, collection, name) {
 }
 async function migrate(root, args, rawArgs) {
     await client_1.daemonClient.stop();
-    return (0, params_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+    return (0, handle_errors_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true', async () => {
         const opts = await parseMigrationsOptions(args);
         if (opts.type === 'generateMigrations') {
             await generateMigrationsJsonAndUpdatePackageJson(root, opts);

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.newWorkspace = newWorkspace;
 const tree_1 = require("../../generators/tree");
 const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const generator_utils_1 = require("../generate/generator-utils");
 function removeSpecialFlags(generatorOptions) {
     delete generatorOptions.interactive;
@@ -12,7 +13,7 @@ function removeSpecialFlags(generatorOptions) {
     delete generatorOptions['$0'];
 }
 async function newWorkspace(cwd, args) {
-    return (0, params_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true' || args.verbose, async () => {
+    return (0, handle_errors_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true' || args.verbose, async () => {
         const isInteractive = args.interactive;
         const { normalizedGeneratorName, schema, implementationFactory } = (0, generator_utils_1.getGeneratorInformation)('@nx/workspace/generators.json', 'new', null, {});
         removeSpecialFlags(args);

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

@@ -16,7 +16,7 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const utils_1 = require("../../tasks-runner/utils");
 const is_ci_1 = require("../../utils/is-ci");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const path_1 = require("../../utils/path");
 const workspace_root_1 = require("../../utils/workspace-root");
 const config_1 = require("./config/config");
@@ -32,7 +32,7 @@ const print_config_1 = require("./utils/print-config");
 const resolve_changelog_renderer_1 = require("./utils/resolve-changelog-renderer");
 const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
 const shared_1 = require("./utils/shared");
-const releaseChangelogCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
+const releaseChangelogCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releaseChangelogCLIHandler = releaseChangelogCLIHandler;
 function createAPI(overrideReleaseConfig) {
     /**

package/src/command-line/release/plan-check.js

@@ -8,14 +8,14 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const all_file_data_1 = require("../../utils/all-file-data");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
 const version_plans_1 = require("./config/version-plans");
 const get_touched_projects_for_group_1 = require("./utils/get-touched-projects-for-group");
 const print_config_1 = require("./utils/print-config");
-const releasePlanCheckCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
+const releasePlanCheckCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releasePlanCheckCLIHandler = releasePlanCheckCLIHandler;
 function createAPI(overrideReleaseConfig) {
     return async function releasePlanCheck(args) {

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

@@ -13,7 +13,7 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const all_file_data_1 = require("../../utils/all-file-data");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
@@ -23,7 +23,7 @@ const get_touched_projects_for_group_1 = require("./utils/get-touched-projects-f
 const launch_editor_1 = require("./utils/launch-editor");
 const print_changes_1 = require("./utils/print-changes");
 const print_config_1 = require("./utils/print-config");
-const releasePlanCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
+const releasePlanCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releasePlanCLIHandler = releasePlanCLIHandler;
 function createAPI(overrideReleaseConfig) {
     return async function releasePlan(args) {

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

@@ -8,14 +8,14 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
 const graph_1 = require("../graph/graph");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
 const print_config_1 = require("./utils/print-config");
-const releasePublishCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args, true));
+const releasePublishCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args, true));
 exports.releasePublishCLIHandler = releasePublishCLIHandler;
 function createAPI(overrideReleaseConfig) {
     /**

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

@@ -8,7 +8,7 @@ const nx_json_1 = require("../../config/nx-json");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const changelog_1 = require("./changelog");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
@@ -21,7 +21,7 @@ const print_config_1 = require("./utils/print-config");
 const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
 const shared_1 = require("./utils/shared");
 const version_1 = require("./version");
-const releaseCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
+const releaseCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releaseCLIHandler = releaseCLIHandler;
 function createAPI(overrideReleaseConfig) {
     const releaseVersion = (0, version_1.createAPI)(overrideReleaseConfig);

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

@@ -83,12 +83,14 @@ async function getGitDiff(from, to = 'HEAD') {
     else {
         range = `${from}..${to}`;
     }
+    // Use a unique enough separator that we can be relatively certain will not occur within the commit message itself
+    const separator = '§§§';
     // https://git-scm.com/docs/pretty-formats
     const r = await (0, exec_command_1.execCommand)('git', [
         '--no-pager',
         'log',
         range,
-        '--pretty="----%n%s|%h|%an|%ae%n%b"',
+        `--pretty="----%n%s${separator}%h${separator}%an${separator}%ae%n%b"`,
         '--name-status',
     ]);
     return r
@@ -96,7 +98,7 @@ async function getGitDiff(from, to = 'HEAD') {
         .splice(1)
         .map((line) => {
         const [firstLine, ..._body] = line.split('\n');
-        const [message, shortHash, authorName, authorEmail] = firstLine.split('|');
+        const [message, shortHash, authorName, authorEmail] = firstLine.split(separator);
         const r = {
             message,
             shortHash,

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

@@ -26,12 +26,13 @@ const print_changes_1 = require("./utils/print-changes");
 const print_config_1 = require("./utils/print-config");
 const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
 const shared_1 = require("./utils/shared");
+const handle_errors_1 = require("../../utils/handle-errors");
 const LARGE_BUFFER = 1024 * 1000000;
 // Reexport some utils for use in plugin release-version generator implementations
 var semver_1 = require("./utils/semver");
 Object.defineProperty(exports, "deriveNewSemverVersion", { enumerable: true, get: function () { return semver_1.deriveNewSemverVersion; } });
 exports.validReleaseVersionPrefixes = ['auto', '', '~', '^', '='];
-const releaseVersionCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
+const releaseVersionCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releaseVersionCLIHandler = releaseVersionCLIHandler;
 function createAPI(overrideReleaseConfig) {
     /**

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repair = repair;
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const migrationsJson = require("../../../migrations.json");
 const migrate_1 = require("../migrate/migrate");
 const output_1 = require("../../utils/output");
 async function repair(args, extraMigrations = []) {
-    return (0, params_1.handleErrors)(args.verbose, async () => {
+    return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
         const nxMigrations = Object.entries(migrationsJson.generators).reduce((agg, [name, migration]) => {
             const skip = migration['x-repair-skip'];
             if (!skip) {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsNxInfixCommand = exports.yargsRunCommand = void 0;
 const yargs_1 = require("yargs");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsRunCommand = {
     command: 'run [project][:target][:configuration] [_..]',
     describe: `Run a target for a project
@@ -15,7 +15,7 @@ exports.yargsRunCommand = {
     You can skip the use of Nx cache by using the --skip-nx-cache option.`,
     builder: (yargs) => (0, shared_options_1.withRunOneOptions)((0, shared_options_1.withBatch)(yargs)),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             await Promise.resolve().then(() => require('./run-one')).then((m) => m.runOne(process.cwd(), (0, shared_options_1.withOverrides)(args)));
         });
         process.exit(exitCode);
@@ -29,7 +29,7 @@ exports.yargsNxInfixCommand = {
     command: '$0 <target> [project] [_..]',
     describe: 'Run a target for a project.',
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             // Yargs parses <target> as 'undefined' if running just 'nx'
             if (!args.target || args.target === 'undefined') {
                 (0, yargs_1.showHelp)();