From f156ea932da1e2f59e7827021c78a3bbae4eb858 Mon Sep 17 00:00:00 2001
From: Nicholas Cunningham <ndcunningham@gmail.com>
Date: Wed, 26 Feb 2025 09:32:12 -0700
Subject: [PATCH] fix(core): standardize useGitHub param (#30173)

<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->
Currently, when `--useGitHub` is passed the option is ignored so the
user is asked if they would like to use GitHub.

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->
With this change if the `--useGitHub` flag is passed it will be
respected.

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #29722
---
 packages/create-nx-workspace/bin/create-nx-workspace.ts    | 2 +-
 packages/create-nx-workspace/src/internal-utils/prompts.ts | 5 +++--
 packages/create-nx-workspace/src/utils/nx/nx-cloud.ts      | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/create-nx-workspace/bin/create-nx-workspace.ts b/packages/create-nx-workspace/bin/create-nx-workspace.ts
index a53179be39..b8bd6acb8e 100644
--- a/packages/create-nx-workspace/bin/create-nx-workspace.ts
+++ b/packages/create-nx-workspace/bin/create-nx-workspace.ts
@@ -310,7 +310,7 @@ async function normalizeArgsMiddleware(
     const useGitHub =
       nxCloud === 'skip'
         ? undefined
-        : nxCloud === 'github' || (await determineIfGitHubWillBeUsed(nxCloud));
+        : nxCloud === 'github' || (await determineIfGitHubWillBeUsed(argv));
     Object.assign(argv, {
       nxCloud,
       useGitHub,
diff --git a/packages/create-nx-workspace/src/internal-utils/prompts.ts b/packages/create-nx-workspace/src/internal-utils/prompts.ts
index 2b622428a8..d36e9227f3 100644
--- a/packages/create-nx-workspace/src/internal-utils/prompts.ts
+++ b/packages/create-nx-workspace/src/internal-utils/prompts.ts
@@ -27,9 +27,10 @@ export async function determineNxCloud(
 }
 
 export async function determineIfGitHubWillBeUsed(
-  nxCloud: NxCloud
+  parsedArgs: yargs.Arguments<{ nxCloud: NxCloud; useGitHub?: boolean }>
 ): Promise<boolean> {
-  if (nxCloud === 'yes' || nxCloud === 'circleci') {
+  if (parsedArgs.nxCloud === 'yes' || parsedArgs.nxCloud === 'circleci') {
+    if (parsedArgs?.useGitHub) return true;
     const reply = await enquirer.prompt<{ github: 'Yes' | 'No' }>([
       {
         name: 'github',
diff --git a/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts b/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts
index d8d9c66a96..fd6540ea65 100644
--- a/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts
+++ b/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts
@@ -31,7 +31,7 @@ export async function getOnboardingInfo(
   nxCloud: NxCloud,
   token: string,
   directory: string,
-  useGithub?: boolean
+  useGitHub?: boolean
 ) {
   // nx-ignore-next-line
   const { createNxCloudOnboardingURL } = require(require.resolve(
@@ -50,7 +50,7 @@ export async function getOnboardingInfo(
   const connectCloudUrl = await createNxCloudOnboardingURL(
     source,
     token,
-    useGithub ??
+    useGitHub ??
       (nxCloud === 'yes' || nxCloud === 'github' || nxCloud === 'circleci'),
     code
   );