nx 21.3.0-beta.6 → 21.3.0-canary.20250613-18155f4

package/bin/init-local.js

@@ -14,12 +14,6 @@ const nx_console_prompt_1 = require("../src/utils/nx-console-prompt");
 async function initLocal(workspace) {
     process.env.NX_CLI_SET = 'true';
     try {
-        // In case Nx Cloud forcibly exits while the TUI is running, ensure the terminal is restored etc.
-        process.on('exit', (...args) => {
-            if (typeof globalThis.tuiOnProcessExit === 'function') {
-                globalThis.tuiOnProcessExit(...args);
-            }
-        });
         perf_hooks_1.performance.mark('init-local');
         if (workspace.type !== 'nx' && shouldDelegateToAngularCLI()) {
             console.warn((0, strip_indents_1.stripIndents) `Using Nx to run Angular CLI commands is deprecated and will be removed in a future version.

package/bin/nx.js

@@ -17,6 +17,12 @@ const perf_hooks_1 = require("perf_hooks");
 const workspace_context_1 = require("../src/utils/workspace-context");
 const client_1 = require("../src/daemon/client/client");
 const db_connection_1 = require("../src/utils/db-connection");
+// In case Nx Cloud forcibly exits while the TUI is running, ensure the terminal is restored etc.
+process.on('exit', (...args) => {
+    if (typeof globalThis.tuiOnProcessExit === 'function') {
+        globalThis.tuiOnProcessExit(...args);
+    }
+});
 async function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
@@ -65,7 +71,7 @@ async function main() {
             handleNoWorkspace(GLOBAL_NX_VERSION);
         }
         if (!localNx) {
-            handleMissingLocalInstallation(workspace ? workspace.dir : null);
+            handleMissingLocalInstallation();
         }
         // this file is already in the local workspace
         if (isLocalInstall) {
@@ -132,11 +138,9 @@ function resolveNx(workspace) {
         paths: [workspace ? workspace.dir : globalsRoot],
     });
 }
-function handleMissingLocalInstallation(detectedWorkspaceRoot) {
+function handleMissingLocalInstallation() {
     output_1.output.error({
-        title: detectedWorkspaceRoot
-            ? `Could not find Nx modules at "${detectedWorkspaceRoot}".`
-            : `Could not find Nx modules in this workspace.`,
+        title: `Could not find Nx modules in this workspace.`,
         bodyLines: [`Have you run ${chalk.bold.white(`npm/yarn install`)}?`],
     });
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.3.0-beta.6",
+  "version": "21.3.0-canary.20250613-18155f4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -50,7 +50,7 @@
     "flat": "^5.0.2",
     "front-matter": "^4.0.2",
     "ignore": "^5.0.4",
-    "jest-diff": "^30.0.2",
+    "jest-diff": "^29.4.1",
     "jsonc-parser": "3.2.0",
     "lines-and-columns": "2.0.3",
     "minimatch": "9.0.3",
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.3.0-beta.6",
-    "@nx/nx-darwin-x64": "21.3.0-beta.6",
-    "@nx/nx-freebsd-x64": "21.3.0-beta.6",
-    "@nx/nx-linux-arm-gnueabihf": "21.3.0-beta.6",
-    "@nx/nx-linux-arm64-gnu": "21.3.0-beta.6",
-    "@nx/nx-linux-arm64-musl": "21.3.0-beta.6",
-    "@nx/nx-linux-x64-gnu": "21.3.0-beta.6",
-    "@nx/nx-linux-x64-musl": "21.3.0-beta.6",
-    "@nx/nx-win32-arm64-msvc": "21.3.0-beta.6",
-    "@nx/nx-win32-x64-msvc": "21.3.0-beta.6"
+    "@nx/nx-darwin-arm64": "21.3.0-canary.20250613-18155f4",
+    "@nx/nx-darwin-x64": "21.3.0-canary.20250613-18155f4",
+    "@nx/nx-freebsd-x64": "21.3.0-canary.20250613-18155f4",
+    "@nx/nx-linux-arm-gnueabihf": "21.3.0-canary.20250613-18155f4",
+    "@nx/nx-linux-arm64-gnu": "21.3.0-canary.20250613-18155f4",
+    "@nx/nx-linux-arm64-musl": "21.3.0-canary.20250613-18155f4",
+    "@nx/nx-linux-x64-gnu": "21.3.0-canary.20250613-18155f4",
+    "@nx/nx-linux-x64-musl": "21.3.0-canary.20250613-18155f4",
+    "@nx/nx-win32-arm64-msvc": "21.3.0-canary.20250613-18155f4",
+    "@nx/nx-win32-x64-msvc": "21.3.0-canary.20250613-18155f4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/release/changelog-renderer/index.js

@@ -132,16 +132,8 @@ class DefaultChangelogRenderer {
         return '';
     }
     renderVersionTitle() {
-        let isMajorVersion = true;
-        try {
-            isMajorVersion =
-                `${(0, semver_1.major)(this.changelogEntryVersion)}.0.0` ===
-                    this.changelogEntryVersion.replace(/^v/, '');
-        }
-        catch {
-            // Do nothing with the error
-            // Prevent non-semver versions from erroring out
-        }
+        const isMajorVersion = `${(0, semver_1.major)(this.changelogEntryVersion)}.0.0` ===
+            this.changelogEntryVersion.replace(/^v/, '');
         let maybeDateStr = '';
         if (this.changelogRenderOptions.versionTitleDate) {
             const dateStr = new Date().toISOString().slice(0, 10);

package/src/adapter/decorate-cli.js

@@ -1,12 +1,11 @@
 "use strict";
-// TODO(v22): remove this file
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorateCli = decorateCli;
 const fs_1 = require("fs");
 const output_1 = require("../utils/output");
 function decorateCli() {
     output_1.output.warn({
-        title: `Decoration of the Angular CLI is deprecated and will be removed in Nx v22`,
+        title: `Decoration of the Angular CLI is deprecated and will be removed in a future version`,
         bodyLines: [
             `Please replace usage of "ng <command>" in any scripts, particularly for CI, with "nx <command>"`,
         ],

package/src/adapter/ngcli-adapter.d.ts

@@ -87,15 +87,4 @@ export declare function wrapAngularDevkitSchematic(collectionName: string, gener
     [k: string]: any;
 }) => Promise<GeneratorCallback>;
 export declare const getLogger: (isVerbose?: boolean) => logging.Logger;
-/**
- * Restores Nx tokens in options when possible by comparing new and previous
- * options.
- * The function preserves tokens in the following cases:
- * 1. When the resolved previous value matches the new value exactly
- * 2. When the previous value used {workspaceRoot}
- * 3. When the previous value used {projectRoot} and the new value starts with
- *    the project root path
- * Those are the only safe cases, for all other cases, the new value is used as-is.
- */
-export declare function restoreNxTokensInOptions<T extends Object | Array<unknown>>(newOptions: T, previousOptions: T, project: ProjectConfiguration): T;
 export {};

package/src/adapter/ngcli-adapter.js

@@ -8,7 +8,6 @@ exports.generate = generate;
 exports.runMigration = runMigration;
 exports.mockSchematicsForTesting = mockSchematicsForTesting;
 exports.wrapAngularDevkitSchematic = wrapAngularDevkitSchematic;
-exports.restoreNxTokensInOptions = restoreNxTokensInOptions;
 const core_1 = require("@angular-devkit/core");
 const node_1 = require("@angular-devkit/core/node");
 const chalk = require("chalk");
@@ -29,7 +28,6 @@ const angular_json_1 = require("./angular-json");
 const executor_utils_1 = require("../command-line/run/executor-utils");
 const plugins_1 = require("../project-graph/plugins");
 const schema_utils_1 = require("../config/schema-utils");
-const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
 async function createBuilderContext(builderInfo, context) {
     require('./compat');
     const fsHost = new NxScopedHostForBuilders(context.root);
@@ -298,32 +296,10 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
                 const projects = configV2.projects;
                 const allObservables = [];
                 Object.keys(projects).forEach((projectName) => {
-                    if (!projectsInAngularJson.includes(projectName)) {
-                        // Restore tokens in options if they were present before
-                        const previousProject = existingConfig.projects[projectName];
-                        const newProject = projects[projectName];
-                        if (previousProject &&
-                            newProject.targets &&
-                            previousProject.targets) {
-                            for (const [targetName, target] of Object.entries(newProject.targets)) {
-                                const previousTarget = previousProject.targets[targetName];
-                                if (target.options &&
-                                    previousTarget &&
-                                    previousTarget.options) {
-                                    target.options = restoreNxTokensInOptions(target.options, previousTarget.options, newProject);
-                                }
-                                if (target.configurations &&
-                                    previousTarget &&
-                                    previousTarget.configurations) {
-                                    for (const [configName, config] of Object.entries(target.configurations)) {
-                                        if (previousTarget.configurations[configName]) {
-                                            target.configurations[configName] =
-                                                restoreNxTokensInOptions(config, previousTarget.configurations[configName], newProject);
-                                        }
-                                    }
-                                }
-                            }
-                        }
+                    if (projectsInAngularJson.includes(projectName)) {
+                        // ignore updates to angular.json
+                    }
+                    else {
                         (0, project_configuration_1.updateProjectConfiguration)({
                             root,
                             exists: () => true,
@@ -454,23 +430,9 @@ class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
     read(path) {
         if ((path === 'angular.json' || path === '/angular.json') &&
             (0, angular_json_1.isAngularPluginInstalled)()) {
-            // Replace the Nx-specific tokens in all target options
-            const projects = Object.fromEntries((0, project_configuration_1.getProjects)(this.host));
-            for (const [projectName, project] of Object.entries(projects)) {
-                if (project.targets) {
-                    for (const [targetName, target] of Object.entries(project.targets)) {
-                        if (target.options) {
-                            target.options = (0, project_configuration_utils_1.resolveNxTokensInOptions)(target.options, { ...project, name: projectName }, `${projectName}:${targetName}`);
-                        }
-                        if (target.configurations) {
-                            for (const [configName, config] of Object.entries(target.configurations)) {
-                                target.configurations[configName] = (0, project_configuration_utils_1.resolveNxTokensInOptions)(config, { ...project, name: projectName }, `${projectName}:${targetName}:${configName}`);
-                            }
-                        }
-                    }
-                }
-            }
-            const projectJsonConfig = (0, angular_json_1.toOldFormat)({ projects });
+            const projectJsonConfig = (0, angular_json_1.toOldFormat)({
+                projects: Object.fromEntries((0, project_configuration_1.getProjects)(this.host)),
+            });
             return super.readExistingAngularJson().pipe((0, operators_1.map)((angularJson) => {
                 if (angularJson) {
                     return Buffer.from(JSON.stringify({
@@ -890,59 +852,3 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
     }
     return new WrappedWorkspaceNodeModulesArchitectHost(workspace, root, projects);
 }
-/**
- * Restores Nx tokens in options when possible by comparing new and previous
- * options.
- * The function preserves tokens in the following cases:
- * 1. When the resolved previous value matches the new value exactly
- * 2. When the previous value used {workspaceRoot}
- * 3. When the previous value used {projectRoot} and the new value starts with
- *    the project root path
- * Those are the only safe cases, for all other cases, the new value is used as-is.
- */
-function restoreNxTokensInOptions(newOptions, previousOptions, project) {
-    if (!newOptions || !previousOptions) {
-        return newOptions;
-    }
-    const result = Array.isArray(newOptions)
-        ? [...newOptions]
-        : { ...newOptions };
-    const resolvedPreviousOptions = (0, project_configuration_utils_1.resolveNxTokensInOptions)(previousOptions, project, '');
-    for (const key of Object.keys(newOptions)) {
-        const newValue = newOptions[key];
-        const previousValue = previousOptions[key];
-        if (typeof newValue === 'string' && typeof previousValue === 'string') {
-            if (resolvedPreviousOptions[key] === newValue) {
-                // If the resolved previous value matches the new value, use the previous
-                // value (potentially with tokens)
-                result[key] = previousValue;
-            }
-            else if (previousValue.startsWith('{workspaceRoot}/')) {
-                // If the previous value started with {workspaceRoot}, prefix the new
-                // value with {workspaceRoot}
-                result[key] = `{workspaceRoot}/${newValue.replace(/^\//, '')}`;
-            }
-            else if (previousValue.startsWith('{projectRoot}/') &&
-                newValue.startsWith(`${project.root}/`)) {
-                // If the previous value started with {projectRoot} and the new value
-                // starts with the project root, replace the project root with the
-                // {projectRoot} token
-                result[key] = newValue.replace(`${project.root}/`, '{projectRoot}/');
-            }
-            else {
-                // Otherwise, use the new value as-is
-                result[key] = newValue;
-            }
-        }
-        else if (typeof newValue === 'object' &&
-            typeof previousValue === 'object' &&
-            newValue &&
-            previousValue) {
-            result[key] = restoreNxTokensInOptions(newValue, previousValue, project);
-        }
-        else {
-            result[key] = newValue;
-        }
-    }
-    return result;
-}

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

@@ -5,7 +5,7 @@ exports.getAffectedGraphNodes = getAffectedGraphNodes;
 const file_utils_1 = require("../../project-graph/file-utils");
 const run_command_1 = require("../../tasks-runner/run-command");
 const output_1 = require("../../utils/output");
-const connect_to_nx_cloud_1 = require("../nx-cloud/connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const perf_hooks_1 = require("perf_hooks");
 const project_graph_1 = require("../../project-graph/project-graph");

package/src/command-line/{nx-cloud/connect → connect}/command-object.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsViewLogsCommand = exports.yargsConnectCommand = void 0;
-const documentation_1 = require("../../yargs-utils/documentation");
-const versions_1 = require("../../../utils/versions");
-const shared_options_1 = require("../../yargs-utils/shared-options");
+const documentation_1 = require("../yargs-utils/documentation");
+const versions_1 = require("../../utils/versions");
+const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsConnectCommand = {
     command: 'connect',
     aliases: ['connect-to-nx-cloud'],
@@ -11,7 +11,7 @@ exports.yargsConnectCommand = {
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(withConnectOptions(yargs), 'connect-to-nx-cloud'),
     handler: async (args) => {
         await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand(args);
-        await (await Promise.resolve().then(() => require('../../../utils/ab-testing'))).recordStat({
+        await (await Promise.resolve().then(() => require('../../utils/ab-testing'))).recordStat({
             command: 'connect',
             nxVersion: versions_1.nxVersion,
             useCloud: true,

package/src/command-line/{nx-cloud/connect → connect}/connect-to-nx-cloud.d.ts

@@ -1,7 +1,7 @@
-import { ConnectToNxCloudOptions } from '../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud';
-import { NxJsonConfiguration } from '../../../config/nx-json';
-import { NxArgs } from '../../../utils/command-line-utils';
-import { MessageKey } from '../../../utils/ab-testing';
+import { ConnectToNxCloudOptions } from '../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud';
+import { NxJsonConfiguration } from '../../config/nx-json';
+import { NxArgs } from '../../utils/command-line-utils';
+import { MessageKey } from '../../utils/ab-testing';
 export declare function onlyDefaultRunnerIsUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function connectToNxCloudIfExplicitlyAsked(opts: NxArgs): Promise<void>;
 export declare function connectWorkspaceToCloud(options: ConnectToNxCloudOptions, directory?: string): Promise<string>;

package/src/command-line/{nx-cloud/connect → connect}/connect-to-nx-cloud.js

@@ -6,16 +6,16 @@ exports.connectWorkspaceToCloud = connectWorkspaceToCloud;
 exports.connectToNxCloudCommand = connectToNxCloudCommand;
 exports.connectExistingRepoToNxCloudPrompt = connectExistingRepoToNxCloudPrompt;
 exports.connectToNxCloudWithPrompt = connectToNxCloudWithPrompt;
-const output_1 = require("../../../utils/output");
-const configuration_1 = require("../../../config/configuration");
-const tree_1 = require("../../../generators/tree");
-const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
-const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
-const nx_cloud_utils_1 = require("../../../utils/nx-cloud-utils");
-const child_process_1 = require("../../../utils/child-process");
-const ab_testing_1 = require("../../../utils/ab-testing");
-const versions_1 = require("../../../utils/versions");
-const workspace_root_1 = require("../../../utils/workspace-root");
+const output_1 = require("../../utils/output");
+const configuration_1 = require("../../config/configuration");
+const tree_1 = require("../../generators/tree");
+const connect_to_nx_cloud_1 = require("../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
+const url_shorten_1 = require("../../nx-cloud/utilities/url-shorten");
+const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
+const child_process_1 = require("../../utils/child-process");
+const ab_testing_1 = require("../../utils/ab-testing");
+const versions_1 = require("../../utils/versions");
+const workspace_root_1 = require("../../utils/workspace-root");
 const chalk = require("chalk");
 const ora = require("ora");
 const open = require("open");

package/src/command-line/{nx-cloud/connect → connect}/view-logs.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viewLogs = viewLogs;
-const package_manager_1 = require("../../../utils/package-manager");
+const package_manager_1 = require("../../utils/package-manager");
 const child_process_1 = require("child_process");
-const nx_cloud_utils_1 = require("../../../utils/nx-cloud-utils");
-const output_1 = require("../../../utils/output");
-const nx_json_1 = require("../../../config/nx-json");
+const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
+const output_1 = require("../../utils/output");
+const nx_json_1 = require("../../config/nx-json");
 const connect_to_nx_cloud_1 = require("./connect-to-nx-cloud");
-const connect_to_nx_cloud_2 = require("../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
-const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
+const connect_to_nx_cloud_2 = require("../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
+const url_shorten_1 = require("../../nx-cloud/utilities/url-shorten");
 async function viewLogs() {
     const cloudUsed = (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)());
     if (cloudUsed) {

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

@@ -37,8 +37,13 @@ function withFormatOptions(yargs) {
         coerce: shared_options_1.parseCSV,
     })
         .option('sort-root-tsconfig-paths', {
-        describe: `Ensure the workspace's tsconfig compilerOptions.paths are sorted. Warning: This will cause comments in the tsconfig to be lost. The default value is "true" unless NX_FORMAT_SORT_TSCONFIG_PATHS is set to "false".`,
+        describe: `Ensure the workspace's tsconfig compilerOptions.paths are sorted. Warning: This will cause comments in the tsconfig to be lost.`,
         type: 'boolean',
+        /**
+         * TODO(v22): Stop sorting tsconfig paths by default, paths are now less common/important
+         * in Nx workspace setups, and the sorting causes comments to be lost.
+         */
+        default: true,
     })
         .option('all', {
         describe: 'Format all projects.',
@@ -46,16 +51,5 @@ function withFormatOptions(yargs) {
     })
         .conflicts({
         all: 'projects',
-    })
-        .middleware((args) => {
-        /**
-         * TODO(v22): Stop sorting tsconfig paths by default, paths are now less common/important
-         * in Nx workspace setups, and the sorting causes comments to be lost.
-         */
-        args.sortRootTsconfigPaths ??=
-            process.env.NX_FORMAT_SORT_TSCONFIG_PATHS !== 'false';
-        // If NX_FORMAT_SORT_TSCONFIG_PATHS=false and --sort-root-tsconfig-paths is passed, we want to set it to true favoring the arg
-        process.env.NX_FORMAT_SORT_TSCONFIG_PATHS =
-            args.sortRootTsconfigPaths.toString();
     });
 }

package/src/command-line/init/implementation/add-nx-to-monorepo.js

@@ -8,7 +8,7 @@ const path_1 = require("path");
 const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
 const utils_1 = require("./utils");
-const connect_to_nx_cloud_1 = require("../../nx-cloud/connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_1 = require("../../connect/connect-to-nx-cloud");
 async function addNxToMonorepo(options) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });

package/src/command-line/init/implementation/add-nx-to-nest.js

@@ -9,7 +9,7 @@ const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
 const utils_1 = require("./utils");
 const versions_1 = require("../../../utils/versions");
-const connect_to_nx_cloud_1 = require("../../nx-cloud/connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_1 = require("../../connect/connect-to-nx-cloud");
 async function addNxToNest(options, packageJson) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });

package/src/command-line/init/implementation/add-nx-to-npm-repo.js

@@ -7,7 +7,7 @@ const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
 const utils_1 = require("./utils");
-const connect_to_nx_cloud_1 = require("../../nx-cloud/connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_1 = require("../../connect/connect-to-nx-cloud");
 async function addNxToNpmRepo(options) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });

package/src/command-line/init/implementation/angular/index.js

@@ -11,7 +11,7 @@ const utils_1 = require("../utils");
 const integrated_workspace_1 = require("./integrated-workspace");
 const legacy_angular_versions_1 = require("./legacy-angular-versions");
 const standalone_workspace_1 = require("./standalone-workspace");
-const connect_to_nx_cloud_1 = require("../../../nx-cloud/connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_1 = require("../../../connect/connect-to-nx-cloud");
 const defaultCacheableOperations = [
     'build',
     'server',

package/src/command-line/init/implementation/angular/legacy-angular-versions.js

@@ -10,7 +10,7 @@ const object_sort_1 = require("../../../../utils/object-sort");
 const output_1 = require("../../../../utils/output");
 const package_json_1 = require("../../../../utils/package-json");
 const package_manager_1 = require("../../../../utils/package-manager");
-const connect_to_nx_cloud_1 = require("../../../nx-cloud/connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_1 = require("../../../connect/connect-to-nx-cloud");
 const utils_1 = require("../utils");
 // map of Angular major versions to Nx versions to use for legacy `nx init` migrations,
 // key is major Angular version and value is Nx version to use

package/src/command-line/init/implementation/utils.js

@@ -22,7 +22,7 @@ const versions_1 = require("../../../utils/versions");
 const fs_1 = require("fs");
 const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
 const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
-const connect_to_nx_cloud_2 = require("../../nx-cloud/connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_2 = require("../../connect/connect-to-nx-cloud");
 const deduce_default_base_1 = require("./deduce-default-base");
 const child_process_2 = require("../../../utils/child-process");
 function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scriptOutputs) {

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

@@ -12,7 +12,7 @@ const output_1 = require("../../utils/output");
 const package_manager_1 = require("../../utils/package-manager");
 const versions_1 = require("../../utils/versions");
 const workspace_context_1 = require("../../utils/workspace-context");
-const connect_to_nx_cloud_1 = require("../nx-cloud/connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
 const configure_plugins_1 = require("./configure-plugins");
 const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
 const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");

package/src/command-line/{nx-cloud/login → login}/command-object.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsLoginCommand = void 0;
-const shared_options_1 = require("../../yargs-utils/shared-options");
+const shared_options_1 = require("../../command-line/yargs-utils/shared-options");
 exports.yargsLoginCommand = {
     command: 'login [nxCloudUrl]',
     describe: 'Login to Nx Cloud. This command is an alias for [`nx-cloud login`](/ci/reference/nx-cloud-cli#npx-nxcloud-login).',

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

@@ -0,0 +1,19 @@
+"use strict";
+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 handle_errors_1 = require("../../utils/handle-errors");
+const resolution_helpers_1 = require("../../nx-cloud/resolution-helpers");
+function loginHandler(args) {
+    if (args.nxCloudUrl) {
+        process.env.NX_CLOUD_API = args.nxCloudUrl;
+    }
+    return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
+        const nxCloudClient = (await (0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()))
+            .nxCloudClient;
+        const paths = (0, resolution_helpers_1.findAncestorNodeModules)(__dirname, []);
+        nxCloudClient.configureLightClientRequire()(paths);
+        await nxCloudClient.commands.login();
+    });
+}

package/src/command-line/{nx-cloud/logout → logout}/command-object.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsLogoutCommand = void 0;
-const shared_options_1 = require("../../yargs-utils/shared-options");
+const shared_options_1 = require("../../command-line/yargs-utils/shared-options");
 exports.yargsLogoutCommand = {
     command: 'logout',
     describe: 'Logout from Nx Cloud. This command is an alias for [`nx-cloud logout`](/ci/reference/nx-cloud-cli#npx-nxcloud-logout).',

package/src/command-line/{nx-cloud/utils.js → logout/logout.js}

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeNxCloudCommand = executeNxCloudCommand;
+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 handle_errors_1 = require("../../utils/handle-errors");
 const resolution_helpers_1 = require("../../nx-cloud/resolution-helpers");
-async function executeNxCloudCommand(commandName, verbose) {
-    return (0, handle_errors_1.handleErrors)(verbose, async () => {
+function logoutHandler(args) {
+    return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
         const nxCloudClient = (await (0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()))
             .nxCloudClient;
         const paths = (0, resolution_helpers_1.findAncestorNodeModules)(__dirname, []);
         nxCloudClient.configureLightClientRequire()(paths);
-        await nxCloudClient.commands[commandName]();
+        await nxCloudClient.commands.logout();
     });
 }

package/src/command-line/migrate/migrate-ui-api.d.ts

@@ -1,7 +1,7 @@
 import type { MigrationDetailsWithId } from '../../config/misc-interfaces';
 import type { FileChange } from '../../generators/tree';
 export type MigrationsJsonMetadata = {
-    completedMigrations?: Record<string, SuccessfulMigration | FailedMigration | SkippedMigration | StoppedMigration>;
+    completedMigrations?: Record<string, SuccessfulMigration | FailedMigration | SkippedMigration>;
     runningMigrations?: string[];
     initialGitRef?: {
         ref: string;
@@ -25,11 +25,6 @@ export type FailedMigration = {
 export type SkippedMigration = {
     type: 'skipped';
 };
-export type StoppedMigration = {
-    type: 'stopped';
-    name: string;
-    error: string;
-};
 export declare function recordInitialMigrationMetadata(workspacePath: string, versionToMigrateTo: string): void;
 export declare function finishMigrationProcess(workspacePath: string, squashCommits: boolean, commitMessage: string): void;
 export declare function runSingleMigration(workspacePath: string, migration: MigrationDetailsWithId, configuration: {
@@ -41,7 +36,7 @@ export declare function modifyMigrationsJsonMetadata(workspacePath: string, modi
 export declare function addSuccessfulMigration(id: string, fileChanges: Omit<FileChange, 'content'>[], ref: string, nextSteps: string[]): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;
 export declare function updateRefForSuccessfulMigration(id: string, ref: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;
 export declare function addFailedMigration(id: string, error: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => {
-    completedMigrations?: Record<string, SuccessfulMigration | FailedMigration | SkippedMigration | StoppedMigration>;
+    completedMigrations?: Record<string, SuccessfulMigration | FailedMigration | SkippedMigration>;
     runningMigrations?: string[];
     initialGitRef?: {
         ref: string;
@@ -51,17 +46,7 @@ export declare function addFailedMigration(id: string, error: string): (migratio
     targetVersion?: string;
 };
 export declare function addSkippedMigration(id: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => {
-    completedMigrations?: Record<string, SuccessfulMigration | FailedMigration | SkippedMigration | StoppedMigration>;
-    runningMigrations?: string[];
-    initialGitRef?: {
-        ref: string;
-        subject: string;
-    };
-    confirmedPackageUpdates?: boolean;
-    targetVersion?: string;
-};
-export declare function addStoppedMigration(id: string, error: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => {
-    completedMigrations?: Record<string, SuccessfulMigration | FailedMigration | SkippedMigration | StoppedMigration>;
+    completedMigrations?: Record<string, SuccessfulMigration | FailedMigration | SkippedMigration>;
     runningMigrations?: string[];
     initialGitRef?: {
         ref: string;
@@ -72,5 +57,3 @@ export declare function addStoppedMigration(id: string, error: string): (migrati
 };
 export declare function readMigrationsJsonMetadata(workspacePath: string): MigrationsJsonMetadata;
 export declare function undoMigration(workspacePath: string, id: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;
-export declare function killMigrationProcess(migrationId: string, workspacePath?: string): boolean;
-export declare function stopMigration(migrationId: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;