nx 19.4.0-rc.1 → 19.5.0-canary.20240703-4c76b95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.4.0-rc.1",
+  "version": "19.5.0-canary.20240703-4c76b95",
   "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.4.0-rc.1"
+    "@nrwl/tao": "19.5.0-canary.20240703-4c76b95"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -85,16 +85,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.4.0-rc.1",
-    "@nx/nx-darwin-arm64": "19.4.0-rc.1",
-    "@nx/nx-linux-x64-gnu": "19.4.0-rc.1",
-    "@nx/nx-linux-x64-musl": "19.4.0-rc.1",
-    "@nx/nx-win32-x64-msvc": "19.4.0-rc.1",
-    "@nx/nx-linux-arm64-gnu": "19.4.0-rc.1",
-    "@nx/nx-linux-arm64-musl": "19.4.0-rc.1",
-    "@nx/nx-linux-arm-gnueabihf": "19.4.0-rc.1",
-    "@nx/nx-win32-arm64-msvc": "19.4.0-rc.1",
-    "@nx/nx-freebsd-x64": "19.4.0-rc.1"
+    "@nx/nx-darwin-x64": "19.5.0-canary.20240703-4c76b95",
+    "@nx/nx-darwin-arm64": "19.5.0-canary.20240703-4c76b95",
+    "@nx/nx-linux-x64-gnu": "19.5.0-canary.20240703-4c76b95",
+    "@nx/nx-linux-x64-musl": "19.5.0-canary.20240703-4c76b95",
+    "@nx/nx-win32-x64-msvc": "19.5.0-canary.20240703-4c76b95",
+    "@nx/nx-linux-arm64-gnu": "19.5.0-canary.20240703-4c76b95",
+    "@nx/nx-linux-arm64-musl": "19.5.0-canary.20240703-4c76b95",
+    "@nx/nx-linux-arm-gnueabihf": "19.5.0-canary.20240703-4c76b95",
+    "@nx/nx-win32-arm64-msvc": "19.5.0-canary.20240703-4c76b95",
+    "@nx/nx-freebsd-x64": "19.5.0-canary.20240703-4c76b95"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -1,2 +1,8 @@
 export declare function shortenedCloudUrl(installationSource: string, accessToken?: string, usesGithub?: boolean): Promise<string>;
 export declare function repoUsesGithub(github?: boolean): Promise<boolean>;
+export declare function removeTrailingSlash(apiUrl: string): string;
+export declare function getURLifShortenFailed(usesGithub: boolean, githubSlug: string, apiUrl: string, source: string, accessToken?: string): string;
+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;

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

@@ -1,14 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.repoUsesGithub = exports.shortenedCloudUrl = void 0;
+exports.compareCleanCloudVersions = exports.versionIsValid = exports.removeVersionModifier = exports.getNxCloudVersion = exports.getURLifShortenFailed = exports.removeTrailingSlash = exports.repoUsesGithub = exports.shortenedCloudUrl = void 0;
 const devkit_exports_1 = require("../../devkit-exports");
 const git_utils_1 = require("../../utils/git-utils");
-const semver_1 = require("semver");
 async function shortenedCloudUrl(installationSource, accessToken, usesGithub) {
     const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
     const apiUrl = removeTrailingSlash(process.env.NX_CLOUD_API || process.env.NRWL_API || `https://cloud.nx.app`);
-    const version = await getNxCloudVersion(apiUrl);
-    if (version && (0, semver_1.lt)(removeVersionModifier(version), '2406.11.5')) {
+    try {
+        const version = await getNxCloudVersion(apiUrl);
+        if ((version && compareCleanCloudVersions(version, '2406.11.5') < 0) ||
+            !version) {
+            return apiUrl;
+        }
+    }
+    catch (e) {
+        devkit_exports_1.logger.verbose(`Failed to get Nx Cloud version.
+    ${e}`);
         return apiUrl;
     }
     const source = getSource(installationSource);
@@ -44,6 +51,7 @@ exports.repoUsesGithub = repoUsesGithub;
 function removeTrailingSlash(apiUrl) {
     return apiUrl[apiUrl.length - 1] === '/' ? apiUrl.slice(0, -1) : apiUrl;
 }
+exports.removeTrailingSlash = removeTrailingSlash;
 function getSource(installationSource) {
     if (installationSource.includes('nx-init')) {
         return 'nx-init';
@@ -69,6 +77,7 @@ function getURLifShortenFailed(usesGithub, githubSlug, apiUrl, source, accessTok
     }
     return `${apiUrl}/setup/connect-workspace/manual?accessToken=${accessToken}&source=${source}`;
 }
+exports.getURLifShortenFailed = getURLifShortenFailed;
 async function getInstallationSupportsGitHub(apiUrl) {
     try {
         const response = await require('axios').get(`${apiUrl}/nx-cloud/system/features`);
@@ -89,17 +98,55 @@ async function getNxCloudVersion(apiUrl) {
     try {
         const response = await require('axios').get(`${apiUrl}/nx-cloud/system/version`);
         const version = removeVersionModifier(response.data.version);
+        const isValid = versionIsValid(version);
         if (!version) {
             throw new Error('Failed to extract version from response.');
         }
+        if (!isValid) {
+            throw new Error(`Invalid version format: ${version}`);
+        }
         return version;
     }
     catch (e) {
         devkit_exports_1.logger.verbose(`Failed to get version of Nx Cloud.
       ${e}`);
+        return null;
     }
 }
+exports.getNxCloudVersion = getNxCloudVersion;
 function removeVersionModifier(versionString) {
-    // version may be something like 2406.13.5.hotfix2
+    // Cloud version string is in the format of YYMM.DD.BuildNumber-Modifier
     return versionString.split(/[\.-]/).slice(0, 3).join('.');
 }
+exports.removeVersionModifier = removeVersionModifier;
+function versionIsValid(version) {
+    // Updated Regex pattern to require YYMM.DD.BuildNumber format
+    // All parts are required, including the BuildNumber.
+    const pattern = /^\d{4}\.\d{2}\.\d+$/;
+    return pattern.test(version);
+}
+exports.versionIsValid = versionIsValid;
+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;
+}
+exports.compareCleanCloudVersions = compareCleanCloudVersions;

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.