nx 20.5.0 → 20.6.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.5.0",
+  "version": "20.6.0-beta.1",
   "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.5.0",
-    "@nx/nx-darwin-x64": "20.5.0",
-    "@nx/nx-freebsd-x64": "20.5.0",
-    "@nx/nx-linux-arm-gnueabihf": "20.5.0",
-    "@nx/nx-linux-arm64-gnu": "20.5.0",
-    "@nx/nx-linux-arm64-musl": "20.5.0",
-    "@nx/nx-linux-x64-gnu": "20.5.0",
-    "@nx/nx-linux-x64-musl": "20.5.0",
-    "@nx/nx-win32-arm64-msvc": "20.5.0",
-    "@nx/nx-win32-x64-msvc": "20.5.0"
+    "@nx/nx-darwin-arm64": "20.6.0-beta.1",
+    "@nx/nx-darwin-x64": "20.6.0-beta.1",
+    "@nx/nx-freebsd-x64": "20.6.0-beta.1",
+    "@nx/nx-linux-arm-gnueabihf": "20.6.0-beta.1",
+    "@nx/nx-linux-arm64-gnu": "20.6.0-beta.1",
+    "@nx/nx-linux-arm64-musl": "20.6.0-beta.1",
+    "@nx/nx-linux-x64-gnu": "20.6.0-beta.1",
+    "@nx/nx-linux-x64-musl": "20.6.0-beta.1",
+    "@nx/nx-win32-arm64-msvc": "20.6.0-beta.1",
+    "@nx/nx-win32-x64-msvc": "20.6.0-beta.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/compat.d.ts

@@ -1,2 +1,2 @@
 export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata"];
-export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache"];
+export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache", "maxCacheSize"];

package/src/adapter/compat.js

@@ -65,6 +65,7 @@ exports.allowedWorkspaceExtensions = [
     'neverConnectToCloud',
     'sync',
     'useLegacyCache',
+    'maxCacheSize',
 ];
 if (!patched) {
     Module.prototype.require = function () {

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/config/nx-json.d.ts

@@ -490,6 +490,10 @@ export interface NxJsonConfiguration<T = '*' | string[]> {
      * Use the legacy file system cache instead of the db cache
      */
     useLegacyCache?: boolean;
+    /**
+     * Sets the maximum size of the local cache. Accepts a number followed by a unit (e.g. 100MB). Accepted units are B, KB, MB, and GB.
+     */
+    maxCacheSize?: string;
 }
 export type PluginConfiguration = string | ExpandedPluginConfiguration;
 export type ExpandedPluginConfiguration<T = unknown> = {