nx 19.6.0-canary.20240727-efa59fa → 19.6.0-canary.20240731-341f295

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.6.0-canary.20240727-efa59fa",
+  "version": "19.6.0-canary.20240731-341f295",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.6.0-canary.20240727-efa59fa"
+    "@nrwl/tao": "19.6.0-canary.20240731-341f295"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-darwin-arm64": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-freebsd-x64": "19.6.0-canary.20240727-efa59fa"
+    "@nx/nx-darwin-x64": "19.6.0-canary.20240731-341f295",
+    "@nx/nx-darwin-arm64": "19.6.0-canary.20240731-341f295",
+    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240731-341f295",
+    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240731-341f295",
+    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240731-341f295",
+    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240731-341f295",
+    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240731-341f295",
+    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240731-341f295",
+    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240731-341f295",
+    "@nx/nx-freebsd-x64": "19.6.0-canary.20240731-341f295"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/release/changelog-renderer/index.js

@@ -25,10 +25,11 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
             }
         }
     }
+    let relevantChanges = changes;
     // workspace root level changelog
     if (project === null) {
         // No changes for the workspace
-        if (changes.length === 0) {
+        if (relevantChanges.length === 0) {
             if (dependencyBumps?.length) {
                 applyAdditionalDependencyBumps({
                     markdownLines,
@@ -42,7 +43,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
             }
             return markdownLines.join('\n').trim();
         }
-        const typeGroups = groupBy(changes, 'type');
+        const typeGroups = groupBy(relevantChanges, 'type');
         markdownLines.push('', createVersionTitle(releaseVersion, changelogRenderOptions), '');
         for (const type of Object.keys(changeTypes)) {
             const group = typeGroups[type];
@@ -75,7 +76,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
     }
     else {
         // project level changelog
-        const relevantChanges = changes.filter((c) => c.affectedProjects &&
+        relevantChanges = relevantChanges.filter((c) => c.affectedProjects &&
             (c.affectedProjects === '*' || c.affectedProjects.includes(project)));
         // Generating for a named project, but that project has no relevant changes in the current set of commits, exit early
         if (relevantChanges.length === 0) {
@@ -128,7 +129,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
     }
     if (changelogRenderOptions.authors) {
         const _authors = new Map();
-        for (const change of changes) {
+        for (const change of relevantChanges) {
             if (!change.author) {
                 continue;
             }

package/src/command-line/connect/connect-to-nx-cloud.d.ts

@@ -1,8 +1,10 @@
+import { ConnectToNxCloudOptions } from '../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud';
 import { NxJsonConfiguration } from '../../config/nx-json';
 import { NxArgs } from '../../utils/command-line-utils';
 import { MessageKey } from '../../utils/ab-testing';
 export declare function onlyDefaultRunnerIsUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function connectToNxCloudIfExplicitlyAsked(opts: NxArgs): Promise<void>;
+export declare function connectWorkspaceToCloud(options: ConnectToNxCloudOptions): Promise<string>;
 export declare function connectToNxCloudCommand(command?: string): Promise<boolean>;
 export declare function connectExistingRepoToNxCloudPrompt(command?: string, key?: MessageKey): Promise<boolean>;
 export declare function connectToNxCloudWithPrompt(command: string): Promise<void>;

package/src/command-line/connect/connect-to-nx-cloud.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onlyDefaultRunnerIsUsed = onlyDefaultRunnerIsUsed;
 exports.connectToNxCloudIfExplicitlyAsked = connectToNxCloudIfExplicitlyAsked;
+exports.connectWorkspaceToCloud = connectWorkspaceToCloud;
 exports.connectToNxCloudCommand = connectToNxCloudCommand;
 exports.connectExistingRepoToNxCloudPrompt = connectExistingRepoToNxCloudPrompt;
 exports.connectToNxCloudWithPrompt = connectToNxCloudWithPrompt;
@@ -16,6 +17,8 @@ const ab_testing_1 = require("../../utils/ab-testing");
 const versions_1 = require("../../utils/versions");
 const workspace_root_1 = require("../../utils/workspace-root");
 const chalk = require("chalk");
+const ora = require("ora");
+const open = require("open");
 function onlyDefaultRunnerIsUsed(nxJson) {
     const defaultRunner = nxJson.tasksRunnerOptions?.default?.runner;
     if (!defaultRunner) {
@@ -43,6 +46,13 @@ async function connectToNxCloudIfExplicitlyAsked(opts) {
         process.exit(0);
     }
 }
+async function connectWorkspaceToCloud(options) {
+    const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, false, 'connect-to-nx-cloud');
+    const accessToken = await (0, connect_to_nx_cloud_1.connectToNxCloud)(tree, options);
+    tree.lock();
+    (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, tree.listChanges());
+    return accessToken;
+}
 async function connectToNxCloudCommand(command) {
     const nxJson = (0, configuration_1.readNxJson)();
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
@@ -50,7 +60,7 @@ async function connectToNxCloudCommand(command) {
         if (!token) {
             throw new Error(`Unable to authenticate. Either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable.`);
         }
-        const connectCloudUrl = await (0, url_shorten_1.shortenedCloudUrl)('nx-connect', token);
+        const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)('nx-connect', token);
         output_1.output.log({
             title: '✔ This workspace already has Nx Cloud set up',
             bodyLines: [
@@ -62,15 +72,32 @@ async function connectToNxCloudCommand(command) {
         });
         return false;
     }
-    const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, false, 'connect-to-nx-cloud');
-    const callback = await (0, connect_to_nx_cloud_1.connectToNxCloud)(tree, {
+    const token = await connectWorkspaceToCloud({
         installationSource: command ?? 'nx-connect',
     });
-    tree.lock();
-    (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, tree.listChanges());
-    await callback();
+    const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)('nx-connect', token);
+    try {
+        const cloudConnectSpinner = ora(`Opening Nx Cloud ${connectCloudUrl} in your browser to connect your workspace.`).start();
+        await sleep(2000);
+        await open(connectCloudUrl);
+        cloudConnectSpinner.succeed();
+    }
+    catch (e) {
+        output_1.output.note({
+            title: `Your Nx Cloud workspace is ready.`,
+            bodyLines: [
+                `To claim it, connect it to your Nx Cloud account:`,
+                `- Go to the following URL to connect your workspace to Nx Cloud:`,
+                '',
+                `${connectCloudUrl}`,
+            ],
+        });
+    }
     return true;
 }
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 async function connectExistingRepoToNxCloudPrompt(command = 'init', key = 'setupNxCloud') {
     const res = await nxCloudPrompt(key).then((value) => value === 'yes');
     await (0, ab_testing_1.recordStat)({

package/src/command-line/connect/view-logs.js

@@ -5,9 +5,10 @@ const package_manager_1 = require("../../utils/package-manager");
 const child_process_1 = require("child_process");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 const output_1 = require("../../utils/output");
-const child_process_2 = require("../../utils/child-process");
 const nx_json_1 = require("../../config/nx-json");
 const connect_to_nx_cloud_1 = require("./connect-to-nx-cloud");
+const connect_to_nx_cloud_2 = require("../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
+const url_shorten_1 = require("../../nx-cloud/utilities/url-shorten");
 async function viewLogs() {
     const cloudUsed = (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)());
     if (cloudUsed) {
@@ -27,9 +28,10 @@ async function viewLogs() {
         output_1.output.log({
             title: 'Connecting to Nx Cloud',
         });
-        (0, child_process_2.runNxSync)(`g nx:connect-to-nx-cloud --installation-source=view-logs --quiet --no-interactive`, {
-            stdio: 'ignore',
+        const token = await (0, connect_to_nx_cloud_1.connectWorkspaceToCloud)({
+            installationSource: 'view-logs',
         });
+        await (0, connect_to_nx_cloud_2.printSuccessMessage)(token, 'view-logs', await (0, url_shorten_1.repoUsesGithub)());
     }
     catch (e) {
         output_1.output.log({

package/src/command-line/init/implementation/add-nx-to-monorepo.js

@@ -74,7 +74,7 @@ async function addNxToMonorepo(options) {
     (0, utils_1.runInstall)(repoRoot);
     if (useNxCloud) {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
-        (0, utils_1.initCloud)(repoRoot, 'nx-init-monorepo');
+        await (0, utils_1.initCloud)('nx-init-monorepo');
     }
 }
 // scanning package.json files

package/src/command-line/init/implementation/add-nx-to-nest.js

@@ -93,7 +93,7 @@ async function addNxToNest(options, packageJson) {
     (0, utils_1.runInstall)(repoRoot);
     if (useNxCloud) {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
-        (0, utils_1.initCloud)(repoRoot, 'nx-init-nest');
+        await (0, utils_1.initCloud)('nx-init-nest');
     }
 }
 function addNestPluginToPackageJson(repoRoot) {

package/src/command-line/init/implementation/add-nx-to-npm-repo.js

@@ -67,6 +67,6 @@ async function addNxToNpmRepo(options) {
     (0, utils_1.runInstall)(repoRoot, pmc);
     if (useNxCloud) {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
-        (0, utils_1.initCloud)(repoRoot, 'nx-init-npm-repo');
+        await (0, utils_1.initCloud)('nx-init-npm-repo');
     }
 }

package/src/command-line/init/implementation/angular/index.js

@@ -44,7 +44,7 @@ async function addNxToAngularCliRepo(options) {
     await setupWorkspace(cacheableOperations, options.integrated);
     if (useNxCloud) {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
-        (0, utils_1.initCloud)(repoRoot, 'nx-init-angular');
+        await (0, utils_1.initCloud)('nx-init-angular');
     }
 }
 async function collectCacheableOperations(options) {

package/src/command-line/init/implementation/angular/legacy-angular-versions.js

@@ -85,7 +85,7 @@ async function getLegacyMigrationFunctionIfApplicable(repoRoot, options) {
         (0, child_process_1.execSync)(`${pmc.exec} ${legacyMigrationCommand}`, { stdio: [0, 1, 2] });
         if (useNxCloud) {
             output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
-            (0, utils_1.initCloud)(repoRoot, 'nx-init-angular');
+            await (0, utils_1.initCloud)('nx-init-angular');
         }
     };
 }

package/src/command-line/init/implementation/utils.d.ts

@@ -6,7 +6,7 @@ export declare function createNxJsonFile(repoRoot: string, topologicalTargets: s
 export declare function addDepsToPackageJson(repoRoot: string, additionalPackages?: string[]): void;
 export declare function updateGitIgnore(root: string): void;
 export declare function runInstall(repoRoot: string, pmc?: PackageManagerCommands): void;
-export declare function initCloud(repoRoot: string, installationSource: 'nx-init-angular' | 'nx-init-cra' | 'nx-init-monorepo' | 'nx-init-nest' | 'nx-init-npm-repo'): void;
+export declare function initCloud(installationSource: 'nx-init' | 'nx-init-angular' | 'nx-init-cra' | 'nx-init-monorepo' | 'nx-init-nest' | 'nx-init-npm-repo'): Promise<void>;
 export declare function addVsCodeRecommendedExtensions(repoRoot: string, extensions: string[]): void;
 export declare function markRootPackageJsonAsNxProjectLegacy(repoRoot: string, cacheableScripts: string[], pmc: PackageManagerCommands): void;
 export declare function markPackageJsonAsNxProject(packageJsonPath: string): void;

package/src/command-line/init/implementation/utils.js

@@ -12,13 +12,15 @@ exports.printFinalMessage = printFinalMessage;
 exports.isMonorepo = isMonorepo;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
-const child_process_2 = require("../../../utils/child-process");
 const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
 const path_2 = require("../../../utils/path");
 const versions_1 = require("../../../utils/versions");
 const fs_1 = require("fs");
+const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
+const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
+const connect_to_nx_cloud_2 = require("../../connect/connect-to-nx-cloud");
 function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scriptOutputs) {
     const nxJsonPath = (0, path_2.joinPathFragments)(repoRoot, 'nx.json');
     let nxJson = {};
@@ -128,11 +130,11 @@ function updateGitIgnore(root) {
 function runInstall(repoRoot, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
     (0, child_process_1.execSync)(pmc.install, { stdio: [0, 1, 2], cwd: repoRoot });
 }
-function initCloud(repoRoot, installationSource) {
-    (0, child_process_2.runNxSync)(`g nx:connect-to-nx-cloud --installationSource=${installationSource} --quiet --no-interactive`, {
-        stdio: [0, 1, 2],
-        cwd: repoRoot,
+async function initCloud(installationSource) {
+    const token = await (0, connect_to_nx_cloud_2.connectWorkspaceToCloud)({
+        installationSource,
     });
+    await (0, connect_to_nx_cloud_1.printSuccessMessage)(token, installationSource, await (0, url_shorten_1.repoUsesGithub)());
 }
 function addVsCodeRecommendedExtensions(repoRoot, extensions) {
     const vsCodeExtensionsPath = (0, path_1.join)(repoRoot, '.vscode/extensions.json');

package/src/command-line/init/init-v2.js

@@ -90,10 +90,7 @@ async function initHandler(options) {
     }
     if (useNxCloud) {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
-        (0, child_process_2.execSync)(`${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=nx-init --quiet --hideFormatLogs --no-interactive`, {
-            stdio: [0, 1, 2],
-            cwd: repoRoot,
-        });
+        await (0, utils_1.initCloud)('nx-init');
     }
     (0, utils_1.printFinalMessage)({
         learnMoreLink,

package/src/command-line/release/changelog.js

@@ -296,6 +296,7 @@ async function releaseChangelog(args) {
                     let fromRef = args.from ||
                         (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {
                             projectName: project.name,
+                            releaseGroupName: releaseGroup.name,
                         }))?.tag;
                     if (!fromRef && useAutomaticFromRef) {
                         const firstCommit = await (0, git_1.getFirstGitCommit)();

package/src/command-line/release/config/config.js

@@ -73,6 +73,10 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         tag: true,
     };
     const defaultFixedReleaseTagPattern = 'v{version}';
+    /**
+     * TODO: in v20, make it so that this pattern is used by default when any custom groups are used
+     */
+    const defaultFixedGroupReleaseTagPattern = '{releaseGroupName}-v{version}';
     const defaultIndependentReleaseTagPattern = '{projectName}@{version}';
     const workspaceProjectsRelationship = userConfig.projectsRelationship || 'fixed';
     const defaultGeneratorOptions = {};

package/src/command-line/release/plan.js

@@ -14,6 +14,7 @@ const params_1 = require("../../utils/params");
 const config_1 = require("./config/config");
 const filter_release_groups_1 = require("./config/filter-release-groups");
 const version_plans_1 = require("./config/version-plans");
+const generate_version_plan_content_1 = require("./utils/generate-version-plan-content");
 const git_1 = require("./utils/git");
 const print_changes_1 = require("./utils/print-changes");
 const releasePlanCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => releasePlan(args));
@@ -94,7 +95,7 @@ async function releasePlan(args) {
         return 0;
     }
     const versionPlanMessage = args.message || (await promptForMessage());
-    const versionPlanFileContent = getVersionPlanFileContent(versionPlanBumps, versionPlanMessage);
+    const versionPlanFileContent = (0, generate_version_plan_content_1.generateVersionPlanContent)(versionPlanBumps, versionPlanMessage);
     const versionPlanFileName = `version-plan-${new Date().getTime()}.md`;
     if (args.dryRun) {
         output_1.output.logSingleLine(`Would create version plan file "${versionPlanFileName}", but --dry-run was set.`);
@@ -171,14 +172,3 @@ async function _promptForMessage() {
         process.exit(0);
     }
 }
-function getVersionPlanFileContent(bumps, message) {
-    return `---
-${Object.entries(bumps)
-        .filter(([_, version]) => version !== 'none')
-        .map(([projectOrGroup, version]) => `${projectOrGroup}: ${version}`)
-        .join('\n')}
----
-
-${message}
-`;
-}

package/src/command-line/release/utils/generate-version-plan-content.d.ts

@@ -0,0 +1 @@
+export declare function generateVersionPlanContent(bumps: Record<string, string>, message: string): string;

package/src/command-line/release/utils/generate-version-plan-content.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateVersionPlanContent = generateVersionPlanContent;
+function generateVersionPlanContent(bumps, message) {
+    return `---
+${Object.entries(bumps)
+        .filter(([_, version]) => version !== 'none')
+        .map(([projectOrGroup, version]) => {
+        let key = projectOrGroup;
+        // frontmatter parsing will blow up if we don't wrap @org/package style project names in quotes
+        if (key.startsWith('@')) {
+            key = `'${key}'`;
+        }
+        return `${key}: ${version}`;
+    })
+        .join('\n')}
+---
+
+${message}
+`;
+}

package/src/command-line/release/utils/shared.js

@@ -128,11 +128,13 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
         }
         // One entry for the whole group for fixed groups
         const projectVersionData = versionData[releaseGroupProjectNames[0]]; // all at the same version, so we can just pick the first one
-        const releaseVersion = new ReleaseVersion({
-            version: projectVersionData.newVersion,
-            releaseTagPattern: releaseGroup.releaseTagPattern,
-        });
-        commitMessageValues.push(`- release-group: ${releaseGroup.name} ${releaseVersion.rawVersion}`);
+        if (projectVersionData.newVersion !== null) {
+            const releaseVersion = new ReleaseVersion({
+                version: projectVersionData.newVersion,
+                releaseTagPattern: releaseGroup.releaseTagPattern,
+            });
+            commitMessageValues.push(`- release-group: ${releaseGroup.name} ${releaseVersion.rawVersion}`);
+        }
     }
     return commitMessageValues;
 }
@@ -169,6 +171,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
         if (projectVersionData.newVersion !== null) {
             tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
                 version: projectVersionData.newVersion,
+                releaseGroupName: releaseGroup.name,
             }));
         }
     }

package/src/command-line/release/version.js

@@ -140,8 +140,9 @@ async function releaseVersion(args) {
             ...tree.listChanges().map((f) => f.path),
             ...additionalChangedFiles,
         ];
+        const deletedFiles = Array.from(additionalDeletedFiles);
         // No further actions are necessary in this scenario (e.g. if conventional commits detected no changes)
-        if (!changedFiles.length) {
+        if (!changedFiles.length && !deletedFiles.length) {
             return {
                 // An overall workspace version cannot be relevant when filtering to independent projects
                 workspaceVersion: undefined,
@@ -151,7 +152,7 @@ async function releaseVersion(args) {
         if (args.gitCommit ?? nxReleaseConfig.version.git.commit) {
             await (0, shared_1.commitChanges)({
                 changedFiles,
-                deletedFiles: Array.from(additionalDeletedFiles),
+                deletedFiles,
                 isDryRun: !!args.dryRun,
                 isVerbose: !!args.verbose,
                 gitCommitMessages: (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage),
@@ -162,6 +163,7 @@ async function releaseVersion(args) {
             output_1.output.logSingleLine(`Staging changed files with git`);
             await (0, git_1.gitAdd)({
                 changedFiles,
+                deletedFiles,
                 dryRun: args.dryRun,
                 verbose: args.verbose,
             });

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.d.ts

@@ -1,10 +1,11 @@
 import { Tree } from '../../../generators/tree';
-interface ConnectToNxCloudOptions {
+export declare function printSuccessMessage(token: string | undefined, installationSource: string, usesGithub: boolean): Promise<string>;
+export interface ConnectToNxCloudOptions {
     analytics?: boolean;
     installationSource?: string;
     hideFormatLogs?: boolean;
     github?: boolean;
     directory?: string;
 }
-export declare function connectToNxCloud(tree: Tree, schema: ConnectToNxCloudOptions): Promise<() => void>;
+export declare function connectToNxCloud(tree: Tree, schema: ConnectToNxCloudOptions): Promise<string>;
 export default connectToNxCloud;

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.printSuccessMessage = printSuccessMessage;
 exports.connectToNxCloud = connectToNxCloud;
 const child_process_1 = require("child_process");
 const output_1 = require("../../../utils/output");
@@ -8,8 +9,6 @@ const nx_json_1 = require("../../../generators/utils/nx-json");
 const format_changed_files_with_prettier_if_available_1 = require("../../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const url_shorten_1 = require("../../utilities/url-shorten");
 const get_cloud_options_1 = require("../../utilities/get-cloud-options");
-const ora = require("ora");
-const open = require("open");
 function printCloudConnectionDisabledMessage() {
     output_1.output.error({
         title: `Connections to Nx Cloud are disabled for this workspace`,
@@ -55,53 +54,19 @@ async function createNxCloudWorkspace(workspaceName, installationSource, nxInitD
     return response.data;
 }
 async function printSuccessMessage(token, installationSource, usesGithub) {
-    const connectCloudUrl = await (0, url_shorten_1.shortenedCloudUrl)(installationSource, token, usesGithub);
-    if (installationSource === 'nx-connect' && usesGithub) {
-        try {
-            const cloudConnectSpinner = ora(`Opening Nx Cloud ${connectCloudUrl} in your browser to connect your workspace.`).start();
-            await sleep(2000);
-            open(connectCloudUrl);
-            cloudConnectSpinner.succeed();
-        }
-        catch (e) {
-            output_1.output.note({
-                title: `Your Nx Cloud workspace is ready.`,
-                bodyLines: [
-                    `To claim it, connect it to your Nx Cloud account:`,
-                    `- Go to the following URL to connect your workspace to Nx Cloud:`,
-                    '',
-                    `${connectCloudUrl}`,
-                ],
-            });
-        }
-    }
-    else {
-        if (installationSource === 'create-nx-workspace') {
-            output_1.output.note({
-                title: `Your Nx Cloud workspace is ready.`,
-                bodyLines: [
-                    `To claim it, connect it to your Nx Cloud account:`,
-                    `- Push your repository to your git hosting provider.`,
-                    `- Go to the following URL to connect your workspace to Nx Cloud:`,
-                    '',
-                    `${connectCloudUrl}`,
-                ],
-            });
-        }
-        else {
-            output_1.output.note({
-                title: `Your Nx Cloud workspace is ready.`,
-                bodyLines: [
-                    `To claim it, connect it to your Nx Cloud account:`,
-                    `- Commit and push your changes.`,
-                    `- Create a pull request for the changes.`,
-                    `- Go to the following URL to connect your workspace to Nx Cloud:`,
-                    '',
-                    `${connectCloudUrl}`,
-                ],
-            });
-        }
-    }
+    const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)(installationSource, token, usesGithub);
+    output_1.output.note({
+        title: `Your Nx Cloud workspace is ready.`,
+        bodyLines: [
+            `To claim it, connect it to your Nx Cloud account:`,
+            `- Commit and push your changes.`,
+            `- Create a pull request for the changes.`,
+            `- Go to the following URL to connect your workspace to Nx Cloud:`,
+            '',
+            `${connectCloudUrl}`,
+        ],
+    });
+    return connectCloudUrl;
 }
 function addNxCloudOptionsToNxJson(tree, nxJson, token) {
     nxJson ??= {
@@ -118,12 +83,11 @@ async function connectToNxCloud(tree, schema) {
     schema.installationSource ??= 'user';
     const nxJson = (0, nx_json_1.readNxJson)(tree);
     if (nxJson?.neverConnectToCloud) {
-        return () => {
-            printCloudConnectionDisabledMessage();
-        };
+        printCloudConnectionDisabledMessage();
+        return null;
     }
     else {
-        const usesGithub = await (0, url_shorten_1.repoUsesGithub)(schema.github);
+        const usesGithub = schema.github ?? (await (0, url_shorten_1.repoUsesGithub)(schema.github));
         let responseFromCreateNxCloudWorkspace;
         // do NOT create Nx Cloud token (createNxCloudWorkspace)
         // if user is using github and is running nx-connect
@@ -133,11 +97,8 @@ async function connectToNxCloud(tree, schema) {
             await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
                 silent: schema.hideFormatLogs,
             });
+            return responseFromCreateNxCloudWorkspace.token;
         }
-        return async () => await printSuccessMessage(responseFromCreateNxCloudWorkspace?.token, schema.installationSource, usesGithub);
     }
 }
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
 exports.default = connectToNxCloud;

package/src/nx-cloud/utilities/url-shorten.d.ts

@@ -1,4 +1,4 @@
-export declare function shortenedCloudUrl(installationSource: string, accessToken?: string, usesGithub?: boolean): Promise<string>;
+export declare function createNxCloudOnboardingURL(onboardingSource: string, accessToken?: string, usesGithub?: boolean, meta?: string): Promise<string>;
 export declare function repoUsesGithub(github?: boolean, githubSlug?: string, apiUrl?: string): Promise<boolean>;
 export declare function getURLifShortenFailed(usesGithub: boolean, githubSlug: string | null, apiUrl: string, source: string, accessToken?: string): string;
 export declare function getNxCloudVersion(apiUrl: string): Promise<string | null>;

package/src/nx-cloud/utilities/url-shorten.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shortenedCloudUrl = shortenedCloudUrl;
+exports.createNxCloudOnboardingURL = createNxCloudOnboardingURL;
 exports.repoUsesGithub = repoUsesGithub;
 exports.getURLifShortenFailed = getURLifShortenFailed;
 exports.getNxCloudVersion = getNxCloudVersion;
@@ -10,7 +10,7 @@ exports.compareCleanCloudVersions = compareCleanCloudVersions;
 const devkit_exports_1 = require("../../devkit-exports");
 const git_utils_1 = require("../../utils/git-utils");
 const get_cloud_options_1 = require("./get-cloud-options");
-async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
+async function createNxCloudOnboardingURL(onboardingSource, accessToken, usesGithub, meta) {
     const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     if (usesGithub === undefined || usesGithub === null) {
@@ -28,13 +28,14 @@ async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
     ${e}`);
         return apiUrl;
     }
-    const source = getSource(installationSource);
+    const source = getSource(onboardingSource);
     try {
         const response = await require('axios').post(`${apiUrl}/nx-cloud/onboarding`, {
             type: usesGithub ? 'GITHUB' : 'MANUAL',
             source,
             accessToken: usesGithub ? null : accessToken,
             selectedRepositoryName: githubSlug === 'github' ? null : githubSlug,
+            meta,
         });
         if (!response?.data || response.data.message) {
             throw new Error(response?.data?.message ?? 'Failed to shorten Nx Cloud URL');
@@ -67,11 +68,8 @@ function getSource(installationSource) {
     else if (installationSource.includes('nx-connect')) {
         return 'nx-connect';
     }
-    else if (installationSource.includes('create-nx-workspace')) {
-        return 'create-nx-workspace';
-    }
     else {
-        return 'other';
+        return installationSource;
     }
 }
 function getURLifShortenFailed(usesGithub, githubSlug, apiUrl, source, accessToken) {

package/src/project-graph/plugins/internal-api.js

@@ -13,6 +13,7 @@ const loader_1 = require("./loader");
 const utils_1 = require("./utils");
 const error_types_1 = require("../error-types");
 const native_1 = require("../../native");
+const os_1 = require("os");
 class LoadedNxPlugin {
     constructor(plugin, pluginDefinition) {
         this.name = plugin.name;
@@ -74,7 +75,9 @@ exports.nxPluginCache = new Map();
 async function loadNxPlugins(plugins, root = workspace_root_1.workspaceRoot) {
     performance.mark('loadNxPlugins:start');
     const loadingMethod = process.env.NX_ISOLATE_PLUGINS === 'true' ||
-        (!native_1.IS_WASM && process.env.NX_ISOLATE_PLUGINS !== 'false')
+        (!native_1.IS_WASM &&
+            (0, os_1.platform)() !== 'win32' &&
+            process.env.NX_ISOLATE_PLUGINS !== 'false')
         ? isolation_1.loadNxPluginInIsolation
         : loader_1.loadNxPlugin;
     plugins = await normalizePlugins(plugins, root);

package/src/tasks-runner/task-graph-utils.js

@@ -66,7 +66,7 @@ function validateNoAtomizedTasks(taskGraph, projectGraph) {
         .filter((item, index, arr) => arr.indexOf(item) === index);
     const moreInfoLines = [
         `Please enable Nx Cloud or use the slower ${nonAtomizedTasks.join(',')} task${nonAtomizedTasks.length > 1 ? 's' : ''}.`,
-        'Learn more at https://nx.dev/ci/features/split-e2e-tasks#use-atomizer-only-with-nx-cloud-distribution',
+        'Learn more at https://nx.dev/ci/features/split-e2e-tasks#nx-cloud-is-required-to-run-atomized-tasks',
     ];
     if (atomizedRootTasks.length === 1) {
         output_1.output.error({