nx 21.0.0-beta.1 → 21.0.0-beta.2

package/.eslintrc.json

@@ -131,8 +131,12 @@
               "@nx/nx-win32-arm64-msvc",
               "@nx/nx-freebsd-x64",
               "@nx/powerpack-license",
+              "@nx/key",
               // Powerpack plugin conditionally available dynamically at runtime
-              "@nx/powerpack-conformance"
+              "@nx/powerpack-conformance",
+              "@nx/conformance",
+              // Only used in test-utils at the time of writing
+              "@ltd/j-toml"
             ]
           }
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.0.0-beta.1",
+  "version": "21.0.0-beta.2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -38,7 +38,7 @@
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.2",
     "@zkochan/js-yaml": "0.0.7",
-    "axios": "^1.7.4",
+    "axios": "^1.8.3",
     "chalk": "^4.1.0",
     "cli-cursor": "3.1.0",
     "cli-spinners": "2.6.1",
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.0.0-beta.1",
-    "@nx/nx-darwin-x64": "21.0.0-beta.1",
-    "@nx/nx-freebsd-x64": "21.0.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "21.0.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "21.0.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "21.0.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "21.0.0-beta.1",
-    "@nx/nx-linux-x64-musl": "21.0.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "21.0.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "21.0.0-beta.1"
+    "@nx/nx-darwin-arm64": "21.0.0-beta.2",
+    "@nx/nx-darwin-x64": "21.0.0-beta.2",
+    "@nx/nx-freebsd-x64": "21.0.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "21.0.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "21.0.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "21.0.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "21.0.0-beta.2",
+    "@nx/nx-linux-x64-musl": "21.0.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "21.0.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "21.0.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/release/index.d.ts

@@ -1,4 +1,4 @@
 /**
  * @public Programmatic API for nx release
  */
-export { ReleaseClient, release, releaseChangelog, releasePublish, releaseVersion, } from '../src/command-line/release';
+export { ReleaseClient, release, releaseChangelog, releasePublish, releaseVersion, VersionActions, AfterAllProjectsVersioned, } from '../src/command-line/release';

package/release/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.releaseVersion = exports.releasePublish = exports.releaseChangelog = exports.release = exports.ReleaseClient = void 0;
+exports.VersionActions = exports.releaseVersion = exports.releasePublish = exports.releaseChangelog = exports.release = exports.ReleaseClient = void 0;
 /**
  * @public Programmatic API for nx release
  */
@@ -10,3 +10,4 @@ Object.defineProperty(exports, "release", { enumerable: true, get: function () {
 Object.defineProperty(exports, "releaseChangelog", { enumerable: true, get: function () { return release_1.releaseChangelog; } });
 Object.defineProperty(exports, "releasePublish", { enumerable: true, get: function () { return release_1.releasePublish; } });
 Object.defineProperty(exports, "releaseVersion", { enumerable: true, get: function () { return release_1.releaseVersion; } });
+Object.defineProperty(exports, "VersionActions", { enumerable: true, get: function () { return release_1.VersionActions; } });

package/schemas/nx-schema.json

@@ -21,6 +21,10 @@
       "additionalProperties": false,
       "deprecated": "Use `defaultBase` instead. Support for setting `defaultBase` in `affected` will be removed in Nx 20."
     },
+    "extends": {
+      "type": "string",
+      "description": "Specifies the base config to extend."
+    },
     "defaultBase": {
       "type": "string",
       "description": "Default --base used by affected logic."
@@ -73,6 +77,23 @@
         "$ref": "#/definitions/plugins"
       }
     },
+    "tui": {
+      "type": "object",
+      "description": "Settings for the Nx Terminal User Interface (TUI)",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "Whether to enable the Terminal UI whenever possible (based on the current environment and terminal).",
+          "default": true
+        },
+        "autoExit": {
+          "oneOf": [{ "type": "boolean" }, { "type": "number" }],
+          "description": "Whether to exit the TUI automatically after all tasks finish. If set to `true`, the TUI will exit immediately. If set to `false` the TUI will not automatically exit. If set to a number, an interruptible countdown popup will be shown for that many seconds before the TUI exits.",
+          "default": 3
+        }
+      },
+      "additionalProperties": false
+    },
     "defaultProject": {
       "type": "string",
       "description": "Default project. When project isn't provided, the default project will be used."
@@ -169,7 +190,22 @@
                 ]
               },
               "releaseTagPattern": {
-                "type": "string"
+                "type": "string",
+                "description": "Optionally override the git/release tag pattern to use for this group."
+              },
+              "releaseTagPatternCheckAllBranchesWhen": {
+                "oneOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                ],
+                "description": "By default, we will try and resolve the latest match for the releaseTagPattern from the current branch, falling back to all branches if no match is found on the current branch. Setting this to true will cause us to ALWAYS check all branches for the latest match. Setting it to false will cause us to ONLY check the current branch for the latest match. Setting it to an array of strings will cause us to check all branches WHEN the current branch is one of the strings in the array. Glob patterns are supported."
               },
               "versionPlans": {
                 "oneOf": [
@@ -243,7 +279,22 @@
           ]
         },
         "releaseTagPattern": {
-          "type": "string"
+          "type": "string",
+          "description": "Optionally override the git/release tag pattern to use. This field is the source of truth for changelog generation and release tagging, as well as for conventional commits parsing. It supports interpolating the version as {version} and (if releasing independently or forcing project level version control system releases) the project name as {projectName} within the string. The default releaseTagPattern for fixed/unified releases is: \"v{version}\". The default releaseTagPattern for independent releases at the project level is: \"{projectName}@{version}\""
+        },
+        "releaseTagPatternCheckAllBranchesWhen": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ],
+          "description": "By default, we will try and resolve the latest match for the releaseTagPattern from the current branch, falling back to all branches if no match is found on the current branch. Setting this to true will cause us to ALWAYS check all branches for the latest match. Setting it to false will cause us to ONLY check the current branch for the latest match. Setting it to an array of strings will cause us to check all branches WHEN the current branch is one of the strings in the array. Glob patterns are supported."
         }
       }
     },
@@ -650,50 +701,150 @@
     },
     "NxReleaseVersionConfiguration": {
       "type": "object",
-      "properties": {
-        "conventionalCommits": {
-          "type": "boolean",
-          "description": "Shorthand for enabling the current version of projects to be resolved from git tags, and the next version to be determined by analyzing commit messages according to the Conventional Commits specification.",
-          "default": false
-        },
-        "generator": {
-          "type": "string"
-        },
-        "generatorOptions": {
-          "type": "object",
-          "additionalProperties": true
-        },
-        "git": {
-          "$ref": "#/definitions/NxReleaseGitConfiguration"
-        },
-        "preVersionCommand": {
-          "type": "string",
-          "description": "A command to run after validation of nx release configuration, but before versioning begins. Useful 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'."
+      "$comment": "The configuration for versioning is dynamic depending on the value of the useLegacyVersioning property. Through trial and error the best in editor DX seems to come from having the if/else at the top level and explicitly include all possible properties and apply additionalProperties false in each case.",
+      "description": "Configuration for the versioning phase of releases.",
+      "if": {
+        "$comment": "When using the latest versioning implementation a lot of configuration has been able to move directly onto the version property.",
+        "properties": {
+          "useLegacyVersioning": {
+            "const": true
+          }
         }
       },
-      "additionalProperties": false
+      "then": {
+        "properties": {
+          "useLegacyVersioning": {
+            "type": "boolean",
+            "description": "Whether to use the legacy versioning strategy. This value will be true in Nx v20 and false in Nx v21. The legacy versioning implementation will be removed in Nx v22, as will this flag.",
+            "default": true
+          },
+          "conventionalCommits": {
+            "type": "boolean",
+            "description": "Shorthand for enabling the current version of projects to be resolved from git tags, and the next version to be determined by analyzing commit messages according to the Conventional Commits specification.",
+            "default": false
+          },
+          "git": {
+            "$ref": "#/definitions/NxReleaseGitConfiguration"
+          },
+          "preVersionCommand": {
+            "type": "string",
+            "description": "A command to run after validation of nx release configuration, but before versioning begins. Useful 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'."
+          },
+          "generator": {
+            "type": "string",
+            "description": "The generator implementation to use for versioning.",
+            "default": "@nx/js:release-version"
+          },
+          "generatorOptions": {
+            "type": "object",
+            "description": "These options will be passed to the configured \"release.version.generator\" (which will be \"@nx/js:release-version\" if not set explicitly).",
+            "additionalProperties": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "else": {
+        "additionalProperties": false,
+        "properties": {
+          "useLegacyVersioning": {
+            "type": "boolean",
+            "description": "Whether to use the legacy versioning strategy. This value will be true in Nx v20 and false in Nx v21. The legacy versioning implementation will be removed in Nx v22, as will this flag.",
+            "default": true
+          },
+          "conventionalCommits": {
+            "type": "boolean",
+            "description": "Shorthand for enabling the current version of projects to be resolved from git tags, and the next version to be determined by analyzing commit messages according to the Conventional Commits specification.",
+            "default": false
+          },
+          "git": {
+            "$ref": "#/definitions/NxReleaseGitConfiguration"
+          },
+          "preVersionCommand": {
+            "type": "string",
+            "description": "A command to run after validation of nx release configuration, but before versioning begins. Useful 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'."
+          },
+          "specifierSource": {
+            "type": "string",
+            "enum": ["prompt", "conventional-commits", "version-plans"],
+            "default": "prompt",
+            "description": "The source to use for determining the specifier to use when versioning. 'prompt' is the default and will interactively prompt the user for an explicit/imperative specifier. 'conventional-commits' will attempt determine a specifier from commit messages conforming to the Conventional Commits specification. 'version-plans' will determine the specifier from the version plan files available on disk."
+          },
+          "manifestRootsToUpdate": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "A list of directories containing manifest files (such as package.json) to apply updates to when versioning. By default, only the project root will be used, but you could customize this to only version a manifest in a dist directory, or even version multiple manifests in different directories, such as both source and dist."
+          },
+          "currentVersionResolver": {
+            "type": "string",
+            "enum": ["registry", "disk", "git-tag", "none"],
+            "description": "The resolver to use for determining the current version of a project during versioning. This is needed for versioning approaches which involve relatively modifying a current version to arrive at a new version, such as semver bumps like 'patch', 'minor' etc. Using 'none' explicitly declares that the current version is not needed to compute the new version, and should only be used with appropriate version actions implementations that support it."
+          },
+          "currentVersionResolverMetadata": {
+            "type": "object",
+            "additionalProperties": true,
+            "description": "Metadata to provide to the configured currentVersionResolver to help it in determining the current version. What to pass here is specific to each resolver."
+          },
+          "fallbackCurrentVersionResolver": {
+            "type": "string",
+            "enum": ["disk"],
+            "description": "The fallback version resolver to use when the configured currentVersionResolver fails to resolve the current version."
+          },
+          "firstRelease": {
+            "type": "boolean",
+            "description": "Whether or not this is the first release of one of more projects. This removes certain validation checks that are not possible to enforce if the project has never been released before."
+          },
+          "versionPrefix": {
+            "type": "string",
+            "enum": ["auto", "", "~", "^", "="],
+            "default": "auto",
+            "description": "The prefix to use when versioning dependencies. This can be one of the following: auto, '', '~', '^', '=', where auto means the existing prefix will be preserved."
+          },
+          "deleteVersionPlans": {
+            "type": "boolean",
+            "description": "Whether to delete the processed version plans file after versioning is complete. This is false by default because the version plans are also needed for changelog generation.",
+            "default": false
+          },
+          "updateDependents": {
+            "type": "string",
+            "enum": ["never", "auto"],
+            "default": "auto",
+            "description": "When versioning independent projects, this controls whether to update their dependents (i.e. the things that depend on them). 'never' means no dependents will be updated (unless they happen to be versioned directly as well). 'auto' is the default and will cause dependents to be updated (a patch version bump) when a dependency is versioned."
+          },
+          "logUnchangedProjects": {
+            "type": "boolean",
+            "description": "Whether to log projects that have not changed during versioning.",
+            "default": true
+          },
+          "preserveLocalDependencyProtocols": {
+            "type": "boolean",
+            "description": "Whether to preserve local dependency protocols (e.g. file references, or the `workspace:` protocol in package.json files) of local dependencies when updating them during versioning. This was false by default in legacy versioning, but is true by default now.",
+            "default": true
+          },
+          "versionActions": {
+            "type": "string",
+            "description": "The path to the version actions implementation to use for releasing all projects by default. This can also be overridden on the release group and project levels.",
+            "default": "@nx/js/src/release"
+          },
+          "versionActionsOptions": {
+            "type": "object",
+            "description": "The specific options that are defined by each version actions implementation. They will be passed to the version actions implementation when running a release.",
+            "additionalProperties": true
+          }
+        }
+      }
     },
     "NxReleaseGroupVersionConfiguration": {
       "type": "object",
+      "$comment": "We need to improve this configuration definition to be more precise once legacy versioning is removed. Right now it needs to be left open and runtime validation will ensure correct behavior.",
       "properties": {
-        "conventionalCommits": {
-          "type": "boolean",
-          "description": "Shorthand for enabling the current version of projects to be resolved from git tags, and the next version to be determined by analyzing commit messages according to the Conventional Commits specification.",
-          "default": false
-        },
-        "generator": {
-          "type": "string"
-        },
-        "generatorOptions": {
-          "type": "object",
-          "additionalProperties": true
-        },
         "groupPreVersionCommand": {
           "type": "string",
           "description": "A command to run after validation of nx release configuration AND after the release.version.preVersionCommand (if any), but before versioning begins for this specific group. Useful for preparing build artifacts for the group. If --dry-run is passed, the command is still executed, but with the NX_DRY_RUN environment variable set to 'true'."
         }
       },
-      "additionalProperties": false
+      "additionalProperties": true
     },
     "NxReleaseChangelogConfiguration": {
       "type": "object",

package/src/adapter/compat.d.ts

@@ -1,2 +1,2 @@
 export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata"];
-export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache"];
+export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache", "maxCacheSize", "tui"];

package/src/adapter/compat.js

@@ -37,6 +37,7 @@ exports.allowedProjectExtensions = [
 // There are some props in here (root) that angular already knows about,
 // but it doesn't hurt to have them in here as well to help static analysis.
 exports.allowedWorkspaceExtensions = [
+    '$schema',
     'implicitDependencies',
     'affected',
     'defaultBase',
@@ -64,6 +65,8 @@ exports.allowedWorkspaceExtensions = [
     'neverConnectToCloud',
     'sync',
     'useLegacyCache',
+    'maxCacheSize',
+    'tui',
 ];
 if (!patched) {
     Module.prototype.require = function () {

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

@@ -5,7 +5,6 @@ exports.addHandler = addHandler;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const ora = require("ora");
-const yargsParser = require("yargs-parser");
 const nx_json_1 = require("../../config/nx-json");
 const child_process_2 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
@@ -79,27 +78,18 @@ async function installPackage(pkgName, version, nxJson) {
     spinner.succeed();
 }
 async function initializePlugin(pkgName, options, nxJson) {
-    const parsedCommandArgs = yargsParser(options.__overrides_unparsed__, {
-        configuration: {
-            'parse-numbers': false,
-            'parse-positional-numbers': false,
-            'dot-notation': false,
-            'camel-case-expansion': false,
-        },
-    });
-    if (exports.coreNxPluginVersions.has(pkgName)) {
-        parsedCommandArgs.keepExistingVersions = true;
-        if (options.updatePackageScripts ||
+    let updatePackageScripts = false;
+    if (exports.coreNxPluginVersions.has(pkgName) &&
+        (options.updatePackageScripts ||
             (options.updatePackageScripts === undefined &&
                 nxJson.useInferencePlugins !== false &&
-                process.env.NX_ADD_PLUGINS !== 'false')) {
-            parsedCommandArgs.updatePackageScripts = true;
-        }
+                process.env.NX_ADD_PLUGINS !== 'false'))) {
+        updatePackageScripts = true;
     }
     const spinner = ora(`Initializing ${pkgName}...`);
     spinner.start();
     try {
-        await (0, configure_plugins_1.installPlugin)(pkgName, workspace_root_1.workspaceRoot, options.verbose, parsedCommandArgs);
+        await (0, configure_plugins_1.runPluginInitGenerator)(pkgName, workspace_root_1.workspaceRoot, updatePackageScripts, options.verbose);
     }
     catch (e) {
         spinner.fail();

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsAffectedE2ECommand = exports.yargsAffectedLintCommand = exports.yargsAffectedBuildCommand = exports.yargsAffectedTestCommand = exports.yargsAffectedCommand = void 0;
+const handle_errors_1 = require("../../utils/handle-errors");
 const documentation_1 = require("../yargs-utils/documentation");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsAffectedCommand = {
     command: 'affected',
     describe: 'Run target for affected projects.',
-    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.withTargetAndConfigurationOption)((0, shared_options_1.withBatch)(yargs)))))
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withTuiOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withTargetAndConfigurationOption)((0, shared_options_1.withBatch)(yargs))))))
         .option('all', {
         type: 'boolean',
         deprecated: 'Use `nx run-many` instead',
@@ -27,7 +27,7 @@ exports.yargsAffectedCommand = {
 exports.yargsAffectedTestCommand = {
     command: 'affected:test',
     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'),
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withTuiOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs))))), 'affected'),
     handler: async (args) => {
         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', {
@@ -41,7 +41,7 @@ exports.yargsAffectedTestCommand = {
 exports.yargsAffectedBuildCommand = {
     command: 'affected:build',
     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'),
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withTuiOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs))))), 'affected'),
     handler: async (args) => {
         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', {
@@ -55,7 +55,7 @@ exports.yargsAffectedBuildCommand = {
 exports.yargsAffectedLintCommand = {
     command: 'affected:lint',
     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'),
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withTuiOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs))))), 'affected'),
     handler: async (args) => {
         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', {
@@ -69,7 +69,7 @@ exports.yargsAffectedLintCommand = {
 exports.yargsAffectedE2ECommand = {
     command: 'affected:e2e',
     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'),
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withTuiOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs))))), 'affected'),
     handler: async (args) => {
         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', {

package/src/command-line/examples.js

@@ -143,10 +143,6 @@ exports.examples = {
             command: 'graph --focus=todos-feature-main',
             description: 'Show the graph where every node is either an ancestor or a descendant of todos-feature-main',
         },
-        {
-            command: 'graph --include=project-one,project-two',
-            description: 'Include project-one and project-two in the project graph',
-        },
         {
             command: 'graph --exclude=project-one,project-two',
             description: 'Exclude project-one and project-two from the project graph',

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

@@ -5,7 +5,7 @@ const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsExecCommand = {
     command: 'exec',
     describe: 'Executes any command as if it was a target on the project.',
-    builder: (yargs) => (0, shared_options_1.withRunManyOptions)(yargs),
+    builder: (yargs) => (0, shared_options_1.withTuiOptions)((0, shared_options_1.withRunManyOptions)(yargs)),
     handler: async (args) => {
         try {
             await (await Promise.resolve().then(() => require('./exec'))).nxExecCommand((0, shared_options_1.withOverrides)(args));

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

@@ -6,6 +6,7 @@ const path_1 = require("path");
 const schema_utils_1 = require("../../config/schema-utils");
 const fileutils_1 = require("../../utils/fileutils");
 const plugins_1 = require("../../project-graph/plugins");
+const installation_directory_1 = require("../../utils/installation-directory");
 function getGeneratorInformation(collectionName, generatorName, root, projects) {
     try {
         const { generatorsFilePath, generatorsJson, resolvedCollectionName, normalizedGeneratorName, } = readGeneratorsJson(collectionName, generatorName, root, projects);
@@ -37,18 +38,22 @@ function getGeneratorInformation(collectionName, generatorName, root, projects)
         };
     }
     catch (e) {
-        throw new Error(`Unable to resolve ${collectionName}:${generatorName}.\n${e.message}`);
+        throw new Error(`Unable to resolve ${collectionName}:${generatorName}.\n${process.env.NX_VERBOSE_LOGGING === 'true' ? e.stack : e.message}`);
     }
 }
 function readGeneratorsJson(collectionName, generator, root, projects) {
     let generatorsFilePath;
     if (collectionName.endsWith('.json')) {
         generatorsFilePath = require.resolve(collectionName, {
-            paths: root ? [root, __dirname] : [__dirname],
+            paths: root
+                ? [...(0, installation_directory_1.getNxRequirePaths)(root), __dirname]
+                : [...(0, installation_directory_1.getNxRequirePaths)(), __dirname],
         });
     }
     else {
-        const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(collectionName, projects, root ? [root, __dirname] : [__dirname]);
+        const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(collectionName, projects, root
+            ? [...(0, installation_directory_1.getNxRequirePaths)(root), __dirname]
+            : [...(0, installation_directory_1.getNxRequirePaths)(), __dirname]);
         const generatorsFile = packageJson.generators ?? packageJson.schematics;
         if (!generatorsFile) {
             throw new Error(`The "${collectionName}" package does not support Nx generators.`);

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

@@ -287,7 +287,7 @@ async function runPluginsInstall(plugins, pmc, destinationGitClient) {
     let installed = true;
     output_1.output.log({ title: 'Installing Plugins' });
     try {
-        (0, configure_plugins_1.runPackageManagerInstallPlugins)(workspace_root_1.workspaceRoot, pmc, plugins);
+        (0, configure_plugins_1.installPluginPackages)(workspace_root_1.workspaceRoot, pmc, plugins);
         await destinationGitClient.amendCommit();
     }
     catch (e) {

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

@@ -7,14 +7,21 @@ exports.yargsInitCommand = {
     describe: 'Adds Nx to any type of workspace. It installs nx, creates an nx.json configuration file and optionally sets up remote caching. For more info, check https://nx.dev/recipes/adopting-nx.',
     builder: (yargs) => withInitOptions(yargs),
     handler: async (args) => {
-        const useV2 = await isInitV2();
-        if (useV2) {
-            await require('./init-v2').initHandler(args);
+        try {
+            const useV2 = await isInitV2();
+            if (useV2) {
+                await require('./init-v2').initHandler(args);
+            }
+            else {
+                await require('./init-v1').initHandler(args);
+            }
+            process.exit(0);
         }
-        else {
-            await require('./init-v1').initHandler(args);
+        catch {
+            // Ensure the cursor is always restored just in case the user has bailed during interactive prompts
+            process.stdout.write('\x1b[?25h');
+            process.exit(1);
         }
-        process.exit(0);
     },
 };
 async function isInitV2() {
@@ -39,6 +46,11 @@ async function withInitOptions(yargs) {
             type: 'boolean',
             description: 'Initialize an Nx workspace setup in the .nx directory of the current repository.',
             default: false,
+        })
+            .option('force', {
+            describe: 'Force the migration to continue and ignore custom webpack setup or uncommitted changes. Only for CRA projects.',
+            type: 'boolean',
+            default: false,
         });
     }
     else {

package/src/command-line/init/configure-plugins.d.ts

@@ -1,22 +1,21 @@
 import { PackageManagerCommands } from '../../utils/package-manager';
-export declare function runPackageManagerInstallPlugins(repoRoot: string, pmc: PackageManagerCommands, plugins: string[]): void;
+export declare function installPluginPackages(repoRoot: string, pmc: PackageManagerCommands, plugins: string[]): void;
 /**
  * Installs a plugin by running its init generator. It will change the file system tree passed in.
  * @param plugin The name of the plugin to install
  * @param repoRoot repo root
- * @param verbose verbose
- * @param options options passed to init generator
+ * @param pmc package manager commands
+ * @param updatePackageScripts whether to update package scripts
+ * @param verbose whether to run in verbose mode
  * @returns void
  */
-export declare function installPlugin(plugin: string, repoRoot: string, verbose: boolean, options: {
-    [k: string]: any;
-}): Promise<void>;
+export declare function runPluginInitGenerator(plugin: string, repoRoot?: string, updatePackageScripts?: boolean, verbose?: boolean, pmc?: PackageManagerCommands): Promise<void>;
 /**
  * Install plugins
  * Get the implementation of the plugin's init generator and run it
  * @returns a list of succeeded plugins and a map of failed plugins to errors
  */
-export declare function installPlugins(plugins: string[], updatePackageScripts: boolean, repoRoot?: string, verbose?: boolean): Promise<{
+export declare function runPluginInitGenerators(plugins: string[], updatePackageScripts: boolean, pmc: PackageManagerCommands, repoRoot?: string, verbose?: boolean): Promise<{
     succeededPlugins: string[];
     failedPlugins: {
         [plugin: string]: Error;