nx 19.2.0-canary.20240605-5a06daa → 19.2.0-rc.1

package/package.json

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

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

@@ -5,6 +5,7 @@ const output_1 = require("../../utils/output");
 const configuration_1 = require("../../config/configuration");
 const tree_1 = require("../../generators/tree");
 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 nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 const child_process_1 = require("../../utils/child-process");
 const ab_testing_1 = require("../../utils/ab-testing");
@@ -43,20 +44,38 @@ exports.connectToNxCloudIfExplicitlyAsked = connectToNxCloudIfExplicitlyAsked;
 async function connectToNxCloudCommand() {
     const nxJson = (0, configuration_1.readNxJson)();
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
-        output_1.output.log({
-            title: '✔ This workspace already has Nx Cloud set up',
-            bodyLines: [
-                'If you have not done so already, connect your workspace to your Nx Cloud account:',
-                `- Login at ${(0, nx_cloud_utils_1.getNxCloudUrl)(nxJson)} to connect your repository`,
-            ],
-        });
+        if (process.env.NX_NEW_CLOUD_ONBOARDING !== 'true') {
+            output_1.output.log({
+                title: '✔ This workspace already has Nx Cloud set up',
+                bodyLines: [
+                    'If you have not done so already, connect your workspace to your Nx Cloud account:',
+                    `- Login at ${(0, nx_cloud_utils_1.getNxCloudUrl)(nxJson)} to connect your repository`,
+                ],
+            });
+        }
+        else {
+            const token = process.env.NX_CLOUD_ACCESS_TOKEN || nxJson.nxCloudAccessToken;
+            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);
+            output_1.output.log({
+                title: '✔ This workspace already has Nx Cloud set up',
+                bodyLines: [
+                    'If you have not done so already, connect your workspace to your Nx Cloud account:',
+                    `- Connect with Nx Cloud at: 
+      
+        ${connectCloudUrl}`,
+                ],
+            });
+        }
         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, {});
     tree.lock();
     (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, tree.listChanges());
-    callback();
+    await callback();
     return true;
 }
 exports.connectToNxCloudCommand = connectToNxCloudCommand;

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

@@ -11,6 +11,7 @@ const util_1 = require("util");
 const tree_1 = require("../../generators/tree");
 const fileutils_1 = require("../../utils/fileutils");
 const logger_1 = require("../../utils/logger");
+const git_utils_1 = require("../../utils/git-utils");
 const package_json_1 = require("../../utils/package-json");
 const package_manager_1 = require("../../utils/package-manager");
 const params_1 = require("../../utils/params");
@@ -925,7 +926,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
                 installDepsIfChanged();
                 const commitMessage = `${commitPrefix}${m.name}`;
                 try {
-                    const committedSha = commitChanges(commitMessage);
+                    const committedSha = (0, git_utils_1.commitChanges)(commitMessage);
                     if (committedSha) {
                         logger_1.logger.info(chalk.dim(`- Commit created for changes: ${committedSha}`));
                     }
@@ -1007,31 +1008,6 @@ function getStringifiedPackageJsonDeps(root) {
         return '';
     }
 }
-function commitChanges(commitMessage) {
-    try {
-        (0, child_process_1.execSync)('git add -A', { encoding: 'utf8', stdio: 'pipe' });
-        (0, child_process_1.execSync)('git commit --no-verify -F -', {
-            encoding: 'utf8',
-            stdio: 'pipe',
-            input: commitMessage,
-        });
-    }
-    catch (err) {
-        throw new Error(`Error committing changes:\n${err.stderr}`);
-    }
-    return getLatestCommitSha();
-}
-function getLatestCommitSha() {
-    try {
-        return (0, child_process_1.execSync)('git rev-parse HEAD', {
-            encoding: 'utf8',
-            stdio: 'pipe',
-        }).trim();
-    }
-    catch {
-        return null;
-    }
-}
 async function runNxMigration(root, collectionPath, collection, name) {
     const { path: implPath, fnSymbol } = getImplementationPath(collection, collectionPath, name);
     const fn = require(implPath)[fnSymbol];

package/src/native/native-file-cache-location.js

@@ -10,12 +10,14 @@ function getNativeFileCacheLocation() {
         return process.env.NX_NATIVE_FILE_CACHE_DIRECTORY;
     }
     else {
-        const shortHash = (0, crypto_1.createHash)('sha256')
-            .update((0, os_1.userInfo)().username)
-            .update(workspace_root_1.workspaceRoot)
-            .digest('hex')
-            .substring(0, 7);
-        return (0, path_1.join)((0, os_1.tmpdir)(), `nx-native-file-cache-${shortHash}`);
+        const hash = (0, crypto_1.createHash)('sha256').update(workspace_root_1.workspaceRoot);
+        try {
+            hash.update((0, os_1.userInfo)().username);
+        }
+        catch (e) {
+            // if there's no user, we only use the workspace root for the hash and move on
+        }
+        return (0, path_1.join)((0, os_1.tmpdir)(), `nx-native-file-cache-${hash.digest('hex').substring(0, 7)}`);
     }
 }
 exports.getNativeFileCacheLocation = getNativeFileCacheLocation;

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

@@ -3,6 +3,7 @@ interface ConnectToNxCloudOptions {
     analytics?: boolean;
     installationSource?: string;
     hideFormatLogs?: boolean;
+    github?: boolean;
 }
 export declare function connectToNxCloud(tree: Tree, schema: ConnectToNxCloudOptions): Promise<() => void>;
 export default connectToNxCloud;

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

@@ -7,6 +7,7 @@ const output_1 = require("../../../utils/output");
 const json_1 = require("../../../generators/utils/json");
 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");
 function printCloudConnectionDisabledMessage() {
     output_1.output.error({
         title: `Connections to Nx Cloud are disabled for this workspace`,
@@ -56,20 +57,36 @@ async function createNxCloudWorkspace(workspaceName, installationSource, nxInitD
     }
     return response.data;
 }
-function printSuccessMessage(url) {
-    let origin = 'https://nx.app';
-    try {
-        origin = new node_url_1.URL(url).origin;
+async function printSuccessMessage(url, token, installationSource, github) {
+    if (process.env.NX_NEW_CLOUD_ONBOARDING !== 'true') {
+        let origin = 'https://nx.app';
+        try {
+            origin = new node_url_1.URL(url).origin;
+        }
+        catch (e) { }
+        output_1.output.note({
+            title: `Your Nx Cloud workspace is public`,
+            bodyLines: [
+                `To restrict access, connect it to your Nx Cloud account:`,
+                `- Push your changes`,
+                `- Login at ${origin} to connect your repository`,
+            ],
+        });
+    }
+    else {
+        const connectCloudUrl = await (0, url_shorten_1.shortenedCloudUrl)(installationSource, token, github);
+        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}`,
+            ],
+        });
     }
-    catch (e) { }
-    output_1.output.note({
-        title: `Your Nx Cloud workspace is public`,
-        bodyLines: [
-            `To restrict access, connect it to your Nx Cloud account:`,
-            `- Push your changes`,
-            `- Login at ${origin} to connect your repository`,
-        ],
-    });
 }
 function addNxCloudOptionsToNxJson(tree, nxJson, token) {
     nxJson ??= {
@@ -97,7 +114,7 @@ async function connectToNxCloud(tree, schema) {
         await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
             silent: schema.hideFormatLogs,
         });
-        return () => printSuccessMessage(r.url);
+        return async () => await printSuccessMessage(r.url, r.token, schema.installationSource, schema.github);
     }
 }
 exports.connectToNxCloud = connectToNxCloud;

package/src/nx-cloud/generators/connect-to-nx-cloud/schema.json

@@ -20,6 +20,11 @@
       "type": "boolean",
       "description": "Hide formatting logs",
       "x-priority": "internal"
+    },
+    "github": {
+      "type": "boolean",
+      "description": "If the user will be using GitHub as their git hosting provider",
+      "default": false
     }
   },
   "additionalProperties": false,

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

@@ -0,0 +1 @@
+export declare function shortenedCloudUrl(installationSource: string, accessToken: string, github?: boolean): Promise<string>;

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

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shortenedCloudUrl = void 0;
+const devkit_exports_1 = require("../../devkit-exports");
+const git_utils_1 = require("../../utils/git-utils");
+async function shortenedCloudUrl(installationSource, accessToken, github) {
+    const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
+    const apiUrl = removeTrailingSlash(process.env.NX_CLOUD_API || process.env.NRWL_API || `https://cloud.nx.app`);
+    const installationSupportsGitHub = await getInstallationSupportsGitHub(apiUrl);
+    const usesGithub = (githubSlug || github) &&
+        (apiUrl.includes('cloud.nx.app') ||
+            apiUrl.includes('eu.nx.app') ||
+            installationSupportsGitHub);
+    const source = getSource(installationSource);
+    try {
+        const response = await require('axios').post(`${apiUrl}/nx-cloud/onboarding`, {
+            type: usesGithub ? 'GITHUB' : 'MANUAL',
+            source,
+            accessToken: usesGithub ? null : accessToken,
+            selectedRepositoryName: githubSlug,
+        });
+        if (!response?.data || response.data.message) {
+            throw new Error(response?.data?.message ?? 'Failed to shorten Nx Cloud URL');
+        }
+        return `${apiUrl}/connect/${response.data}`;
+    }
+    catch (e) {
+        devkit_exports_1.logger.verbose(`Failed to shorten Nx Cloud URL.
+    ${e}`);
+        return getURLifShortenFailed(usesGithub, githubSlug, apiUrl, accessToken, source);
+    }
+}
+exports.shortenedCloudUrl = shortenedCloudUrl;
+function removeTrailingSlash(apiUrl) {
+    return apiUrl[apiUrl.length - 1] === '/' ? apiUrl.slice(0, -1) : apiUrl;
+}
+function getSource(installationSource) {
+    if (installationSource.includes('nx-init')) {
+        return 'nx-init';
+    }
+    else if (installationSource.includes('nx-connect')) {
+        return 'nx-connect';
+    }
+    else if (installationSource.includes('create-nx-workspace')) {
+        return 'create-nx-workspace';
+    }
+    else {
+        return 'other';
+    }
+}
+function getURLifShortenFailed(usesGithub, githubSlug, apiUrl, accessToken, source) {
+    if (usesGithub) {
+        if (githubSlug) {
+            return `${apiUrl}/setup/connect-workspace/vcs?provider=GITHUB&selectedRepositoryName=${encodeURIComponent(githubSlug)}&source=${source}`;
+        }
+        else {
+            return `${apiUrl}/setup/connect-workspace/vcs?provider=GITHUB&source=${source}`;
+        }
+    }
+    return `${apiUrl}/setup/connect-workspace/manual?accessToken=${accessToken}&source=${source}`;
+}
+async function getInstallationSupportsGitHub(apiUrl) {
+    try {
+        const response = await require('axios').get(`${apiUrl}/vcs-integrations`);
+        if (!response?.data || response.data.message) {
+            throw new Error(response?.data?.message ?? 'Failed to shorten Nx Cloud URL');
+        }
+        return !!response.data.github;
+    }
+    catch (e) {
+        if (process.env.NX_VERBOSE_LOGGING) {
+            devkit_exports_1.logger.warn(`Failed to access vcs-integrations endpoint.
+    ${e}`);
+        }
+        return false;
+    }
+}

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("../file-utils").FileData[];
+    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("../../native").FileData[];
+        nonProjectFiles: import("nx/src/native").FileData[];
     };
-    rustReferences: import("../../native").NxWorkspaceFilesExternals;
+    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.

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

@@ -0,0 +1,4 @@
+export declare function getGithubSlugOrNull(): string | null;
+export declare function extractUserAndRepoFromGitHubUrl(gitRemotes: string): string | null;
+export declare function commitChanges(commitMessage: string): string | null;
+export declare function getLatestCommitSha(): string | null;

package/src/utils/git-utils.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLatestCommitSha = exports.commitChanges = exports.extractUserAndRepoFromGitHubUrl = exports.getGithubSlugOrNull = void 0;
+const child_process_1 = require("child_process");
+function getGithubSlugOrNull() {
+    try {
+        const gitRemote = (0, child_process_1.execSync)('git remote -v').toString();
+        return extractUserAndRepoFromGitHubUrl(gitRemote);
+    }
+    catch (e) {
+        return null;
+    }
+}
+exports.getGithubSlugOrNull = getGithubSlugOrNull;
+function extractUserAndRepoFromGitHubUrl(gitRemotes) {
+    const regex = /^\s*(\w+)\s+(git@github\.com:|https:\/\/github\.com\/)([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)\.git/gm;
+    let firstGitHubUrl = null;
+    let match;
+    while ((match = regex.exec(gitRemotes)) !== null) {
+        const remoteName = match[1];
+        const url = match[2] + match[3] + '/' + match[4] + '.git';
+        if (remoteName === 'origin') {
+            return parseGitHubUrl(url);
+        }
+        if (!firstGitHubUrl) {
+            firstGitHubUrl = url;
+        }
+    }
+    return firstGitHubUrl ? parseGitHubUrl(firstGitHubUrl) : null;
+}
+exports.extractUserAndRepoFromGitHubUrl = extractUserAndRepoFromGitHubUrl;
+function parseGitHubUrl(url) {
+    const sshPattern = /git@github\.com:([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)\.git/;
+    const httpsPattern = /https:\/\/github\.com\/([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)\.git/;
+    let match = url.match(sshPattern) || url.match(httpsPattern);
+    if (match) {
+        return `${match[1]}/${match[2]}`;
+    }
+    return null;
+}
+function commitChanges(commitMessage) {
+    try {
+        (0, child_process_1.execSync)('git add -A', { encoding: 'utf8', stdio: 'pipe' });
+        (0, child_process_1.execSync)('git commit --no-verify -F -', {
+            encoding: 'utf8',
+            stdio: 'pipe',
+            input: commitMessage,
+        });
+    }
+    catch (err) {
+        throw new Error(`Error committing changes:\n${err.stderr}`);
+    }
+    return getLatestCommitSha();
+}
+exports.commitChanges = commitChanges;
+function getLatestCommitSha() {
+    try {
+        return (0, child_process_1.execSync)('git rev-parse HEAD', {
+            encoding: 'utf8',
+            stdio: 'pipe',
+        }).trim();
+    }
+    catch {
+        return null;
+    }
+}
+exports.getLatestCommitSha = getLatestCommitSha;