nx 20.6.0-canary.20250313-7f1e1cf → 20.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.6.0-canary.20250313-7f1e1cf",
+  "version": "20.6.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -38,7 +38,7 @@
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.2",
     "@zkochan/js-yaml": "0.0.7",
-    "axios": "^1.7.4",
+    "axios": "^1.8.3",
     "chalk": "^4.1.0",
     "cli-cursor": "3.1.0",
     "cli-spinners": "2.6.1",
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.6.0-canary.20250313-7f1e1cf",
-    "@nx/nx-darwin-x64": "20.6.0-canary.20250313-7f1e1cf",
-    "@nx/nx-freebsd-x64": "20.6.0-canary.20250313-7f1e1cf",
-    "@nx/nx-linux-arm-gnueabihf": "20.6.0-canary.20250313-7f1e1cf",
-    "@nx/nx-linux-arm64-gnu": "20.6.0-canary.20250313-7f1e1cf",
-    "@nx/nx-linux-arm64-musl": "20.6.0-canary.20250313-7f1e1cf",
-    "@nx/nx-linux-x64-gnu": "20.6.0-canary.20250313-7f1e1cf",
-    "@nx/nx-linux-x64-musl": "20.6.0-canary.20250313-7f1e1cf",
-    "@nx/nx-win32-arm64-msvc": "20.6.0-canary.20250313-7f1e1cf",
-    "@nx/nx-win32-x64-msvc": "20.6.0-canary.20250313-7f1e1cf"
+    "@nx/nx-darwin-arm64": "20.6.0",
+    "@nx/nx-darwin-x64": "20.6.0",
+    "@nx/nx-freebsd-x64": "20.6.0",
+    "@nx/nx-linux-arm-gnueabihf": "20.6.0",
+    "@nx/nx-linux-arm64-gnu": "20.6.0",
+    "@nx/nx-linux-arm64-musl": "20.6.0",
+    "@nx/nx-linux-x64-gnu": "20.6.0",
+    "@nx/nx-linux-x64-musl": "20.6.0",
+    "@nx/nx-win32-arm64-msvc": "20.6.0",
+    "@nx/nx-win32-x64-msvc": "20.6.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/init/configure-plugins.js

@@ -33,8 +33,15 @@ function runPackageManagerInstallPlugins(repoRoot, pmc = (0, package_manager_1.g
  */
 async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot, updatePackageScripts = false, verbose = false, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
     try {
-        (0, generator_utils_1.getGeneratorInformation)(plugin, 'init', workspace_root_1.workspaceRoot, {});
-        (0, child_process_1.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${updatePackageScripts ? '--updatePackageScripts' : ''} ${verbose ? '--verbose' : ''}`, {
+        const { schema } = (0, generator_utils_1.getGeneratorInformation)(plugin, 'init', workspace_root_1.workspaceRoot, {});
+        let command = `${pmc.exec} nx g ${plugin}:init ${verbose ? '--verbose' : ''}`;
+        if (!!schema.properties['keepExistingVersions']) {
+            command += ` --keepExistingVersions`;
+        }
+        if (updatePackageScripts && !!schema.properties['updatePackageScripts']) {
+            command += ` --updatePackageScripts`;
+        }
+        (0, child_process_1.execSync)(command, {
             stdio: [0, 1, 2],
             cwd: repoRoot,
             windowsHide: false,

package/src/command-line/init/init-v2.js

@@ -156,6 +156,7 @@ const npmPackageToPluginMap = {
     'react-native': '@nx/react-native',
     '@remix-run/dev': '@nx/remix',
     '@rsbuild/core': '@nx/rsbuild',
+    '@react-router/dev': '@nx/react',
 };
 async function detectPlugins(nxJson, interactive, includeAngularCli) {
     let files = ['package.json'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), ['**/*/package.json']));

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

@@ -36,6 +36,10 @@ export interface ReportData {
     };
     projectGraphError?: Error | null;
     nativeTarget: string | null;
+    cache: {
+        max: number;
+        used: number;
+    } | null;
 }
 export declare function getReportData(): Promise<ReportData>;
 interface OutOfSyncPackageGroup {

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

@@ -22,6 +22,9 @@ const installation_directory_1 = require("../../utils/installation-directory");
 const nx_json_1 = require("../../config/nx-json");
 const error_types_1 = require("../../project-graph/error-types");
 const powerpack_1 = require("../../utils/powerpack");
+const cache_1 = require("../../tasks-runner/cache");
+const native_1 = require("../../native");
+const cache_directory_1 = require("../../utils/cache-directory");
 const nxPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '../../../package.json'));
 exports.packagesWeCareAbout = [
     'lerna',
@@ -46,7 +49,7 @@ const LINE_SEPARATOR = '---------------------------------------';
  *
  */
 async function reportHandler() {
-    const { pm, pmVersion, powerpackLicense, powerpackError, localPlugins, powerpackPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, } = await getReportData();
+    const { pm, pmVersion, powerpackLicense, powerpackError, localPlugins, powerpackPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, cache, } = await getReportData();
     const fields = [
         ['Node', process.versions.node],
         ['OS', `${process.platform}-${process.arch}`],
@@ -123,6 +126,10 @@ async function reportHandler() {
             bodyLines.push(`\t ${chalk.green(plugin)}`);
         }
     }
+    if (cache) {
+        bodyLines.push(LINE_SEPARATOR);
+        bodyLines.push(`Cache Usage: ${(0, cache_1.formatCacheSize)(cache.used)} / ${cache.max === 0 ? '∞' : (0, cache_1.formatCacheSize)(cache.max)}`);
+    }
     if (outOfSyncPackageGroup) {
         bodyLines.push(LINE_SEPARATOR);
         bodyLines.push(`The following packages should match the installed version of ${outOfSyncPackageGroup.basePackage}`);
@@ -175,6 +182,14 @@ async function getReportData() {
             powerpackError = e;
         }
     }
+    let cache = (0, cache_1.dbCacheEnabled)(nxJson)
+        ? {
+            max: nxJson.maxCacheSize !== undefined
+                ? (0, cache_1.parseMaxCacheSize)(nxJson.maxCacheSize)
+                : (0, native_1.getDefaultMaxCacheSize)(cache_directory_1.cacheDir),
+            used: new cache_1.DbCache({ nxCloudRemoteCache: null }).getUsedCacheSpace(),
+        }
+        : null;
     return {
         pm,
         powerpackLicense,
@@ -188,6 +203,7 @@ async function getReportData() {
         outOfSyncPackageGroup,
         projectGraphError,
         nativeTarget: native ? native.getBinaryTarget() : null,
+        cache,
     };
 }
 async function tryGetProjectGraph() {

package/src/native/index.d.ts

@@ -42,6 +42,7 @@ export declare class NxCache {
   put(hash: string, terminalOutput: string, outputs: Array<string>, code: number): void
   applyRemoteCacheResults(hash: string, result: CachedResult, outputs: Array<string>): void
   getTaskOutputsPath(hash: string): string
+  getCacheSize(): number
   copyFilesFromCache(cachedResult: CachedResult, outputs: Array<string>): number
   removeOldCacheRecords(): void
   checkCacheFsInSync(): boolean
@@ -166,6 +167,8 @@ export declare export function findImports(projectFileMap: Record<string, Array<
 
 export declare export function getBinaryTarget(): string
 
+export declare export function getDefaultMaxCacheSize(cachePath: string): number
+
 /**
  * Expands the given outputs into a list of existing files.
  * This is used when hashing outputs

package/src/native/native-bindings.js

@@ -379,6 +379,7 @@ module.exports.EventType = nativeBinding.EventType
 module.exports.expandOutputs = nativeBinding.expandOutputs
 module.exports.findImports = nativeBinding.findImports
 module.exports.getBinaryTarget = nativeBinding.getBinaryTarget
+module.exports.getDefaultMaxCacheSize = nativeBinding.getDefaultMaxCacheSize
 module.exports.getFilesForOutputs = nativeBinding.getFilesForOutputs
 module.exports.getTransformableOutputs = nativeBinding.getTransformableOutputs
 module.exports.hashArray = nativeBinding.hashArray

package/src/tasks-runner/cache.d.ts

@@ -26,6 +26,7 @@ export declare class DbCache {
     });
     init(): Promise<void>;
     get(task: Task): Promise<CachedResult | null>;
+    getUsedCacheSpace(): number;
     private applyRemoteCacheResults;
     put(task: Task, terminalOutput: string | null, outputs: string[], code: number): Promise<void>;
     copyFilesFromCache(_: string, cachedResult: CachedResult, outputs: string[]): Promise<number>;
@@ -76,4 +77,5 @@ export declare class Cache {
  *
  * @param maxCacheSize Max cache size as specified in nx.json
  */
-export declare function parseMaxCacheSize(maxCacheSize: string): number | undefined;
+export declare function parseMaxCacheSize(maxCacheSize: string | number): number | undefined;
+export declare function formatCacheSize(maxCacheSize: number, decimals?: number): string;

package/src/tasks-runner/cache.js

@@ -4,6 +4,7 @@ exports.Cache = exports.DbCache = void 0;
 exports.dbCacheEnabled = dbCacheEnabled;
 exports.getCache = getCache;
 exports.parseMaxCacheSize = parseMaxCacheSize;
+exports.formatCacheSize = formatCacheSize;
 const workspace_root_1 = require("../utils/workspace-root");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
@@ -70,7 +71,9 @@ class DbCache {
     constructor(options) {
         this.options = options;
         this.nxJson = (0, nx_json_1.readNxJson)();
-        this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(), undefined, parseMaxCacheSize(this.nxJson.maxCacheSize));
+        this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(), undefined, this.nxJson.maxCacheSize !== undefined
+            ? parseMaxCacheSize(this.nxJson.maxCacheSize)
+            : (0, native_1.getDefaultMaxCacheSize)(cache_directory_1.cacheDir));
         this.isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
     }
     async init() {
@@ -107,6 +110,9 @@ class DbCache {
             return null;
         }
     }
+    getUsedCacheSpace() {
+        return this.cache.getCacheSize();
+    }
     applyRemoteCacheResults(hash, res, outputs) {
         return this.cache.applyRemoteCacheResults(hash, res, outputs);
     }
@@ -467,10 +473,14 @@ function tryAndRetry(fn) {
  * @param maxCacheSize Max cache size as specified in nx.json
  */
 function parseMaxCacheSize(maxCacheSize) {
-    if (!maxCacheSize) {
+    if (maxCacheSize === null || maxCacheSize === undefined) {
         return undefined;
     }
-    let regexResult = maxCacheSize.match(/^(?<size>[\d|.]+)\s?((?<unit>[KMG]?B)?)$/);
+    let regexResult = maxCacheSize
+        // Covers folks who accidentally specify as a number rather than a string
+        .toString()
+        // Match a number followed by an optional unit (KB, MB, GB), with optional whitespace between the number and unit
+        .match(/^(?<size>[\d|.]+)\s?((?<unit>[KMG]?B)?)$/);
     if (!regexResult) {
         throw new Error(`Invalid max cache size specified in nx.json: ${maxCacheSize}. Must be a number followed by an optional unit (KB, MB, GB)`);
     }
@@ -494,3 +504,13 @@ function parseMaxCacheSize(maxCacheSize) {
             return size;
     }
 }
+function formatCacheSize(maxCacheSize, decimals = 2) {
+    const exponents = ['B', 'KB', 'MB', 'GB'];
+    let exponent = 0;
+    let size = maxCacheSize;
+    while (size >= 1024 && exponent < exponents.length - 1) {
+        size /= 1024;
+        exponent++;
+    }
+    return `${size.toFixed(decimals)} ${exponents[exponent]}`;
+}