nx 21.4.0-beta.2 → 21.4.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.4.0-beta.2",
+  "version": "21.4.0-beta.3",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.4.0-beta.2",
-    "@nx/nx-darwin-x64": "21.4.0-beta.2",
-    "@nx/nx-freebsd-x64": "21.4.0-beta.2",
-    "@nx/nx-linux-arm-gnueabihf": "21.4.0-beta.2",
-    "@nx/nx-linux-arm64-gnu": "21.4.0-beta.2",
-    "@nx/nx-linux-arm64-musl": "21.4.0-beta.2",
-    "@nx/nx-linux-x64-gnu": "21.4.0-beta.2",
-    "@nx/nx-linux-x64-musl": "21.4.0-beta.2",
-    "@nx/nx-win32-arm64-msvc": "21.4.0-beta.2",
-    "@nx/nx-win32-x64-msvc": "21.4.0-beta.2"
+    "@nx/nx-darwin-arm64": "21.4.0-beta.3",
+    "@nx/nx-darwin-x64": "21.4.0-beta.3",
+    "@nx/nx-freebsd-x64": "21.4.0-beta.3",
+    "@nx/nx-linux-arm-gnueabihf": "21.4.0-beta.3",
+    "@nx/nx-linux-arm64-gnu": "21.4.0-beta.3",
+    "@nx/nx-linux-arm64-musl": "21.4.0-beta.3",
+    "@nx/nx-linux-x64-gnu": "21.4.0-beta.3",
+    "@nx/nx-linux-x64-musl": "21.4.0-beta.3",
+    "@nx/nx-win32-arm64-msvc": "21.4.0-beta.3",
+    "@nx/nx-win32-x64-msvc": "21.4.0-beta.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,sBAAsB,EACvB,MAAM,gCAAgC,CAAC;AAUxC,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,EAAE,EAC5B,mBAAmB,EAAE,MAAM,EAAE,EAC7B,aAAa,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,QA0C1C;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC7B,mBAAmB,CA+GrB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,kBAAkB,CAAC,EAAE,MAAM,EAAE,QAY9B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,QAqC3C;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,sBAAmD,QAOzD;AAED,wBAAsB,SAAS,CAC7B,kBAAkB,EACd,SAAS,GACT,iBAAiB,GACjB,aAAa,GACb,kBAAkB,GAClB,cAAc,GACd,kBAAkB,GAClB,mBAAmB,iBAMxB;AAED,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,GACnB,IAAI,CAiBN;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,GAAG,EAAE,sBAAsB,QAqB5B;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,MAAM,QAQjE;AAED,wBAAgB,iBAAiB,CAAC,EAChC,aAAa,EACb,WAAW,GACZ,EAAE;IACD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,IAAI,CAUP;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,WASlD;AAED,wBAAgB,KAAK,CAAC,WAAW,EAAE,WAAW,WAa7C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,sBAAsB,EACvB,MAAM,gCAAgC,CAAC;AASxC,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,EAAE,EAC5B,mBAAmB,EAAE,MAAM,EAAE,EAC7B,aAAa,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,QA0C1C;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC7B,mBAAmB,CA+GrB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,kBAAkB,CAAC,EAAE,MAAM,EAAE,QAY9B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,QAqC3C;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,sBAAmD,QAOzD;AAED,wBAAsB,SAAS,CAC7B,kBAAkB,EACd,SAAS,GACT,iBAAiB,GACjB,aAAa,GACb,kBAAkB,GAClB,cAAc,GACd,kBAAkB,GAClB,mBAAmB,iBAMxB;AAED,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,GACnB,IAAI,CAiBN;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,GAAG,EAAE,sBAAsB,QAqB5B;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,MAAM,QAQjE;AAED,wBAAgB,iBAAiB,CAAC,EAChC,aAAa,EACb,WAAW,GACZ,EAAE;IACD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,IAAI,CAUP;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,WASlD;AAED,wBAAgB,KAAK,CAAC,WAAW,EAAE,WAAW,WAa7C"}

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

@@ -21,7 +21,6 @@ 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("../../nx-cloud/connect/connect-to-nx-cloud");
 const deduce_default_base_1 = require("./deduce-default-base");
 function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scriptOutputs) {
@@ -216,7 +215,7 @@ 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)());
+    await (0, connect_to_nx_cloud_1.printSuccessMessage)(token, installationSource);
 }
 function addVsCodeRecommendedExtensions(repoRoot, extensions) {
     const vsCodeExtensionsPath = (0, path_1.join)(repoRoot, '.vscode/extensions.json');

package/src/command-line/mcp/command-object.d.ts

@@ -0,0 +1,3 @@
+import { CommandModule } from 'yargs';
+export declare const yargsMcpCommand: CommandModule;
+//# sourceMappingURL=command-object.d.ts.map

package/src/command-line/mcp/command-object.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/mcp/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,eAAO,MAAM,eAAe,EAAE,aAqB7B,CAAC"}

package/src/command-line/mcp/command-object.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.yargsMcpCommand = void 0;
+exports.yargsMcpCommand = {
+    command: 'mcp',
+    describe: 'Starts the Nx MCP server.',
+    builder: (y) => y
+        .version(false)
+        .strict(false)
+        .parserConfiguration({
+        'unknown-options-as-args': true,
+        'populate--': true,
+    })
+        .usage('')
+        .help(false)
+        .showHelp(async () => {
+        await (await Promise.resolve().then(() => require('./mcp'))).showHelp();
+        process.exit(0);
+    }),
+    handler: async (args) => {
+        await (await Promise.resolve().then(() => require('./mcp'))).mcpHandler(args);
+        process.exit(0);
+    },
+};

package/src/command-line/mcp/mcp.d.ts

@@ -0,0 +1,3 @@
+export declare function mcpHandler(args: any): Promise<void>;
+export declare function showHelp(): Promise<void>;
+//# sourceMappingURL=mcp.d.ts.map

package/src/command-line/mcp/mcp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/mcp/mcp.ts"],"names":[],"mappings":"AAIA,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,iBAOzC;AAED,wBAAsB,QAAQ,kBAa7B"}

package/src/command-line/mcp/mcp.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mcpHandler = mcpHandler;
+exports.showHelp = showHelp;
+const child_process_1 = require("child_process");
+const package_manager_1 = require("../../utils/package-manager");
+const workspace_root_1 = require("../../utils/workspace-root");
+async function mcpHandler(args) {
+    const packageManagerCommands = (0, package_manager_1.getPackageManagerCommand)();
+    (0, child_process_1.spawnSync)(packageManagerCommands.dlx, ['-y', 'nx-mcp@latest', ...args['_']], {
+        stdio: 'inherit',
+        cwd: workspace_root_1.workspaceRoot,
+    });
+}
+async function showHelp() {
+    const packageManagerCommands = (0, package_manager_1.getPackageManagerCommand)();
+    const helpOutput = (0, child_process_1.spawnSync)(packageManagerCommands.dlx, ['-y', 'nx-mcp@latest', '--help'], {
+        cwd: workspace_root_1.workspaceRoot,
+        encoding: 'utf-8',
+    });
+    console.log(helpOutput.stdout?.toString().replaceAll('nx-mcp', 'nx mcp'));
+}

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

@@ -1 +1 @@
-{"version":3,"file":"connect-to-nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/connect/connect-to-nx-cloud.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,uBAAuB,EACxB,MAAM,sEAAsE,CAAC;AAI9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EACL,UAAU,EAIX,MAAM,2BAA2B,CAAC;AAQnC,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,mBAAmB,WAclE;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,uBAAuB,EAChC,SAAS,SAAgB,mBAO1B;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,EAC3D,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CA2ElB;AAMD,wBAAsB,kCAAkC,CACtD,OAAO,SAAS,EAChB,GAAG,GAAE,UAA2B,GAC/B,OAAO,CAAC,OAAO,CAAC,CAWlB;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,MAAM,iBAY/D"}
+{"version":3,"file":"connect-to-nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/connect/connect-to-nx-cloud.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,uBAAuB,EACxB,MAAM,sEAAsE,CAAC;AAI9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EACL,UAAU,EAIX,MAAM,2BAA2B,CAAC;AAQnC,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,mBAAmB,WAclE;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,uBAAuB,EAChC,SAAS,SAAgB,mBAO1B;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,EAC3D,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CA6ElB;AAMD,wBAAsB,kCAAkC,CACtD,OAAO,SAAS,EAChB,GAAG,GAAE,UAA2B,GAC/B,OAAO,CAAC,OAAO,CAAC,CAWlB;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,MAAM,iBAY/D"}

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

@@ -16,8 +16,8 @@ const child_process_1 = require("../../../utils/child-process");
 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 git_utils_1 = require("../../../utils/git-utils");
+const chalk = require("chalk");
 const ora = require('ora');
 const open = require('open');
 function onlyDefaultRunnerIsUsed(nxJson) {
@@ -60,7 +60,7 @@ async function connectToNxCloudCommand(options, command) {
     const installationSource = process.env.NX_CONSOLE
         ? 'nx-console'
         : 'nx-connect';
-    const hasRemote = !!(0, git_utils_1.getGitRemote)();
+    const hasRemote = !!(0, git_utils_1.getVcsRemoteInfo)();
     if (!hasRemote && options.checkRemote) {
         output_1.output.error({
             title: 'Missing VCS provider',
@@ -78,7 +78,7 @@ async function connectToNxCloudCommand(options, command) {
         if (!token) {
             throw new Error(`Unable to authenticate. If you are connecting to Nx Cloud locally, set Nx Cloud ID in nx.json. If you are connecting in a CI context, either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable.`);
         }
-        const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)(installationSource, token, options?.generateToken !== true);
+        const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)(installationSource, token, undefined, options?.generateToken === true);
         output_1.output.log({
             title: '✔ This workspace already has Nx Cloud set up',
             bodyLines: [
@@ -93,7 +93,7 @@ async function connectToNxCloudCommand(options, command) {
         generateToken: options?.generateToken,
         installationSource: command ?? installationSource,
     });
-    const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)('nx-connect', token, options?.generateToken !== true);
+    const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)('nx-connect', token, undefined, options?.generateToken === true);
     try {
         const cloudConnectSpinner = ora(`Opening Nx Cloud ${connectCloudUrl} in your browser to connect your workspace.`).start();
         await sleep(2000);

package/src/command-line/nx-cloud/connect/view-logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/connect/view-logs.ts"],"names":[],"mappings":"AAYA,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAkDhD"}
+{"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/connect/view-logs.ts"],"names":[],"mappings":"AAWA,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAiDhD"}

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

@@ -7,8 +7,6 @@ const nx_cloud_utils_1 = require("../../../utils/nx-cloud-utils");
 const output_1 = require("../../../utils/output");
 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) {
@@ -28,10 +26,10 @@ async function viewLogs() {
         output_1.output.log({
             title: 'Connecting to Nx Cloud',
         });
-        const token = await (0, connect_to_nx_cloud_1.connectWorkspaceToCloud)({
+        await (0, connect_to_nx_cloud_1.connectWorkspaceToCloud)({
             installationSource: 'view-logs',
+            generateToken: true,
         });
-        await (0, connect_to_nx_cloud_2.printSuccessMessage)(token, 'view-logs', await (0, url_shorten_1.repoUsesGithub)());
     }
     catch (e) {
         output_1.output.log({
@@ -48,7 +46,7 @@ async function viewLogs() {
     if (!cloudUsed) {
         output_1.output.note({
             title: 'Your workspace is now connected to Nx Cloud',
-            bodyLines: [`Learn more about Nx Cloud at https://nx.app`],
+            bodyLines: [`Learn more about Nx Cloud at https://nx.dev/nx-cloud`],
         });
     }
     return 0;

package/src/command-line/nx-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-commands.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/nx-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAsD/B,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAEzE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,qBAkDf,CAAC"}
+{"version":3,"file":"nx-commands.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/nx-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAuD/B,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAEzE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,qBAmDf,CAAC"}

package/src/command-line/nx-commands.js

@@ -33,6 +33,7 @@ const command_object_27 = require("./nx-cloud/fix-ci/command-object");
 const command_objects_1 = require("./deprecated/command-objects");
 const command_object_28 = require("./sync/command-object");
 const output_1 = require("../utils/output");
+const command_object_29 = require("./mcp/command-object");
 // Ensure that the output takes up the available width of the terminal.
 yargs.wrap(yargs.terminalWidth());
 exports.parserConfiguration = {
@@ -88,6 +89,7 @@ exports.commandsObject = yargs
     .command(command_object_25.yargsRecordCommand)
     .command(command_object_26.yargsStartCiRunCommand)
     .command(command_object_27.yargsFixCiCommand)
+    .command(command_object_29.yargsMcpCommand)
     .command(resolveConformanceCommandObject())
     .command(resolveConformanceCheckCommandObject())
     .scriptName('nx')

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

@@ -1,6 +1,6 @@
 import { Tree } from '../../../generators/tree';
 import { NxJsonConfiguration } from '../../../config/nx-json';
-export declare function printSuccessMessage(token: string | undefined, installationSource: string, usesGithub: boolean): Promise<string>;
+export declare function printSuccessMessage(token: string | undefined, installationSource: string): Promise<string>;
 export interface ConnectToNxCloudOptions {
     analytics?: boolean;
     installationSource?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"connect-to-nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AA0F9D,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,kBAAkB,EAAE,MAAM,EAC1B,UAAU,EAAE,OAAO,mBAepB;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAgDD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,uBAAuB,EAC/B,MAAM,sCAAmB,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6ExB;AAED,iBAAe,yBAAyB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,iBAGjC;AAED,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"connect-to-nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAwF9D,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,kBAAkB,EAAE,MAAM,mBAgB3B;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAgDD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,uBAAuB,EAC/B,MAAM,sCAAmB,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6ExB;AAED,iBAAe,yBAAyB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,iBAGjC;AAED,eAAe,yBAAyB,CAAC"}

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

@@ -10,6 +10,7 @@ const format_changed_files_with_prettier_if_available_1 = require("../../../gene
 const url_shorten_1 = require("../../utilities/url-shorten");
 const get_cloud_options_1 = require("../../utilities/get-cloud-options");
 const path_1 = require("path");
+const git_utils_1 = require("../../../utils/git-utils");
 function printCloudConnectionDisabledMessage() {
     output_1.output.error({
         title: `Connections to Nx Cloud are disabled for this workspace`,
@@ -66,8 +67,8 @@ async function createNxCloudWorkspaceV2(workspaceName, installationSource, nxIni
     }
     return response.data;
 }
-async function printSuccessMessage(token, installationSource, usesGithub) {
-    const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)(installationSource, token, usesGithub);
+async function printSuccessMessage(token, installationSource) {
+    const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)(installationSource, token, undefined, false);
     output_1.output.note({
         title: `Your Self-Healing CI and Remote Caching setup is almost complete`,
         bodyLines: [
@@ -109,7 +110,8 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
         printCloudConnectionDisabledMessage();
         return null;
     }
-    const isGitHubDetected = schema.github ?? (await (0, url_shorten_1.repoUsesGithub)(schema.github));
+    const remoteInfo = await (0, git_utils_1.getVcsRemoteInfo)();
+    const isGitHubDetected = schema.github ?? remoteInfo?.domain === 'github.com';
     let responseFromCreateNxCloudWorkspaceV1;
     let responseFromCreateNxCloudWorkspaceV2;
     /**

package/src/nx-cloud/utilities/onboarding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onboarding.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/nx-cloud/utilities/onboarding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAMtE,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,uBAAuB,CAAC,CAMlC;AAED,wBAAsB,0BAA0B,CAAC,KAAK,EAAE,MAAM,mBAS7D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,OAS1C"}
+{"version":3,"file":"onboarding.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/nx-cloud/utilities/onboarding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAMtE,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,uBAAuB,CAAC,CAMlC;AAED,wBAAsB,0BAA0B,CAAC,KAAK,EAAE,MAAM,mBAW7D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,OAS1C"}

package/src/nx-cloud/utilities/onboarding.js

@@ -18,7 +18,7 @@ async function getNxCloudAppOnBoardingUrl(token) {
     if (!token) {
         return null;
     }
-    const onboardingUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)('nx-welcome-app', token);
+    const onboardingUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)('nx-welcome-app', token, undefined, false);
     return onboardingUrl;
 }
 function readNxCloudToken(tree) {

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

@@ -1,7 +1,6 @@
 /**
  * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
  */
-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 createNxCloudOnboardingURL(onboardingSource: string, accessToken?: string, meta?: string, forceManual?: boolean, forceGithub?: boolean): Promise<string>;
 export declare function getURLifShortenFailed(usesGithub: boolean, githubSlug: string | null, apiUrl: string, source: string, accessToken?: string): string;
 //# sourceMappingURL=url-shorten.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"url-shorten.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/nx-cloud/utilities/url-shorten.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,gBAAgB,EAAE,MAAM,EACxB,WAAW,CAAC,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,OAAO,EACpB,IAAI,CAAC,EAAE,MAAM,mBA0Cd;AAED,wBAAsB,cAAc,CAClC,MAAM,CAAC,EAAE,OAAO,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC,CAiBlB;AAcD,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,UAYrB"}
+{"version":3,"file":"url-shorten.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/nx-cloud/utilities/url-shorten.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,gBAAgB,EAAE,MAAM,EACxB,WAAW,CAAC,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,MAAM,EACb,WAAW,UAAQ,EACnB,WAAW,UAAQ,mBAkDpB;AAcD,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,UAYrB"}

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

@@ -1,19 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNxCloudOnboardingURL = createNxCloudOnboardingURL;
-exports.repoUsesGithub = repoUsesGithub;
 exports.getURLifShortenFailed = getURLifShortenFailed;
 const logger_1 = require("../../utils/logger");
-const git_utils_1 = require("../../utils/git-utils");
 const get_cloud_options_1 = require("./get-cloud-options");
+const git_utils_1 = require("../../utils/git-utils");
 /**
  * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
  */
-async function createNxCloudOnboardingURL(onboardingSource, accessToken, usesGithub, meta) {
-    const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
+async function createNxCloudOnboardingURL(onboardingSource, accessToken, meta, forceManual = false, forceGithub = false) {
+    const remoteInfo = (0, git_utils_1.getVcsRemoteInfo)();
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
-    if (usesGithub === undefined || usesGithub === null) {
-        usesGithub = await repoUsesGithub(undefined, githubSlug, apiUrl);
+    const installationSupportsGitHub = await getInstallationSupportsGitHub(apiUrl);
+    let usesGithub = false;
+    if (forceGithub) {
+        usesGithub = installationSupportsGitHub;
+    }
+    else if (forceManual) {
+        usesGithub = false;
+    }
+    else {
+        usesGithub =
+            remoteInfo?.domain === 'github.com' && installationSupportsGitHub;
     }
     const source = getSource(onboardingSource);
     try {
@@ -21,7 +29,8 @@ async function createNxCloudOnboardingURL(onboardingSource, accessToken, usesGit
             type: usesGithub ? 'GITHUB' : 'MANUAL',
             source,
             accessToken: usesGithub ? null : accessToken,
-            selectedRepositoryName: githubSlug === 'github' ? null : githubSlug,
+            selectedRepositoryName: remoteInfo?.slug ?? null,
+            repositoryDomain: remoteInfo?.domain ?? null,
             meta,
         });
         if (!response?.data || response.data.message) {
@@ -32,21 +41,8 @@ async function createNxCloudOnboardingURL(onboardingSource, accessToken, usesGit
     catch (e) {
         logger_1.logger.verbose(`Failed to shorten Nx Cloud URL.
     ${e}`);
-        return getURLifShortenFailed(usesGithub, githubSlug === 'github' ? null : githubSlug, apiUrl, source, accessToken);
-    }
-}
-async function repoUsesGithub(github, githubSlug, apiUrl) {
-    if (!apiUrl) {
-        apiUrl = (0, get_cloud_options_1.getCloudUrl)();
+        return getURLifShortenFailed(usesGithub, usesGithub ? remoteInfo?.slug : null, apiUrl, source, accessToken);
     }
-    if (!githubSlug) {
-        githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
-    }
-    const installationSupportsGitHub = await getInstallationSupportsGitHub(apiUrl);
-    return ((!!githubSlug || !!github) &&
-        (apiUrl.includes('cloud.nx.app') ||
-            apiUrl.includes('eu.nx.app') ||
-            installationSupportsGitHub));
 }
 function getSource(installationSource) {
     if (installationSource.includes('nx-init')) {

package/src/plugins/js/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/js/index.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAElB,WAAW,EAEX,aAAa,EACd,MAAM,6BAA6B,CAAC;AAiBrC,eAAO,MAAM,IAAI,oCAAoC,CAAC;AAStD,eAAO,MAAM,aAAa,EAAE,aAK3B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,WA6CzB,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,kBAqDhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/js/index.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAElB,WAAW,EAEX,aAAa,EACd,MAAM,6BAA6B,CAAC;AAkBrC,eAAO,MAAM,IAAI,oCAAoC,CAAC;AAStD,eAAO,MAAM,aAAa,EAAE,aAK3B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,WA0CzB,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,kBAkDhC,CAAC"}

package/src/plugins/js/index.js

@@ -4,17 +4,17 @@ exports.createDependencies = exports.createNodes = exports.createNodesV2 = expor
 const fs_1 = require("fs");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
+const file_hasher_1 = require("../../hasher/file-hasher");
+const plugins_1 = require("../../project-graph/plugins");
 const cache_directory_1 = require("../../utils/cache-directory");
 const globs_1 = require("../../utils/globs");
-const plugins_1 = require("../../project-graph/plugins");
+const package_manager_1 = require("../../utils/package-manager");
+const versions_1 = require("../../utils/versions");
+const workspace_root_1 = require("../../utils/workspace-root");
+const bun_parser_1 = require("./lock-file/bun-parser");
 const lock_file_1 = require("./lock-file/lock-file");
 const build_dependencies_1 = require("./project-graph/build-dependencies/build-dependencies");
 const config_1 = require("./utils/config");
-const file_hasher_1 = require("../../hasher/file-hasher");
-const package_manager_1 = require("../../utils/package-manager");
-const workspace_root_1 = require("../../utils/workspace-root");
-const versions_1 = require("../../utils/versions");
-const child_process_1 = require("child_process");
 exports.name = 'nx/js/dependencies-and-lockfile';
 let parsedLockFile = {};
 exports.createNodesV2 = [
@@ -38,11 +38,8 @@ exports.createNodes = [
         }
         const lockFilePath = (0, path_1.join)(workspace_root_1.workspaceRoot, lockFile);
         const lockFileContents = packageManager !== 'bun'
-            ? (0, fs_1.readFileSync)(lockFilePath).toString()
-            : (0, child_process_1.execSync)(`bun ${lockFilePath}`, {
-                maxBuffer: 1024 * 1024 * 10,
-                windowsHide: false,
-            }).toString();
+            ? (0, fs_1.readFileSync)(lockFilePath, 'utf-8')
+            : (0, bun_parser_1.readBunLockFile)(lockFilePath);
         const lockFileHash = getLockFileHash(lockFileContents);
         if (!lockFileNeedsReprocessing(lockFileHash)) {
             const nodes = readCachedParsedLockFile().externalNodes;
@@ -68,11 +65,8 @@ const createDependencies = (_, ctx) => {
         parsedLockFile.externalNodes) {
         const lockFilePath = (0, path_1.join)(workspace_root_1.workspaceRoot, (0, lock_file_1.getLockFileName)(packageManager));
         const lockFileContents = packageManager !== 'bun'
-            ? (0, fs_1.readFileSync)(lockFilePath).toString()
-            : (0, child_process_1.execSync)(`bun ${lockFilePath}`, {
-                maxBuffer: 1024 * 1024 * 10,
-                windowsHide: false,
-            }).toString();
+            ? (0, fs_1.readFileSync)(lockFilePath, 'utf-8')
+            : (0, bun_parser_1.readBunLockFile)(lockFilePath);
         const lockFileHash = getLockFileHash(lockFileContents);
         if (!lockFileNeedsReprocessing(lockFileHash)) {
             lockfileDependencies = readCachedParsedLockFile().dependencies ?? [];

package/src/plugins/js/lock-file/bun-parser.d.ts

@@ -0,0 +1,15 @@
+import { type ProjectGraphExternalNode } from '../../../config/project-graph';
+import type { CreateDependenciesContext } from '../../../project-graph/plugins';
+import { type RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
+export declare const BUN_LOCK_FILE = "bun.lockb";
+export declare const BUN_TEXT_LOCK_FILE = "bun.lock";
+export declare class BunLockfileParseError extends Error {
+    readonly cause?: Error;
+    constructor(message: string, cause?: Error);
+}
+export declare function readBunLockFile(lockFilePath: string): string;
+export declare function getBunTextLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
+/** @internal */
+export declare function clearCache(): void;
+export declare function getBunTextLockfileNodes(lockFileContent: string, lockFileHash: string): Record<string, ProjectGraphExternalNode>;
+//# sourceMappingURL=bun-parser.d.ts.map

package/src/plugins/js/lock-file/bun-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bun-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/bun-parser.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,8CAA8C,CAAC;AAiHtD,eAAO,MAAM,aAAa,cAAc,CAAC;AACzC,eAAO,MAAM,kBAAkB,aAAa,CAAC;AAa7C,qBAAa,qBAAsB,SAAQ,KAAK;aACD,KAAK,CAAC,EAAE,KAAK;gBAA9C,OAAO,EAAE,MAAM,EAAkB,KAAK,CAAC,EAAE,KAAK;CAI3D;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAU5D;AAED,wBAAgB,8BAA8B,CAC5C,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,GAC7B,yBAAyB,EAAE,CAiC7B;AAED,gBAAgB;AAChB,wBAAgB,UAAU,IAAI,IAAI,CAMjC;AAyTD,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CA+C1C"}