create-nx-workspace 19.2.0-rc.0 → 19.2.0

package/bin/create-nx-workspace.js

@@ -97,7 +97,7 @@ exports.commandsObject = yargs
     .option('prefix', {
     describe: chalk.dim `Prefix to use for Angular component and directive selectors.`,
     type: 'string',
-}), yargs_options_1.withNxCloud, yargs_options_1.withAllPrompts, yargs_options_1.withPackageManager, yargs_options_1.withGitOptions), async function handler(argv) {
+}), yargs_options_1.withNxCloud, yargs_options_1.withUseGitHub, yargs_options_1.withAllPrompts, yargs_options_1.withPackageManager, yargs_options_1.withGitOptions), async function handler(argv) {
     await main(argv).catch((error) => {
         const { version } = require('../package.json');
         output_1.output.error({
@@ -172,12 +172,27 @@ async function normalizeArgsMiddleware(argv) {
         }
         const packageManager = await (0, prompts_1.determinePackageManager)(argv);
         const defaultBase = await (0, prompts_1.determineDefaultBase)(argv);
-        const nxCloud = await (0, prompts_1.determineNxCloud)(argv);
-        Object.assign(argv, {
-            nxCloud,
-            packageManager,
-            defaultBase,
-        });
+        if (process.env.NX_NEW_CLOUD_ONBOARDING === 'true') {
+            const nxCloud = argv.skipGit === true ? 'skip' : await (0, prompts_1.determineNxCloud)(argv);
+            const useGitHub = nxCloud === 'skip'
+                ? undefined
+                : nxCloud === 'github' ||
+                    (await (0, prompts_1.determineIfGitHubWillBeUsed)(nxCloud));
+            Object.assign(argv, {
+                nxCloud,
+                useGitHub,
+                packageManager,
+                defaultBase,
+            });
+        }
+        else {
+            const nxCloud = await (0, prompts_1.determineNxCloud)(argv);
+            Object.assign(argv, {
+                nxCloud,
+                packageManager,
+                defaultBase,
+            });
+        }
     }
     catch (e) {
         console.error(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "19.2.0-rc.0",
+  "version": "19.2.0",
   "private": false,
   "description": "Smart Monorepos · Fast CI",
   "repository": {

package/src/create-workspace-options.d.ts

@@ -4,6 +4,7 @@ export interface CreateWorkspaceOptions {
     name: string;
     packageManager: PackageManager;
     nxCloud: NxCloud;
+    useGitHub?: boolean;
     /**
      * @description Enable interactive mode with presets
      * @default true

package/src/create-workspace.js

@@ -11,7 +11,7 @@ const git_1 = require("./utils/git/git");
 const get_third_party_preset_1 = require("./utils/preset/get-third-party-preset");
 const error_utils_1 = require("./utils/error-utils");
 async function createWorkspace(preset, options) {
-    const { packageManager, name, nxCloud, skipGit = false, defaultBase = 'main', commit, cliName, } = options;
+    const { packageManager, name, nxCloud, skipGit = false, defaultBase = 'main', commit, cliName, useGitHub, } = options;
     if (cliName) {
         output_1.output.setCliName(cliName ?? 'NX');
     }
@@ -27,7 +27,7 @@ async function createWorkspace(preset, options) {
     }
     let nxCloudInstallRes;
     if (nxCloud !== 'skip') {
-        nxCloudInstallRes = await (0, nx_cloud_1.setupNxCloud)(directory, packageManager, nxCloud);
+        nxCloudInstallRes = await (0, nx_cloud_1.setupNxCloud)(directory, packageManager, nxCloud, useGitHub);
         if (nxCloud !== 'yes') {
             await (0, setup_ci_1.setupCI)(directory, nxCloud, packageManager, nxCloudInstallRes?.code === 0);
         }

package/src/internal-utils/prompts.d.ts

@@ -4,6 +4,7 @@ import { NxCloud } from '../utils/nx/nx-cloud';
 export declare function determineNxCloud(parsedArgs: yargs.Arguments<{
     nxCloud: NxCloud;
 }>): Promise<NxCloud>;
+export declare function determineIfGitHubWillBeUsed(nxCloud: NxCloud): Promise<boolean>;
 export declare function determineDefaultBase(parsedArgs: yargs.Arguments<{
     defaultBase?: string;
 }>): Promise<string>;

package/src/internal-utils/prompts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.determinePackageManager = exports.determineDefaultBase = exports.determineNxCloud = void 0;
+exports.determinePackageManager = exports.determineDefaultBase = exports.determineIfGitHubWillBeUsed = exports.determineNxCloud = void 0;
 const ab_testing_1 = require("../utils/nx/ab-testing");
 const output_1 = require("../utils/output");
 const default_base_1 = require("../utils/git/default-base");
@@ -17,6 +17,22 @@ async function determineNxCloud(parsedArgs) {
     }
 }
 exports.determineNxCloud = determineNxCloud;
+async function determineIfGitHubWillBeUsed(nxCloud) {
+    if (nxCloud === 'yes' || nxCloud === 'circleci') {
+        const reply = await enquirer.prompt([
+            {
+                name: 'github',
+                message: 'Will you be using GitHub as your git hosting provider?',
+                type: 'autocomplete',
+                choices: [{ name: 'Yes' }, { name: 'No' }],
+                initial: 0,
+            },
+        ]);
+        return reply.github === 'Yes';
+    }
+    return false;
+}
+exports.determineIfGitHubWillBeUsed = determineIfGitHubWillBeUsed;
 async function nxCloudPrompt(key) {
     const { message, choices, initial, fallback, footer, hint } = ab_testing_1.messages.getPrompt(key);
     const promptConfig = {

package/src/internal-utils/yargs-options.d.ts

@@ -2,6 +2,9 @@ import yargs = require('yargs');
 export declare function withNxCloud<T = unknown>(argv: yargs.Argv<T>): yargs.Argv<T & {
     nxCloud: string | undefined;
 }>;
+export declare function withUseGitHub<T = unknown>(argv: yargs.Argv<T>): yargs.Argv<T & {
+    useGitHub: boolean;
+}>;
 export declare function withAllPrompts<T = unknown>(argv: yargs.Argv<T>): yargs.Argv<T & {
     allPrompts: boolean;
 }>;

package/src/internal-utils/yargs-options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withOptions = exports.withGitOptions = exports.withPackageManager = exports.withAllPrompts = exports.withNxCloud = void 0;
+exports.withOptions = exports.withGitOptions = exports.withPackageManager = exports.withAllPrompts = exports.withUseGitHub = exports.withNxCloud = void 0;
 const chalk = require("chalk");
 const ab_testing_1 = require("../utils/nx/ab-testing");
 const package_manager_1 = require("../utils/package-manager");
@@ -15,6 +15,14 @@ function withNxCloud(argv) {
     return result;
 }
 exports.withNxCloud = withNxCloud;
+function withUseGitHub(argv) {
+    return argv.option('useGitHub', {
+        describe: chalk.dim `Will you be using GitHub as your git hosting provider?`,
+        type: 'boolean',
+        default: false,
+    });
+}
+exports.withUseGitHub = withUseGitHub;
 function withAllPrompts(argv) {
     return argv.option('allPrompts', {
         alias: 'a',

package/src/utils/nx/nx-cloud.d.ts

@@ -1,6 +1,6 @@
 import { PackageManager } from '../package-manager';
 export type NxCloud = 'yes' | 'github' | 'circleci' | 'skip';
-export declare function setupNxCloud(directory: string, packageManager: PackageManager, nxCloud: NxCloud): Promise<{
+export declare function setupNxCloud(directory: string, packageManager: PackageManager, nxCloud: NxCloud, useGitHub?: boolean): Promise<{
     code: number;
     stdout: string;
 }>;

package/src/utils/nx/nx-cloud.js

@@ -6,11 +6,13 @@ const child_process_utils_1 = require("../child-process-utils");
 const output_1 = require("../output");
 const package_manager_1 = require("../package-manager");
 const error_utils_1 = require("../error-utils");
-async function setupNxCloud(directory, packageManager, nxCloud) {
+async function setupNxCloud(directory, packageManager, nxCloud, useGitHub) {
     const nxCloudSpinner = ora(`Setting up Nx Cloud`).start();
     try {
         const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
-        const res = await (0, child_process_utils_1.execAndWait)(`${pmc.exec} nx g nx:connect-to-nx-cloud --no-interactive --quiet`, directory);
+        const res = await (0, child_process_utils_1.execAndWait)(process.env.NX_NEW_CLOUD_ONBOARDING === 'true'
+            ? `${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=create-nx-workspace ${useGitHub ? '--github' : ''} --no-interactive`
+            : `${pmc.exec} nx g nx:connect-to-nx-cloud --no-interactive --quiet`, directory);
         if (nxCloud !== 'yes') {
             nxCloudSpinner.succeed('CI workflow with Nx Cloud has been generated successfully');
         }