nx 21.2.0-canary.20250527-4a94841 → 21.2.0-canary.20250528-2572455

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.2.0-canary.20250527-4a94841",
+  "version": "21.2.0-canary.20250528-2572455",
   "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.2.0-canary.20250527-4a94841",
-    "@nx/nx-darwin-x64": "21.2.0-canary.20250527-4a94841",
-    "@nx/nx-freebsd-x64": "21.2.0-canary.20250527-4a94841",
-    "@nx/nx-linux-arm-gnueabihf": "21.2.0-canary.20250527-4a94841",
-    "@nx/nx-linux-arm64-gnu": "21.2.0-canary.20250527-4a94841",
-    "@nx/nx-linux-arm64-musl": "21.2.0-canary.20250527-4a94841",
-    "@nx/nx-linux-x64-gnu": "21.2.0-canary.20250527-4a94841",
-    "@nx/nx-linux-x64-musl": "21.2.0-canary.20250527-4a94841",
-    "@nx/nx-win32-arm64-msvc": "21.2.0-canary.20250527-4a94841",
-    "@nx/nx-win32-x64-msvc": "21.2.0-canary.20250527-4a94841"
+    "@nx/nx-darwin-arm64": "21.2.0-canary.20250528-2572455",
+    "@nx/nx-darwin-x64": "21.2.0-canary.20250528-2572455",
+    "@nx/nx-freebsd-x64": "21.2.0-canary.20250528-2572455",
+    "@nx/nx-linux-arm-gnueabihf": "21.2.0-canary.20250528-2572455",
+    "@nx/nx-linux-arm64-gnu": "21.2.0-canary.20250528-2572455",
+    "@nx/nx-linux-arm64-musl": "21.2.0-canary.20250528-2572455",
+    "@nx/nx-linux-x64-gnu": "21.2.0-canary.20250528-2572455",
+    "@nx/nx-linux-x64-musl": "21.2.0-canary.20250528-2572455",
+    "@nx/nx-win32-arm64-msvc": "21.2.0-canary.20250528-2572455",
+    "@nx/nx-win32-x64-msvc": "21.2.0-canary.20250528-2572455"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -7,4 +7,4 @@ export declare function getURLifShortenFailed(usesGithub: boolean, githubSlug: s
 export declare function getNxCloudVersion(apiUrl: string): Promise<string | null>;
 export declare function removeVersionModifier(versionString: string): string;
 export declare function versionIsValid(version: string): boolean;
-export declare function compareCleanCloudVersions(version1: string, version2: string): number;
+export declare function isOldNxCloudVersion(version: string): boolean;

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

@@ -6,7 +6,7 @@ exports.getURLifShortenFailed = getURLifShortenFailed;
 exports.getNxCloudVersion = getNxCloudVersion;
 exports.removeVersionModifier = removeVersionModifier;
 exports.versionIsValid = versionIsValid;
-exports.compareCleanCloudVersions = compareCleanCloudVersions;
+exports.isOldNxCloudVersion = isOldNxCloudVersion;
 const logger_1 = require("../../utils/logger");
 const git_utils_1 = require("../../utils/git-utils");
 const get_cloud_options_1 = require("./get-cloud-options");
@@ -21,8 +21,7 @@ async function createNxCloudOnboardingURL(onboardingSource, accessToken, usesGit
     }
     try {
         const version = await getNxCloudVersion(apiUrl);
-        if ((version && compareCleanCloudVersions(version, '2406.11.5') < 0) ||
-            !version) {
+        if (!version || isOldNxCloudVersion(version)) {
             return apiUrl;
         }
     }
@@ -96,7 +95,7 @@ async function getInstallationSupportsGitHub(apiUrl) {
     }
     catch (e) {
         if (process.env.NX_VERBOSE_LOGGING === 'true') {
-            logger_1.logger.warn(`Failed to access system features. GitHub integration assumed to be disabled. 
+            logger_1.logger.warn(`Failed to access system features. GitHub integration assumed to be disabled.
     ${e}`);
         }
         return false;
@@ -131,26 +130,28 @@ function versionIsValid(version) {
     const pattern = /^\d{4}\.\d{2}\.\d+$/;
     return pattern.test(version);
 }
-function compareCleanCloudVersions(version1, version2) {
-    const parseVersion = (version) => {
-        // The format we're using is YYMM.DD.BuildNumber
-        const parts = version.split('.').map((part) => parseInt(part, 10));
-        return {
-            yearMonth: parts[0],
-            day: parts[1],
-            buildNumber: parts[2],
-        };
-    };
-    const v1 = parseVersion(version1);
-    const v2 = parseVersion(version2);
-    if (v1.yearMonth !== v2.yearMonth) {
-        return v1.yearMonth > v2.yearMonth ? 1 : -1;
-    }
-    if (v1.day !== v2.day) {
-        return v1.day > v2.day ? 1 : -1;
-    }
-    if (v1.buildNumber !== v2.buildNumber) {
-        return v1.buildNumber > v2.buildNumber ? 1 : -1;
-    }
-    return 0;
+function isOldNxCloudVersion(version) {
+    const [major, minor, buildNumber] = version
+        .split('.')
+        .map((part) => parseInt(part, 10));
+    // for on-prem images we are using YYYY.MM.BuildNumber format
+    // the first year is 2025
+    if (major >= 2025 && major < 2300) {
+        return false;
+    }
+    // Previously we used YYMM.DD.BuildNumber
+    // All versions before '2406.11.5' had different URL shortening logic
+    const newVersionMajor = 2406;
+    const newVersionMinor = 11;
+    const newVersionBuildNumber = 5;
+    if (major !== newVersionMajor) {
+        return major < newVersionMajor;
+    }
+    if (minor !== newVersionMinor) {
+        return minor < newVersionMinor;
+    }
+    if (buildNumber !== newVersionBuildNumber) {
+        return buildNumber < newVersionBuildNumber;
+    }
+    return false;
 }