nx 19.5.2 → 19.5.4

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

@@ -128,11 +128,13 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
         }
         // One entry for the whole group for fixed groups
         const projectVersionData = versionData[releaseGroupProjectNames[0]]; // all at the same version, so we can just pick the first one
-        const releaseVersion = new ReleaseVersion({
-            version: projectVersionData.newVersion,
-            releaseTagPattern: releaseGroup.releaseTagPattern,
-        });
-        commitMessageValues.push(`- release-group: ${releaseGroup.name} ${releaseVersion.rawVersion}`);
+        if (projectVersionData.newVersion !== null) {
+            const releaseVersion = new ReleaseVersion({
+                version: projectVersionData.newVersion,
+                releaseTagPattern: releaseGroup.releaseTagPattern,
+            });
+            commitMessageValues.push(`- release-group: ${releaseGroup.name} ${releaseVersion.rawVersion}`);
+        }
     }
     return commitMessageValues;
 }
@@ -169,6 +171,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
         if (projectVersionData.newVersion !== null) {
             tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
                 version: projectVersionData.newVersion,
+                releaseGroupName: releaseGroup.name,
             }));
         }
     }

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

@@ -140,8 +140,9 @@ async function releaseVersion(args) {
             ...tree.listChanges().map((f) => f.path),
             ...additionalChangedFiles,
         ];
+        const deletedFiles = Array.from(additionalDeletedFiles);
         // No further actions are necessary in this scenario (e.g. if conventional commits detected no changes)
-        if (!changedFiles.length) {
+        if (!changedFiles.length && !deletedFiles.length) {
             return {
                 // An overall workspace version cannot be relevant when filtering to independent projects
                 workspaceVersion: undefined,
@@ -151,7 +152,7 @@ async function releaseVersion(args) {
         if (args.gitCommit ?? nxReleaseConfig.version.git.commit) {
             await (0, shared_1.commitChanges)({
                 changedFiles,
-                deletedFiles: Array.from(additionalDeletedFiles),
+                deletedFiles,
                 isDryRun: !!args.dryRun,
                 isVerbose: !!args.verbose,
                 gitCommitMessages: (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage),
@@ -162,6 +163,7 @@ async function releaseVersion(args) {
             output_1.output.logSingleLine(`Staging changed files with git`);
             await (0, git_1.gitAdd)({
                 changedFiles,
+                deletedFiles,
                 dryRun: args.dryRun,
                 verbose: args.verbose,
             });

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

@@ -31,6 +31,7 @@ export interface ReportData {
         migrateTarget: string;
     };
     projectGraphError?: Error | null;
+    nativeTarget: string | null;
 }
 export declare function getReportData(): Promise<ReportData>;
 interface OutOfSyncPackageGroup {

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

@@ -43,14 +43,18 @@ const LINE_SEPARATOR = '---------------------------------------';
  *
  */
 async function reportHandler() {
-    const { pm, pmVersion, localPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, } = await getReportData();
-    const bodyLines = [
-        `Node   : ${process.versions.node}`,
-        `OS     : ${process.platform}-${process.arch}`,
-        `${pm.padEnd(7)}: ${pmVersion}`,
-        ``,
+    const { pm, pmVersion, localPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, } = await getReportData();
+    const fields = [
+        ['Node', process.versions.node],
+        ['OS', `${process.platform}-${process.arch}`],
+        ['Native Target', nativeTarget ?? 'Unavailable'],
+        [pm, pmVersion],
     ];
-    let padding = Math.max(...packageVersionsWeCareAbout.map((x) => x.package.length)) + 1;
+    let padding = Math.max(...fields.map((f) => f[0].length));
+    const bodyLines = fields.map(([field, value]) => `${field.padEnd(padding)}  : ${value}`);
+    bodyLines.push('');
+    padding =
+        Math.max(...packageVersionsWeCareAbout.map((x) => x.package.length)) + 1;
     packageVersionsWeCareAbout.forEach((p) => {
         bodyLines.push(`${chalk.green(p.package.padEnd(padding))} : ${chalk.bold(p.version)}`);
     });
@@ -116,6 +120,7 @@ async function getReportData() {
         });
     }
     const outOfSyncPackageGroup = findMisalignedPackagesForPackage(nxPackageJson);
+    const native = isNativeAvailable();
     return {
         pm,
         pmVersion,
@@ -125,6 +130,7 @@ async function getReportData() {
         packageVersionsWeCareAbout,
         outOfSyncPackageGroup,
         projectGraphError,
+        nativeTarget: native ? native.getBinaryTarget() : null,
     };
 }
 async function tryGetProjectGraph() {
@@ -248,8 +254,7 @@ function findInstalledPackagesWeCareAbout() {
 }
 function isNativeAvailable() {
     try {
-        require('../../native');
-        return true;
+        return require('../../native');
     }
     catch {
         return false;

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

@@ -3,5 +3,6 @@ export type ResetCommandOptions = {
     onlyCache?: boolean;
     onlyDaemon?: boolean;
     onlyWorkspaceData?: boolean;
+    onlyCloud?: boolean;
 };
 export declare const yargsResetCommand: CommandModule<Record<string, unknown>, ResetCommandOptions>;

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

@@ -13,6 +13,10 @@ exports.yargsResetCommand = {
         .option('onlyDaemon', {
         description: 'Stops the Nx Daemon, it will be restarted fresh when the next Nx command is run.',
         type: 'boolean',
+    })
+        .option('onlyCloud', {
+        description: 'Resets the Nx Cloud client. NOTE: Does not clear the remote cache.',
+        type: 'boolean',
     })
         .option('onlyWorkspaceData', {
         description: 'Clears the workspace data directory. Used by Nx to store cached data about the current workspace (e.g. partial results, incremental data, etc)',

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

@@ -6,6 +6,8 @@ const client_1 = require("../../daemon/client/client");
 const cache_directory_1 = require("../../utils/cache-directory");
 const output_1 = require("../../utils/output");
 const native_file_cache_location_1 = require("../../native/native-file-cache-location");
+const client_2 = require("../../nx-cloud/utilities/client");
+const get_cloud_options_1 = require("../../nx-cloud/utilities/get-cloud-options");
 // Wait at max 5 seconds before giving up on a failing operation.
 const INCREMENTAL_BACKOFF_MAX_DURATION = 5000;
 // If an operation fails, wait 100ms before first retry.
@@ -61,6 +63,9 @@ async function resetHandler(args) {
             errors.push('Failed to clean up the workspace data directory.');
         }
     }
+    if (all || args.onlyCloud) {
+        await resetCloudClient();
+    }
     if (errors.length > 0) {
         output_1.output.error({
             title: 'Failed to reset the Nx workspace.',
@@ -77,6 +82,14 @@ async function resetHandler(args) {
 function killDaemon() {
     return client_1.daemonClient.stop();
 }
+async function resetCloudClient() {
+    // Remove nx cloud marker files. This helps if the use happens to run `nx-cloud start-ci-run` or
+    // similar commands on their local machine.
+    try {
+        (await (0, client_2.getCloudClient)((0, get_cloud_options_1.getCloudOptions)())).invoke('cleanup');
+    }
+    catch { }
+}
 function cleanupCacheEntries() {
     return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
         (0, fs_extra_1.rmSync)(cache_directory_1.cacheDir, { recursive: true, force: true });

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

@@ -35,20 +35,8 @@ async function* promiseToIterator(v) {
     yield await v;
 }
 async function iteratorToProcessStatusCode(i) {
-    // This is a workaround to fix an issue that only happens with
-    // the @angular-devkit/build-angular:browser builder. Starting
-    // on version 12.0.1, a SASS compilation implementation was
-    // introduced making use of workers and it's unref()-ing the worker
-    // too early, causing the process to exit early in environments
-    // like CI or when running Docker builds.
-    const keepProcessAliveInterval = setInterval(() => { }, 1000);
-    try {
-        const { success } = await (0, async_iterator_1.getLastValueFromAsyncIterableIterator)(i);
-        return success ? 0 : 1;
-    }
-    finally {
-        clearInterval(keepProcessAliveInterval);
-    }
+    const { success } = await (0, async_iterator_1.getLastValueFromAsyncIterableIterator)(i);
+    return success ? 0 : 1;
 }
 async function parseExecutorAndTarget({ project, target }, root, projectsConfigurations) {
     const proj = projectsConfigurations.projects[project];

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

@@ -117,7 +117,7 @@ async function watch(args) {
     if (args.verbose) {
         process.env.NX_VERBOSE_LOGGING = 'true';
     }
-    if (client_1.daemonClient.enabled()) {
+    if (!client_1.daemonClient.enabled()) {
         output_1.output.error({
             title: 'Daemon is not running. The watch command is not supported without the Nx Daemon.',
         });

package/src/daemon/socket-utils.js

@@ -25,7 +25,7 @@ const getForkedProcessOsSocketPath = (id) => {
 };
 exports.getForkedProcessOsSocketPath = getForkedProcessOsSocketPath;
 const getPluginOsSocketPath = (id) => {
-    let path = (0, path_1.resolve)((0, path_1.join)((0, tmp_dir_1.getSocketDir)(), 'plugin' + id + '.sock'));
+    let path = (0, path_1.resolve)((0, path_1.join)((0, tmp_dir_1.getSocketDir)(true), 'plugin' + id + '.sock'));
     return exports.isWindows ? '\\\\.\\pipe\\nx\\' + (0, path_1.resolve)(path) : (0, path_1.resolve)(path);
 };
 exports.getPluginOsSocketPath = getPluginOsSocketPath;

package/src/daemon/tmp-dir.d.ts

@@ -8,5 +8,5 @@ export declare function isDaemonDisabled(): boolean;
  * We try to create a socket file in a tmp dir, but if it doesn't work because
  * for instance we don't have permissions, we create it in DAEMON_DIR_FOR_CURRENT_WORKSPACE
  */
-export declare function getSocketDir(): string;
+export declare function getSocketDir(alreadyUnique?: boolean): string;
 export declare function removeSocketDir(): void;

package/src/daemon/tmp-dir.js

@@ -51,9 +51,10 @@ function socketDirName() {
  * We try to create a socket file in a tmp dir, but if it doesn't work because
  * for instance we don't have permissions, we create it in DAEMON_DIR_FOR_CURRENT_WORKSPACE
  */
-function getSocketDir() {
+function getSocketDir(alreadyUnique = false) {
     try {
-        const dir = process.env.NX_DAEMON_SOCKET_DIR ?? socketDirName();
+        const dir = process.env.NX_DAEMON_SOCKET_DIR ??
+            (alreadyUnique ? tmp_1.tmpdir : socketDirName());
         (0, fs_extra_1.ensureDirSync)(dir);
         return dir;
     }

package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.d.ts

@@ -6,3 +6,9 @@ import type { Tree } from '../tree';
 export declare function formatChangedFilesWithPrettierIfAvailable(tree: Tree, options?: {
     silent?: boolean;
 }): Promise<void>;
+export declare function formatFilesWithPrettierIfAvailable(files: {
+    path: string;
+    content: string | Buffer;
+}[], root: string, options?: {
+    silent?: boolean;
+}): Promise<Map<string, string>>;

package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js

@@ -1,23 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatChangedFilesWithPrettierIfAvailable = formatChangedFilesWithPrettierIfAvailable;
+exports.formatFilesWithPrettierIfAvailable = formatFilesWithPrettierIfAvailable;
 const path = require("path");
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
  */
 async function formatChangedFilesWithPrettierIfAvailable(tree, options) {
+    const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
+    const results = await formatFilesWithPrettierIfAvailable(Array.from(files), tree.root, options);
+    for (const [path, content] of results) {
+        tree.write(path, content);
+    }
+}
+async function formatFilesWithPrettierIfAvailable(files, root, options) {
+    const results = new Map();
     let prettier;
     try {
         prettier = await Promise.resolve().then(() => require('prettier'));
     }
     catch { }
-    if (!prettier)
-        return;
-    const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
+    if (!prettier) {
+        return results;
+    }
     await Promise.all(Array.from(files).map(async (file) => {
         try {
-            const systemPath = path.join(tree.root, file.path);
+            const systemPath = path.join(root, file.path);
             let options = {
                 filepath: systemPath,
             };
@@ -35,7 +44,7 @@ async function formatChangedFilesWithPrettierIfAvailable(tree, options) {
             if (support.ignored || !support.inferredParser) {
                 return;
             }
-            tree.write(file.path, 
+            results.set(file.path, 
             // In prettier v3 the format result is a promise
             await prettier.format(file.content.toString('utf-8'), options));
         }
@@ -45,4 +54,5 @@ async function formatChangedFilesWithPrettierIfAvailable(tree, options) {
             }
         }
     }));
+    return results;
 }

package/src/migrations/update-16-0-0/update-nx-cloud-runner.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const project_configuration_1 = require("../../generators/utils/project-configuration");
 const json_1 = require("../../generators/utils/json");
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 async function default_1(tree) {
     (0, json_1.updateJson)(tree, 'package.json', (json) => {
         if (json.dependencies && json.dependencies['@nrwl/nx-cloud']) {
@@ -24,4 +25,5 @@ async function default_1(tree) {
         }
     }
     (0, project_configuration_1.updateNxJson)(tree, nxJson);
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
 }

package/src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces.d.ts

@@ -1,2 +1,2 @@
 import { Tree } from '../../generators/tree';
-export default function migrate(tree: Tree): void;
+export default function migrate(tree: Tree): Promise<void>;

package/src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrate;
 const nx_json_1 = require("../../generators/utils/nx-json");
-function migrate(tree) {
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+async function migrate(tree) {
     const nxJson = (0, nx_json_1.readNxJson)(tree);
     nxJson.useInferencePlugins = false;
     (0, nx_json_1.updateNxJson)(tree, nxJson);
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
 }

package/src/native/index.d.ts

@@ -116,6 +116,8 @@ export interface FileSetInput {
 
 export declare export function findImports(projectFileMap: Record<string, Array<string>>): Array<ImportResult>
 
+export declare export function getBinaryTarget(): string
+
 /**
  * Expands the given outputs into a list of existing files.
  * This is used when hashing outputs

package/src/native/native-bindings.js

@@ -372,6 +372,7 @@ module.exports.copy = nativeBinding.copy
 module.exports.EventType = nativeBinding.EventType
 module.exports.expandOutputs = nativeBinding.expandOutputs
 module.exports.findImports = nativeBinding.findImports
+module.exports.getBinaryTarget = nativeBinding.getBinaryTarget
 module.exports.getFilesForOutputs = nativeBinding.getFilesForOutputs
 module.exports.hashArray = nativeBinding.hashArray
 module.exports.hashFile = nativeBinding.hashFile

package/src/native/nx.wasi.cjs

@@ -88,39 +88,40 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__copy_3']?.()
   __napiInstance.exports['__napi_register__hash_array_4']?.()
   __napiInstance.exports['__napi_register__hash_file_5']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_6']?.()
-  __napiInstance.exports['__napi_register__find_imports_7']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_8']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_9']?.()
-  __napiInstance.exports['__napi_register__Target_struct_10']?.()
-  __napiInstance.exports['__napi_register__Project_struct_11']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_12']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_13']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_17']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_18']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_19']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_20']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_23']?.()
-  __napiInstance.exports['__napi_register__Task_struct_24']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_25']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_26']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_27']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_28']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_29']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_30']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_31']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_32']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_33']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_34']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_35']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_44']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_45']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_46']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_47']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_48']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_49']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_50']?.()
-  __napiInstance.exports['__napi_register__IS_WASM_51']?.()
+  __napiInstance.exports['__napi_register__IS_WASM_6']?.()
+  __napiInstance.exports['__napi_register__get_binary_target_7']?.()
+  __napiInstance.exports['__napi_register__ImportResult_struct_8']?.()
+  __napiInstance.exports['__napi_register__find_imports_9']?.()
+  __napiInstance.exports['__napi_register__transfer_project_graph_10']?.()
+  __napiInstance.exports['__napi_register__ExternalNode_struct_11']?.()
+  __napiInstance.exports['__napi_register__Target_struct_12']?.()
+  __napiInstance.exports['__napi_register__Project_struct_13']?.()
+  __napiInstance.exports['__napi_register__ProjectGraph_struct_14']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_struct_15']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_impl_19']?.()
+  __napiInstance.exports['__napi_register__HashDetails_struct_20']?.()
+  __napiInstance.exports['__napi_register__HasherOptions_struct_21']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_struct_22']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_impl_25']?.()
+  __napiInstance.exports['__napi_register__Task_struct_26']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_27']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_28']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_29']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_30']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_31']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_32']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_33']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_34']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_35']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_36']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_37']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_46']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_47']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_48']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_49']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_50']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_51']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_52']?.()
 }
 module.exports.HashPlanner = __napiModule.exports.HashPlanner
 module.exports.ImportResult = __napiModule.exports.ImportResult
@@ -129,6 +130,7 @@ module.exports.WorkspaceContext = __napiModule.exports.WorkspaceContext
 module.exports.copy = __napiModule.exports.copy
 module.exports.expandOutputs = __napiModule.exports.expandOutputs
 module.exports.findImports = __napiModule.exports.findImports
+module.exports.getBinaryTarget = __napiModule.exports.getBinaryTarget
 module.exports.getFilesForOutputs = __napiModule.exports.getFilesForOutputs
 module.exports.hashArray = __napiModule.exports.hashArray
 module.exports.hashFile = __napiModule.exports.hashFile

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.d.ts

@@ -1,10 +1,11 @@
 import { Tree } from '../../../generators/tree';
-interface ConnectToNxCloudOptions {
+export declare function printSuccessMessage(token: string | undefined, installationSource: string, usesGithub: boolean): Promise<string>;
+export interface ConnectToNxCloudOptions {
     analytics?: boolean;
     installationSource?: string;
     hideFormatLogs?: boolean;
     github?: boolean;
     directory?: string;
 }
-export declare function connectToNxCloud(tree: Tree, schema: ConnectToNxCloudOptions): Promise<() => void>;
+export declare function connectToNxCloud(tree: Tree, schema: ConnectToNxCloudOptions): Promise<string>;
 export default connectToNxCloud;

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.printSuccessMessage = printSuccessMessage;
 exports.connectToNxCloud = connectToNxCloud;
 const child_process_1 = require("child_process");
 const output_1 = require("../../../utils/output");
@@ -8,9 +9,6 @@ const nx_json_1 = require("../../../generators/utils/nx-json");
 const format_changed_files_with_prettier_if_available_1 = require("../../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const url_shorten_1 = require("../../utilities/url-shorten");
 const get_cloud_options_1 = require("../../utilities/get-cloud-options");
-const git_utils_1 = require("../../../utils/git-utils");
-const ora = require("ora");
-const open = require("open");
 function printCloudConnectionDisabledMessage() {
     output_1.output.error({
         title: `Connections to Nx Cloud are disabled for this workspace`,
@@ -55,60 +53,20 @@ async function createNxCloudWorkspace(workspaceName, installationSource, nxInitD
     }
     return response.data;
 }
-async function printSuccessMessage(url, token, installationSource, usesGithub, directory) {
-    const connectCloudUrl = await (0, url_shorten_1.shortenedCloudUrl)(installationSource, token, usesGithub);
-    if (installationSource === 'nx-connect' && usesGithub) {
-        try {
-            const cloudConnectSpinner = ora(`Opening Nx Cloud ${connectCloudUrl} in your browser to connect your workspace.`).start();
-            await sleep(2000);
-            open(connectCloudUrl);
-            cloudConnectSpinner.succeed();
-        }
-        catch (e) {
-            output_1.output.note({
-                title: `Your Nx Cloud workspace is ready.`,
-                bodyLines: [
-                    `To claim it, connect it to your Nx Cloud account:`,
-                    `- Go to the following URL to connect your workspace to Nx Cloud:`,
-                    '',
-                    `${connectCloudUrl}`,
-                ],
-            });
-        }
-    }
-    else {
-        if (installationSource === 'create-nx-workspace') {
-            output_1.output.note({
-                title: `Your Nx Cloud workspace is ready.`,
-                bodyLines: [
-                    `To claim it, connect it to your Nx Cloud account:`,
-                    `- Push your repository to your git hosting provider.`,
-                    `- Go to the following URL to connect your workspace to Nx Cloud:`,
-                    '',
-                    `${connectCloudUrl}`,
-                ],
-            });
-            (0, git_utils_1.commitChanges)(`feat(nx): Added Nx Cloud token to your nx.json
-          
-          To connect your workspace to Nx Cloud, push your repository 
-          to your git hosting provider and go to the following URL:   
-          
-          ${connectCloudUrl}`, directory);
-        }
-        else {
-            output_1.output.note({
-                title: `Your Nx Cloud workspace is ready.`,
-                bodyLines: [
-                    `To claim it, connect it to your Nx Cloud account:`,
-                    `- Commit and push your changes.`,
-                    `- Create a pull request for the changes.`,
-                    `- Go to the following URL to connect your workspace to Nx Cloud:`,
-                    '',
-                    `${connectCloudUrl}`,
-                ],
-            });
-        }
-    }
+async function printSuccessMessage(token, installationSource, usesGithub) {
+    const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)(installationSource, token, usesGithub);
+    output_1.output.note({
+        title: `Your Nx Cloud workspace is ready.`,
+        bodyLines: [
+            `To claim it, connect it to your Nx Cloud account:`,
+            `- Commit and push your changes.`,
+            `- Create a pull request for the changes.`,
+            `- Go to the following URL to connect your workspace to Nx Cloud:`,
+            '',
+            `${connectCloudUrl}`,
+        ],
+    });
+    return connectCloudUrl;
 }
 function addNxCloudOptionsToNxJson(tree, nxJson, token) {
     nxJson ??= {
@@ -125,12 +83,11 @@ async function connectToNxCloud(tree, schema) {
     schema.installationSource ??= 'user';
     const nxJson = (0, nx_json_1.readNxJson)(tree);
     if (nxJson?.neverConnectToCloud) {
-        return () => {
-            printCloudConnectionDisabledMessage();
-        };
+        printCloudConnectionDisabledMessage();
+        return null;
     }
     else {
-        const usesGithub = await (0, url_shorten_1.repoUsesGithub)(schema.github);
+        const usesGithub = schema.github ?? (await (0, url_shorten_1.repoUsesGithub)(schema.github));
         let responseFromCreateNxCloudWorkspace;
         // do NOT create Nx Cloud token (createNxCloudWorkspace)
         // if user is using github and is running nx-connect
@@ -140,12 +97,8 @@ async function connectToNxCloud(tree, schema) {
             await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
                 silent: schema.hideFormatLogs,
             });
+            return responseFromCreateNxCloudWorkspace.token;
         }
-        const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
-        return async () => await printSuccessMessage(responseFromCreateNxCloudWorkspace?.url ?? apiUrl, responseFromCreateNxCloudWorkspace?.token, schema.installationSource, usesGithub, schema.directory);
     }
 }
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
 exports.default = connectToNxCloud;

package/src/nx-cloud/utilities/client.d.ts

@@ -0,0 +1,10 @@
+import { CloudTaskRunnerOptions } from '../nx-cloud-tasks-runner-shell';
+export declare class UnknownCommandError extends Error {
+    command: string;
+    availableCommands: string[];
+    constructor(command: string, availableCommands: string[]);
+}
+export declare function getCloudClient(options: CloudTaskRunnerOptions): Promise<{
+    invoke: (command: string) => void;
+    availableCommands: string[];
+}>;

package/src/nx-cloud/utilities/client.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnknownCommandError = void 0;
+exports.getCloudClient = getCloudClient;
+const resolution_helpers_1 = require("../resolution-helpers");
+const update_manager_1 = require("../update-manager");
+class UnknownCommandError extends Error {
+    constructor(command, availableCommands) {
+        super(`Unknown Command "${command}"`);
+        this.command = command;
+        this.availableCommands = availableCommands;
+    }
+}
+exports.UnknownCommandError = UnknownCommandError;
+async function getCloudClient(options) {
+    const { nxCloudClient } = await (0, update_manager_1.verifyOrUpdateNxCloudClient)(options);
+    const paths = (0, resolution_helpers_1.findAncestorNodeModules)(__dirname, []);
+    nxCloudClient.configureLightClientRequire()(paths);
+    return {
+        invoke: (command) => {
+            if (command in nxCloudClient.commands) {
+                nxCloudClient.commands[command]()
+                    .then(() => process.exit(0))
+                    .catch((e) => {
+                    console.error(e);
+                    process.exit(1);
+                });
+            }
+            else {
+                throw new UnknownCommandError(command, Object.keys(nxCloudClient.commands));
+            }
+        },
+        availableCommands: Object.keys(nxCloudClient.commands),
+    };
+}

package/src/nx-cloud/utilities/url-shorten.d.ts

@@ -1,6 +1,6 @@
-export declare function shortenedCloudUrl(installationSource: string, accessToken?: string, usesGithub?: boolean): Promise<string>;
-export declare function repoUsesGithub(github?: boolean): Promise<boolean>;
-export declare function getURLifShortenFailed(usesGithub: boolean, githubSlug: string, apiUrl: string, source: string, accessToken?: string): string;
+export declare function createNxCloudOnboardingURL(onboardingSource: string, accessToken?: string, usesGithub?: boolean, meta?: string): Promise<string>;
+export declare function repoUsesGithub(github?: boolean, githubSlug?: string, apiUrl?: string): Promise<boolean>;
+export declare function getURLifShortenFailed(usesGithub: boolean, githubSlug: string | null, apiUrl: string, source: string, accessToken?: string): string;
 export declare function getNxCloudVersion(apiUrl: string): Promise<string | null>;
 export declare function removeVersionModifier(versionString: string): string;
 export declare function versionIsValid(version: string): boolean;