feat(nx-cloud): include URL for connect in cnw commit message

docs/generated/packages/nx/generators/connect-to-nx-cloud.json

@@ -28,6 +28,11 @@
         "type": "boolean",
         "description": "If the user will be using GitHub as their git hosting provider",
         "default": false
+      },
+      "directory": {
+        "type": "string",
+        "description": "The directory where the workspace is located",
+        "x-priority": "internal"
       }
     },
     "additionalProperties": false,

packages/create-nx-workspace/src/create-workspace.ts

@@ -85,14 +85,9 @@ export async function createWorkspace<T extends CreateWorkspaceOptions>(
         packageManager,
         nxCloudInstallRes?.code === 0
       );
-    }
-
-    if (gitSuccess && nxCloudInstallRes?.code === 0) {
-      let message = `feat(nx): Added Nx Cloud token to your nx.json`;
       if (nxCIsetupRes?.code === 0) {
-        message = `${message} and generated CI workflow`;
+        commitChanges(directory, `feat(nx): Generated CI workflow`);
       }
-      commitChanges(directory, message);
     }
   }
 

packages/create-nx-workspace/src/utils/nx/nx-cloud.ts

@@ -19,7 +19,7 @@ export async function setupNxCloud(
       process.env.NX_NEW_CLOUD_ONBOARDING === 'true'
         ? `${
             pmc.exec
-          } nx g nx:connect-to-nx-cloud --installationSource=create-nx-workspace ${
+          } nx g nx:connect-to-nx-cloud --installationSource=create-nx-workspace --directory=${directory} ${
             useGitHub ? '--github' : ''
           } --no-interactive`
         : `${pmc.exec} nx g nx:connect-to-nx-cloud --no-interactive --quiet`,

packages/nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.ts

@@ -7,6 +7,7 @@ import { NxJsonConfiguration } from '../../../config/nx-json';
 import { readNxJson, updateNxJson } from '../../../generators/utils/nx-json';
 import { formatChangedFilesWithPrettierIfAvailable } from '../../../generators/internal-utils/format-changed-files-with-prettier-if-available';
 import { repoUsesGithub, shortenedCloudUrl } from '../../utilities/url-shorten';
+import { commitChanges } from '../../../utils/git-utils';
 import * as ora from 'ora';
 import * as open from 'open';
 
@@ -79,7 +80,8 @@ async function printSuccessMessage(
   url: string,
   token: string | undefined,
   installationSource: string,
-  usesGithub?: boolean
+  usesGithub?: boolean,
+  directory?: string
 ) {
   if (process.env.NX_NEW_CLOUD_ONBOARDING !== 'true') {
     let origin = 'https://nx.app';
@@ -106,6 +108,7 @@ async function printSuccessMessage(
       try {
         const cloudConnectSpinner = ora(
           `Opening Nx Cloud in your browser to connect your workspace.
+          
 If that does not work, you can manually visit the following URL:
 ${connectCloudUrl}
 `
@@ -136,6 +139,15 @@ ${connectCloudUrl}
             `${connectCloudUrl}`,
           ],
         });
+        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.note({
           title: `Your Nx Cloud workspace is ready.`,
@@ -158,6 +170,7 @@ interface ConnectToNxCloudOptions {
   installationSource?: string;
   hideFormatLogs?: boolean;
   github?: boolean;
+  directory?: string;
 }
 
 function addNxCloudOptionsToNxJson(
@@ -246,7 +259,8 @@ export async function connectToNxCloud(
           responseFromCreateNxCloudWorkspace?.url ?? apiUrl,
           responseFromCreateNxCloudWorkspace?.token,
           schema.installationSource,
-          usesGithub
+          usesGithub,
+          schema.directory
         );
     }
   }

packages/nx/src/nx-cloud/generators/connect-to-nx-cloud/schema.json

@@ -25,6 +25,11 @@
       "type": "boolean",
       "description": "If the user will be using GitHub as their git hosting provider",
       "default": false
+    },
+    "directory": {
+      "type": "string",
+      "description": "The directory where the workspace is located",
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,

packages/nx/src/utils/git-utils.ts

@@ -1,4 +1,5 @@
 import { execSync } from 'child_process';
+import { logger } from '../devkit-exports';
 
 export function getGithubSlugOrNull(): string | null {
   try {
@@ -46,16 +47,28 @@ function parseGitHubUrl(url: string): string | null {
   return null;
 }
 
-export function commitChanges(commitMessage: string): string | null {
+export function commitChanges(
+  commitMessage: string,
+  directory?: string
+): string | null {
   try {
     execSync('git add -A', { encoding: 'utf8', stdio: 'pipe' });
     execSync('git commit --no-verify -F -', {
       encoding: 'utf8',
       stdio: 'pipe',
       input: commitMessage,
+      cwd: directory,
     });
   } catch (err) {
-    throw new Error(`Error committing changes:\n${err.stderr}`);
+    if (directory) {
+      // We don't want to throw during create-nx-workspace
+      // because maybe there was an error when setting up git
+      // initially.
+      logger.verbose(`Git may not be set up correctly for this new workspace.
+        ${err}`);
+    } else {
+      throw new Error(`Error committing changes:\n${err.stderr}`);
+    }
   }
 
   return getLatestCommitSha();