create-nx-workspace 19.4.0-beta.0 → 19.4.0-beta.2

package/bin/create-nx-workspace.js

@@ -172,27 +172,16 @@ async function normalizeArgsMiddleware(argv) {
         }
         const packageManager = await (0, prompts_1.determinePackageManager)(argv);
         const defaultBase = await (0, prompts_1.determineDefaultBase)(argv);
-        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,
-            });
-        }
+        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,
+        });
     }
     catch (e) {
         console.error(e);

package/package.json

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

package/src/create-workspace.js

@@ -25,16 +25,11 @@ async function createWorkspace(preset, options) {
     if (thirdPartyPackageName) {
         await (0, create_preset_1.createPreset)(thirdPartyPackageName, options, packageManager, directory);
     }
-    let nxCloudInstallRes;
-    if (nxCloud !== 'skip') {
-        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);
-        }
-    }
+    let gitSuccess = false;
     if (!skipGit && commit) {
         try {
             await (0, git_1.initializeGitRepo)(directory, { defaultBase, commit });
+            gitSuccess = true;
         }
         catch (e) {
             if (e instanceof Error) {
@@ -48,6 +43,16 @@ async function createWorkspace(preset, options) {
             }
         }
     }
+    let nxCloudInstallRes;
+    if (nxCloud !== 'skip') {
+        nxCloudInstallRes = await (0, nx_cloud_1.setupNxCloud)(directory, packageManager, nxCloud, useGitHub);
+        if (nxCloud !== 'yes') {
+            const nxCIsetupRes = await (0, setup_ci_1.setupCI)(directory, nxCloud, packageManager, nxCloudInstallRes?.code === 0);
+            if (nxCIsetupRes?.code === 0) {
+                (0, git_1.commitChanges)(directory, `feat(nx): Generated CI workflow`);
+            }
+        }
+    }
     return {
         nxCloudInfo: nxCloudInstallRes?.stdout,
         directory,

package/src/utils/git/git.d.ts

@@ -7,3 +7,4 @@ export declare function initializeGitRepo(directory: string, options: {
         email: string;
     };
 }): Promise<void>;
+export declare function commitChanges(directory: string, message: string): void;

package/src/utils/git/git.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeGitRepo = exports.checkGitVersion = void 0;
+exports.commitChanges = exports.initializeGitRepo = exports.checkGitVersion = void 0;
 const child_process_1 = require("child_process");
 const default_base_1 = require("./default-base");
 const output_1 = require("../output");
@@ -76,3 +76,20 @@ async function initializeGitRepo(directory, options) {
     }
 }
 exports.initializeGitRepo = initializeGitRepo;
+function commitChanges(directory, message) {
+    try {
+        (0, child_process_1.execSync)('git add -A', { encoding: 'utf8', stdio: 'pipe', cwd: directory });
+        (0, child_process_1.execSync)('git commit --no-verify -F -', {
+            encoding: 'utf8',
+            stdio: 'pipe',
+            input: message,
+            cwd: directory,
+        });
+    }
+    catch (e) {
+        console.error(`There was an error committing your Nx Cloud token.\n 
+      Please commit the changes manually and push to your new repository.\n  
+      \n${e}`);
+    }
+}
+exports.commitChanges = commitChanges;

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

@@ -10,9 +10,7 @@ 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)(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);
+        const res = await (0, child_process_utils_1.execAndWait)(`${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=create-nx-workspace --directory=${directory} ${useGitHub ? '--github' : ''} --no-interactive`, directory);
         if (nxCloud !== 'yes') {
             nxCloudSpinner.succeed('CI workflow with Nx Cloud has been generated successfully');
         }