nx 21.4.0-beta.1 → 21.4.0-beta.11

package/src/utils/git-utils.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitRepository = void 0;
 exports.cloneFromUpstream = cloneFromUpstream;
-exports.getGithubSlugOrNull = getGithubSlugOrNull;
-exports.extractUserAndRepoFromGitHubUrl = extractUserAndRepoFromGitHubUrl;
+exports.parseVcsRemoteUrl = parseVcsRemoteUrl;
+exports.getVcsRemoteInfo = getVcsRemoteInfo;
 exports.commitChanges = commitChanges;
 exports.getLatestCommitSha = getLatestCommitSha;
 const child_process_1 = require("child_process");
@@ -170,55 +170,87 @@ class GitRepository {
     }
 }
 exports.GitRepository = GitRepository;
-/**
- * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
- */
-function getGithubSlugOrNull() {
+function parseVcsRemoteUrl(url) {
+    // Remove whitespace and handle common URL formats
+    const cleanUrl = url.trim();
+    // SSH format: git@domain:owner/repo.git
+    const sshMatch = cleanUrl.match(/^git@([^:]+):([^\/]+)\/(.+?)(\.git)?$/);
+    if (sshMatch) {
+        const [, domain, owner, repo] = sshMatch;
+        return {
+            domain,
+            slug: `${owner}/${repo}`,
+        };
+    }
+    // HTTPS with authentication: https://user@domain/owner/repo.git
+    const httpsAuthMatch = cleanUrl.match(/^https?:\/\/[^@]+@([^\/]+)\/([^\/]+)\/(.+?)(\.git)?$/);
+    if (httpsAuthMatch) {
+        const [, domain, owner, repo] = httpsAuthMatch;
+        return {
+            domain,
+            slug: `${owner}/${repo}`,
+        };
+    }
+    // HTTPS format: https://domain/owner/repo.git (without authentication)
+    const httpsMatch = cleanUrl.match(/^https?:\/\/([^@\/]+)\/([^\/]+)\/(.+?)(\.git)?$/);
+    if (httpsMatch) {
+        const [, domain, owner, repo] = httpsMatch;
+        return {
+            domain,
+            slug: `${owner}/${repo}`,
+        };
+    }
+    // SSH alternative format: ssh://git@domain/owner/repo.git or ssh://git@domain:port/owner/repo.git
+    const sshAltMatch = cleanUrl.match(/^ssh:\/\/[^@]+@([^:\/]+)(:[0-9]+)?\/([^\/]+)\/(.+?)(\.git)?$/);
+    if (sshAltMatch) {
+        const [, domain, , owner, repo] = sshAltMatch;
+        return {
+            domain,
+            slug: `${owner}/${repo}`,
+        };
+    }
+    return null;
+}
+function getVcsRemoteInfo() {
     try {
         const gitRemote = (0, child_process_1.execSync)('git remote -v', {
             stdio: 'pipe',
             windowsHide: false,
-        }).toString();
-        // If there are no remotes, we default to github
+        })
+            .toString()
+            .trim();
         if (!gitRemote || gitRemote.length === 0) {
-            return 'github';
+            return null;
         }
-        return extractUserAndRepoFromGitHubUrl(gitRemote);
-    }
-    catch (e) {
-        // Probably git is not set up, so we default to github
-        return 'github';
-    }
-}
-function extractUserAndRepoFromGitHubUrl(gitRemotes) {
-    const regex = /^\s*(\w+)\s+(git@github\.com:|https:\/\/github\.com\/)([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)\.git/gm;
-    const remotesPriority = ['origin', 'upstream', 'base'];
-    const foundRemotes = {};
-    let firstGitHubUrl = null;
-    let match;
-    while ((match = regex.exec(gitRemotes)) !== null) {
-        const remoteName = match[1];
-        const url = match[2] + match[3] + '/' + match[4] + '.git';
-        foundRemotes[remoteName] = url;
-        if (!firstGitHubUrl) {
-            firstGitHubUrl = url;
+        const lines = gitRemote.split('\n').filter((line) => line.trim());
+        const remotesPriority = ['origin', 'upstream', 'base'];
+        const foundRemotes = {};
+        let firstRemote = null;
+        for (const line of lines) {
+            const match = line.trim().match(/^(\w+)\s+(\S+)\s+\((fetch|push)\)$/);
+            if (match) {
+                const [, remoteName, url] = match;
+                const remoteInfo = parseVcsRemoteUrl(url);
+                if (remoteInfo && !foundRemotes[remoteName]) {
+                    foundRemotes[remoteName] = remoteInfo;
+                    if (!firstRemote) {
+                        firstRemote = remoteInfo;
+                    }
+                }
+            }
         }
-    }
-    for (const remote of remotesPriority) {
-        if (foundRemotes[remote]) {
-            return parseGitHubUrl(foundRemotes[remote]);
+        // Return high-priority remote if found
+        for (const remote of remotesPriority) {
+            if (foundRemotes[remote]) {
+                return foundRemotes[remote];
+            }
         }
+        // Return first found remote
+        return firstRemote;
     }
-    return firstGitHubUrl ? parseGitHubUrl(firstGitHubUrl) : null;
-}
-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]}`;
+    catch (e) {
+        return null;
     }
-    return null;
 }
 function commitChanges(commitMessage, directory) {
     try {

package/src/utils/nx-cloud-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-cloud-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-cloud-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAalE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAWjE"}
+{"version":3,"file":"nx-cloud-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-cloud-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAclE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAejE"}

package/src/utils/nx-cloud-utils.js

@@ -6,7 +6,8 @@ function isNxCloudUsed(nxJson) {
     if (process.env.NX_NO_CLOUD === 'true' || nxJson.neverConnectToCloud) {
         return false;
     }
-    return (!!process.env.NX_CLOUD_ACCESS_TOKEN ||
+    return (!!process.env.NX_CLOUD_AUTH_TOKEN ||
+        !!process.env.NX_CLOUD_ACCESS_TOKEN ||
         !!nxJson.nxCloudAccessToken ||
         !!nxJson.nxCloudId ||
         !!Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud'));
@@ -14,7 +15,9 @@ function isNxCloudUsed(nxJson) {
 function getNxCloudUrl(nxJson) {
     const cloudRunner = Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud');
     if (!cloudRunner &&
-        !(nxJson.nxCloudAccessToken || process.env.NX_CLOUD_ACCESS_TOKEN) &&
+        !(nxJson.nxCloudAccessToken ||
+            process.env.NX_CLOUD_AUTH_TOKEN ||
+            process.env.NX_CLOUD_ACCESS_TOKEN) &&
         !nxJson.nxCloudId)
         throw new Error('nx-cloud runner not found in nx.json');
     return cloudRunner?.options?.url ?? nxJson.nxCloudUrl ?? 'https://nx.app';