fix(core): skip nx cloud prompt when interactive is false

nrwl · Nov 19, 2024 · d984d71 · d984d71
1 parent 25909b0
commit d984d71
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/e2e/utils/create-project-utils.ts b/e2e/utils/create-project-utils.ts
@@ -251,7 +251,7 @@ export function runCreateWorkspace(
 
   const pm = getPackageManagerCommand({ packageManager });
 
-  let command = `${pm.createWorkspace} ${name} --preset=${preset} --nxCloud=skip --no-interactive`;
+  let command = `${pm.createWorkspace} ${name} --preset=${preset} --nxCloud=skip --packageManager=${packageManager} --no-interactive`;
   if (appName) {
     command += ` --appName=${appName}`;
   }

diff --git a/packages/create-nx-workspace/src/internal-utils/prompts.ts b/packages/create-nx-workspace/src/internal-utils/prompts.ts
@@ -1,4 +1,7 @@
 import * as yargs from 'yargs';
+import * as enquirer from 'enquirer';
+import * as chalk from 'chalk';
+
 import { MessageKey, messages } from '../utils/nx/ab-testing';
 import { output } from '../utils/output';
 import { deduceDefaultBase } from '../utils/git/default-base';
@@ -8,17 +11,18 @@ import {
   packageManagerList,
 } from '../utils/package-manager';
 import { stringifyCollection } from '../utils/string-utils';
-import enquirer = require('enquirer');
 import { NxCloud } from '../utils/nx/nx-cloud';
-import chalk = require('chalk');
+import { isCI } from '../utils/ci/is-ci';
 
 export async function determineNxCloud(
   parsedArgs: yargs.Arguments<{ nxCloud: NxCloud }>
 ): Promise<NxCloud> {
-  if (parsedArgs.nxCloud === undefined) {
-    return nxCloudPrompt('setupCI');
-  } else {
+  if (parsedArgs.nxCloud) {
     return parsedArgs.nxCloud;
+  } else if (!parsedArgs.interactive || isCI()) {
+    return 'skip';
+  } else {
+    return nxCloudPrompt('setupCI');
   }
 }
 
@@ -71,6 +75,8 @@ export async function determineDefaultBase(
 ): Promise<string> {
   if (parsedArgs.defaultBase) {
     return Promise.resolve(parsedArgs.defaultBase);
+  } else if (!parsedArgs.interactive || isCI()) {
+    return deduceDefaultBase();
   }
   if (parsedArgs.allPrompts) {
     return enquirer
@@ -114,9 +120,9 @@ export async function determinePackageManager(
       ],
     });
     process.exit(1);
-  }
-
-  if (parsedArgs.allPrompts) {
+  } else if (!parsedArgs.interactive || isCI()) {
+    return 'npm';
+  } else if (parsedArgs.allPrompts) {
     return enquirer
       .prompt<{ packageManager: PackageManager }>([
         {