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 { - 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 );