create-nx-workspace 19.5.1 → 19.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "19.5.1",
+  "version": "19.5.3",
   "private": false,
   "description": "Smart Monorepos · Fast CI",
   "repository": {

package/src/create-workspace.d.ts

@@ -3,3 +3,4 @@ export declare function createWorkspace<T extends CreateWorkspaceOptions>(preset
     nxCloudInfo: string | undefined;
     directory: string;
 }>;
+export declare function extractConnectUrl(text: string): string | null;

package/src/create-workspace.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWorkspace = createWorkspace;
+exports.extractConnectUrl = extractConnectUrl;
 const output_1 = require("./utils/output");
 const nx_cloud_1 = require("./utils/nx/nx-cloud");
 const create_sandbox_1 = require("./create-sandbox");
@@ -25,11 +26,20 @@ async function createWorkspace(preset, options) {
     if (thirdPartyPackageName) {
         await (0, create_preset_1.createPreset)(thirdPartyPackageName, options, packageManager, directory);
     }
-    let gitSuccess = false;
-    if (!skipGit && commit) {
+    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);
+        }
+    }
+    if (!skipGit) {
         try {
-            await (0, git_1.initializeGitRepo)(directory, { defaultBase, commit });
-            gitSuccess = true;
+            let connectUrl;
+            if (nxCloudInstallRes?.code === 0) {
+                connectUrl = extractConnectUrl(nxCloudInstallRes?.stdout);
+            }
+            await (0, git_1.initializeGitRepo)(directory, { defaultBase, commit, connectUrl });
         }
         catch (e) {
             if (e instanceof Error) {
@@ -43,18 +53,13 @@ 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,
     };
 }
+function extractConnectUrl(text) {
+    const urlPattern = /(https:\/\/[^\s]+\/connect\/[^\s]+)/g;
+    const match = text.match(urlPattern);
+    return match ? match[0] : null;
+}

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

@@ -6,5 +6,5 @@ export declare function initializeGitRepo(directory: string, options: {
         name: string;
         email: string;
     };
+    connectUrl?: string | null;
 }): Promise<void>;
-export declare function commitChanges(directory: string, message: string): void;

package/src/utils/git/git.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkGitVersion = checkGitVersion;
 exports.initializeGitRepo = initializeGitRepo;
-exports.commitChanges = commitChanges;
 const child_process_1 = require("child_process");
 const default_base_1 = require("./default-base");
 const output_1 = require("../output");
@@ -72,23 +71,16 @@ async function initializeGitRepo(directory, options) {
     }
     await execute(['add', '.']);
     if (options.commit) {
-        const message = options.commit.message || 'initial commit';
+        let message = `${options.commit.message}` || 'initial commit';
+        if (options.connectUrl) {
+            message = `${message}
+
+To connect your workspace to Nx Cloud, push your repository
+to your git hosting provider and go to the following URL:
+  
+${options.connectUrl}
+`;
+        }
         await execute(['commit', `-m "${message}"`]);
     }
 }
-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}`);
-    }
-}