nx 19.6.0-canary.20240730-acd9bb7 → 19.6.0-canary.20240801-2111841

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({

package/src/utils/git-utils.js

@@ -8,7 +8,9 @@ const child_process_1 = require("child_process");
 const devkit_exports_1 = require("../devkit-exports");
 function getGithubSlugOrNull() {
     try {
-        const gitRemote = (0, child_process_1.execSync)('git remote -v').toString();
+        const gitRemote = (0, child_process_1.execSync)('git remote -v', {
+            stdio: 'pipe',
+        }).toString();
         // If there are no remotes, we default to github
         if (!gitRemote || gitRemote.length === 0) {
             return 'github';