nx 21.0.0-beta.10 → 21.0.0-beta.11

package/migrations.json

@@ -33,6 +33,16 @@
       "version": "21.0.0-beta.1",
       "description": "Updates release version config based on the breaking changes in Nx v21",
       "implementation": "./src/migrations/update-21-0-0/release-version-config-changes"
+    },
+    "remove-legacy-cache": {
+      "version": "21.0.0-beta.8",
+      "description": "Removes the legacy cache configuration from nx.json",
+      "implementation": "./src/migrations/update-21-0-0/remove-legacy-cache"
+    },
+    "remove-custom-tasks-runner": {
+      "version": "21.0.0-beta.8",
+      "description": "Removes the legacy cache configuration from nx.json",
+      "implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner"
     }
   }
 }

package/package.json

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

package/schemas/nx-schema.json

@@ -543,6 +543,11 @@
             "type": "object"
           }
         },
+        "continuous": {
+          "type": "boolean",
+          "default": false,
+          "description": "Whether this target runs continuously until stopped"
+        },
         "parallelism": {
           "type": "boolean",
           "default": true,

package/src/adapter/angular-json.js

@@ -18,6 +18,17 @@ exports.NxAngularJsonPlugin = {
             projects: readAngularJson(ctx.workspaceRoot),
         }),
     ],
+    createNodesV2: [
+        'angular.json',
+        (f, _, ctx) => [
+            [
+                'angular.json',
+                {
+                    projects: readAngularJson(ctx.workspaceRoot),
+                },
+            ],
+        ],
+    ],
 };
 exports.default = exports.NxAngularJsonPlugin;
 function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {

package/src/command-line/migrate/migrate-ui-api.js

@@ -72,7 +72,7 @@ async function runSingleMigration(workspacePath, migration, configuration) {
         // 1. The CLI path to the migrated modules. The version of Nx is of the user's choosing. This may or may not have the new migrate API, so Console will check that `runSingleMigration` exists before using it.
         // 2. Bundled into Console, so the version is fixed to what we build Console with.
         const updatedMigrateModule = await Promise.resolve().then(() => require('./migrate.js'));
-        const fileChanges = await updatedMigrateModule.runNxOrAngularMigration(workspacePath, migration, false, configuration.createCommits, configuration.commitPrefix || 'chore: [nx migration] ', undefined, true);
+        const { changes: fileChanges } = await updatedMigrateModule.runNxOrAngularMigration(workspacePath, migration, false, configuration.createCommits, configuration.commitPrefix || 'chore: [nx migration] ', undefined, true);
         const gitRefAfter = (0, child_process_1.execSync)('git rev-parse HEAD', {
             cwd: workspacePath,
             encoding: 'utf-8',

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

@@ -101,17 +101,23 @@ export declare function executeMigrations(root: string, migrations: {
     description?: string;
     version: string;
 }[], isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string): Promise<{
-    package: string;
-    name: string;
-    description?: string;
-    version: string;
-}[]>;
+    migrationsWithNoChanges: {
+        package: string;
+        name: string;
+        description?: string;
+        version: string;
+    }[];
+    nextSteps: string[];
+}>;
 export declare function runNxOrAngularMigration(root: string, migration: {
     package: string;
     name: string;
     description?: string;
     version: string;
-}, isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string, installDepsIfChanged?: () => void, handleInstallDeps?: boolean): Promise<FileChange[]>;
+}, isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string, installDepsIfChanged?: () => void, handleInstallDeps?: boolean): Promise<{
+    changes: FileChange[];
+    nextSteps: string[];
+}>;
 export declare function migrate(root: string, args: {
     [k: string]: any;
 }, rawArgs: string[]): Promise<number>;

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

@@ -935,10 +935,12 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
     logger_1.logger.info(`Running the following migrations:`);
     sortedMigrations.forEach((m) => logger_1.logger.info(`- ${m.package}: ${m.name} (${m.description})`));
     logger_1.logger.info(`---------------------------------------------------------\n`);
+    const allNextSteps = [];
     for (const m of sortedMigrations) {
         logger_1.logger.info(`Running migration ${m.package}: ${m.name}`);
         try {
-            const changes = await runNxOrAngularMigration(root, m, isVerbose, shouldCreateCommits, commitPrefix, () => changedDepInstaller.installDepsIfChanged());
+            const { changes, nextSteps } = await runNxOrAngularMigration(root, m, isVerbose, shouldCreateCommits, commitPrefix, () => changedDepInstaller.installDepsIfChanged());
+            allNextSteps.push(...nextSteps);
             if (changes.length === 0) {
                 migrationsWithNoChanges.push(m);
             }
@@ -954,7 +956,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
     if (!shouldCreateCommits) {
         changedDepInstaller.installDepsIfChanged();
     }
-    return migrationsWithNoChanges;
+    return { migrationsWithNoChanges, nextSteps: allNextSteps };
 }
 class ChangedDepInstaller {
     constructor(root) {
@@ -976,13 +978,14 @@ async function runNxOrAngularMigration(root, migration, isVerbose, shouldCreateC
     }
     const { collection, collectionPath } = readMigrationCollection(migration.package, root);
     let changes = [];
+    let nextSteps = [];
     if (!isAngularMigration(collection, migration.name)) {
-        changes = await runNxMigration(root, collectionPath, collection, migration.name);
+        ({ nextSteps, changes } = await runNxMigration(root, collectionPath, collection, migration.name));
         logger_1.logger.info(`Ran ${migration.name} from ${migration.package}`);
         logger_1.logger.info(`  ${migration.description}\n`);
         if (changes.length < 1) {
             logger_1.logger.info(`No changes were made\n`);
-            return [];
+            return { changes, nextSteps };
         }
         logger_1.logger.info('Changes:');
         (0, tree_1.printChanges)(changes, '  ');
@@ -996,7 +999,7 @@ async function runNxOrAngularMigration(root, migration, isVerbose, shouldCreateC
         logger_1.logger.info(`  ${migration.description}\n`);
         if (!madeChanges) {
             logger_1.logger.info(`No changes were made\n`);
-            return [];
+            return { changes, nextSteps };
         }
         logger_1.logger.info('Changes:');
         loggingQueue.forEach((log) => logger_1.logger.info('  ' + log));
@@ -1022,7 +1025,7 @@ async function runNxOrAngularMigration(root, migration, isVerbose, shouldCreateC
     else if (handleInstallDeps) {
         installDepsIfChanged();
     }
-    return changes;
+    return { changes, nextSteps };
 }
 async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits = false, commitPrefix) {
     if (!process.env.NX_MIGRATE_SKIP_INSTALL) {
@@ -1056,7 +1059,7 @@ async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits =
             (shouldCreateCommits ? ', with each applied in a dedicated commit' : ''),
     });
     const migrations = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, opts.runMigrations)).migrations;
-    const migrationsWithNoChanges = await executeMigrations(root, migrations, isVerbose, shouldCreateCommits, commitPrefix);
+    const { migrationsWithNoChanges, nextSteps } = await executeMigrations(root, migrations, isVerbose, shouldCreateCommits, commitPrefix);
     if (migrationsWithNoChanges.length < migrations.length) {
         output_1.output.success({
             title: `Successfully finished running migrations from '${opts.runMigrations}'. This workspace is up to date!`,
@@ -1067,6 +1070,12 @@ async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits =
             title: `No changes were made from running '${opts.runMigrations}'. This workspace is up to date!`,
         });
     }
+    if (nextSteps.length > 0) {
+        output_1.output.log({
+            title: `Some migrations have additional information, see below.`,
+            bodyLines: nextSteps.map((line) => `- ${line}`),
+        });
+    }
 }
 function getStringifiedPackageJsonDeps(root) {
     try {
@@ -1083,11 +1092,18 @@ async function runNxMigration(root, collectionPath, collection, name) {
     const { path: implPath, fnSymbol } = getImplementationPath(collection, collectionPath, name);
     const fn = require(implPath)[fnSymbol];
     const host = new tree_1.FsTree(root, process.env.NX_VERBOSE_LOGGING === 'true', `migration ${collection.name}:${name}`);
-    await fn(host, {});
+    let nextSteps = await fn(host, {});
+    // This accounts for migrations that mistakenly return a generator callback
+    // from a migration. We've never executed these, so its not a breaking change that
+    // we don't call them now... but currently shipping a migration with one wouldn't break
+    // the migrate flow, so we are being cautious.
+    if (!isStringArray(nextSteps)) {
+        nextSteps = [];
+    }
     host.lock();
     const changes = host.listChanges();
     (0, tree_1.flushChanges)(root, changes);
-    return changes;
+    return { changes, nextSteps };
 }
 async function migrate(root, args, rawArgs) {
     await client_1.daemonClient.stop();
@@ -1230,3 +1246,9 @@ const getNgCompatLayer = (() => {
         return _ngCliAdapter;
     };
 })();
+function isStringArray(value) {
+    if (!Array.isArray(value)) {
+        return false;
+    }
+    return value.every((v) => typeof v === 'string');
+}

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

@@ -20,8 +20,8 @@ async function repair(args, extraMigrations = []) {
             return agg;
         }, []);
         const migrations = [...nxMigrations, ...extraMigrations];
-        const migrationsThatMadeNoChanges = await (0, migrate_1.executeMigrations)(process.cwd(), migrations, args.verbose, false, '');
-        if (migrationsThatMadeNoChanges.length < migrations.length) {
+        const { migrationsWithNoChanges, nextSteps } = await (0, migrate_1.executeMigrations)(process.cwd(), migrations, args.verbose, false, '');
+        if (migrationsWithNoChanges.length < migrations.length) {
             output_1.output.success({
                 title: `Successfully repaired your configuration. This workspace is up to date!`,
             });
@@ -31,5 +31,11 @@ async function repair(args, extraMigrations = []) {
                 title: `No changes were necessary. This workspace is up to date!`,
             });
         }
+        if (nextSteps.length) {
+            output_1.output.log({
+                title: 'Some repairs have additional information, see below.',
+                bodyLines: nextSteps.map((line) => `  - ${line}`),
+            });
+        }
     });
 }

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

@@ -182,7 +182,7 @@ async function getReportData() {
             nxKeyError = e;
         }
     }
-    let cache = (0, cache_1.dbCacheEnabled)(nxJson)
+    let cache = (0, cache_1.dbCacheEnabled)()
         ? {
             max: nxJson.maxCacheSize !== undefined
                 ? (0, cache_1.parseMaxCacheSize)(nxJson.maxCacheSize)

package/src/config/misc-interfaces.d.ts

@@ -3,7 +3,8 @@ import { ProjectGraph } from './project-graph';
 import { Task, TaskGraph } from './task-graph';
 import { TargetConfiguration, ProjectsConfigurations } from './workspace-json-project-json';
 import type { NxJsonConfiguration } from './nx-json';
-import { Schema } from '../utils/params';
+import type { Schema } from '../utils/params';
+import type { Tree } from '../generators/tree';
 /**
  * A callback function that is executed after changes are made to the file system
  */
@@ -50,6 +51,13 @@ export type PackageJsonUpdates = {
         requires?: Record<string, string>;
     };
 };
+/**
+ * Represents a migration that is executed when running `nx migrate`.
+ *
+ * Returning a string[] from the migration function will be interpreted as
+ * a list of next steps to be displayed to the user.
+ */
+export type Migration = (tree: Tree) => void | Promise<void> | string[] | Promise<string[]>;
 export interface MigrationsJsonEntry {
     version: string;
     description?: string;

package/src/config/nx-json.d.ts

@@ -590,10 +590,6 @@ export interface NxJsonConfiguration<T = '*' | string[]> {
      * Configuration for the `nx sync` command.
      */
     sync?: NxSyncConfiguration;
-    /**
-     * 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.
      */