fix(core): generate nxCloudId for template flow

Previously, the template flow was not calling connectToNxCloud generator,
which meant no Cloud workspace was created and nxCloudId remained undefined.
This caused readNxCloudToken to return undefined.

Now the template flow calls connectToNxCloud after installing dependencies,
which creates the Cloud workspace and writes nxCloudId to nx.json.

The preset flow is unchanged and continues to call connectToNxCloud through
the workspace generator as before.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: jaysoo

packages/create-nx-workspace/.eslintrc.json

@@ -33,7 +33,7 @@
           "error",
           {
             "buildTargets": ["build-base"],
-            "ignoredDependencies": []
+            "ignoredDependencies": ["nx"]
           }
         ]
       }

packages/create-nx-workspace/bin/create-nx-workspace.ts

@@ -336,6 +336,7 @@ async function normalizeArgsMiddleware(
           : messages.metaCodeOfSelectedPromptMessage('setupNxCloudV2');
       Object.assign(argv, {
         nxCloud,
+        useGitHub: nxCloud !== 'skip',
         nxCloudPromptCode,
         packageManager,
         defaultBase,

packages/create-nx-workspace/src/create-workspace.ts

@@ -1,3 +1,4 @@
+import { join } from 'path';
 import { createEmptyWorkspace } from './create-empty-workspace';
 import { createPreset } from './create-preset';
 import { createSandbox } from './create-sandbox';
@@ -10,6 +11,7 @@ import {
   VcsPushStatus,
 } from './utils/git/git';
 import {
+  connectToNxCloudForTemplate,
   createNxCloudOnboardingUrl,
   getNxCloudInfo,
   readNxCloudToken,
@@ -49,15 +51,29 @@ export async function createWorkspace<T extends CreateWorkspaceOptions>(
   let directory: string;
 
   if (options.template) {
+    if (!options.template.startsWith('nrwl/'))
+      throw new Error(
+        `Invalid template. Only templates from the 'nrwl' GitHub org are supported.`
+      );
     const templateUrl = `https://github.com/${options.template}`;
-    directory = name;
+    const workingDir = process.cwd().replace(/\\/g, '/');
+    directory = join(workingDir, name);
 
-    await cloneTemplate(templateUrl, directory);
+    await cloneTemplate(templateUrl, name);
     await cleanupLockfiles(directory, packageManager);
 
     // Install dependencies
     const pmc = getPackageManagerCommand(packageManager);
     await execAndWait(pmc.install, directory);
+
+    // Connect to Nx Cloud for template flow
+    if (nxCloud !== 'skip') {
+      await connectToNxCloudForTemplate(
+        directory,
+        'create-nx-workspace',
+        useGitHub
+      );
+    }
   } else {
     // Preset flow - existing behavior
     const tmpDir = await createSandbox(packageManager);
@@ -112,8 +128,14 @@ export async function createWorkspace<T extends CreateWorkspaceOptions>(
     try {
       await initializeGitRepo(directory, { defaultBase, commit, connectUrl });
 
-      // Push to GitHub if commit was made, GitHub push is not skipped, and CI provider is GitHub
-      if (commit && !skipGitHubPush && nxCloud === 'github') {
+      // Push to GitHub if commit was made, GitHub push is not skipped, and:
+      // - CI provider is GitHub (preset flow), OR
+      // - Using template flow with Nx Cloud enabled (yes)
+      if (
+        commit &&
+        !skipGitHubPush &&
+        (nxCloud === 'github' || (isTemplate && nxCloud === 'yes'))
+      ) {
         pushedToVcs = await pushToGitHub(directory, {
           skipGitHubPush,
           name,

packages/create-nx-workspace/src/internal-utils/prompts.ts

@@ -33,10 +33,10 @@ export async function determineNxCloud(
 
 export async function determineNxCloudV2(
   parsedArgs: yargs.Arguments<{ nxCloud?: string; interactive?: boolean }>
-): Promise<'yes' | 'skip'> {
+): Promise<'github' | 'skip'> {
   // Provided via flag
   if (parsedArgs.nxCloud) {
-    return parsedArgs.nxCloud === 'skip' ? 'skip' : 'yes';
+    return parsedArgs.nxCloud === 'skip' ? 'skip' : 'github';
   }
 
   // Non-interactive mode
@@ -62,7 +62,7 @@ export async function determineNxCloudV2(
     promptConfig.hint = () => hint;
   }
 
-  const result = await enquirer.prompt<{ nxCloud: 'yes' | 'skip' }>([
+  const result = await enquirer.prompt<{ nxCloud: 'github' | 'skip' }>([
     promptConfig,
   ]);
   return result.nxCloud;
@@ -115,10 +115,12 @@ async function nxCloudPrompt(key: MessageKey): Promise<NxCloud> {
 
 export async function determineTemplate(
   parsedArgs: yargs.Arguments<{
+    template?: string;
     preset?: string;
     interactive?: boolean;
   }>
 ): Promise<string | 'skip'> {
+  if (parsedArgs.template) return parsedArgs.template;
   if (parsedArgs.preset) return 'skip';
   if (!parsedArgs.interactive || isCI()) return 'skip';
   const { template } = await enquirer.prompt<{ template: string }>([

packages/create-nx-workspace/src/utils/nx/nx-cloud.ts

@@ -26,6 +26,42 @@ function getCloudMessageSource(
     : 'create-nx-workspace-success-ci-setup';
 }
 
+export async function connectToNxCloudForTemplate(
+  directory: string,
+  installationSource: string,
+  useGitHub?: boolean
+): Promise<string | null> {
+  // nx-ignore-next-line
+  const { connectToNxCloud } = require(require.resolve(
+    'nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud',
+    {
+      paths: [directory],
+    }
+    // nx-ignore-next-line
+  )) as typeof import('nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud');
+
+  // nx-ignore-next-line
+  const { FsTree, flushChanges } = require(require.resolve(
+    'nx/src/generators/tree',
+    {
+      paths: [directory],
+      // nx-ignore-next-line
+    }
+  )) as typeof import('nx/src/generators/tree');
+
+  const tree = new FsTree(directory, false);
+  const result = await connectToNxCloud(tree, {
+    installationSource,
+    directory: '',
+    github: useGitHub,
+  });
+
+  // Flush the tree changes to disk
+  flushChanges(directory, tree.listChanges());
+
+  return result;
+}
+
 export function readNxCloudToken(directory: string) {
   const nxCloudSpinner = ora(`Checking Nx Cloud setup`).start();
   // nx-ignore-next-line