nx 21.0.0-rc.2 → 21.0.0-rc.4

package/bin/nx.js

@@ -18,6 +18,12 @@ const workspace_context_1 = require("../src/utils/workspace-context");
 const client_1 = require("../src/daemon/client/client");
 const db_connection_1 = require("../src/utils/db-connection");
 const exit_codes_1 = require("../src/utils/exit-codes");
+// In case Nx Cloud forcibly exits while the TUI is running, ensure the terminal is restored etc.
+process.on('exit', (...args) => {
+    if (typeof globalThis.tuiOnProcessExit === 'function') {
+        globalThis.tuiOnProcessExit(...args);
+    }
+});
 function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&

package/package.json

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

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

@@ -19,6 +19,7 @@ const fs_1 = require("fs");
 const configuration_1 = require("../../config/configuration");
 const versions_1 = require("../../utils/versions");
 const child_process_1 = require("../../utils/child-process");
+const fileutils_1 = require("../../utils/fileutils");
 function installPluginPackages(repoRoot, pmc = (0, package_manager_1.getPackageManagerCommand)(), plugins) {
     if (plugins.length === 0) {
         return;
@@ -33,6 +34,7 @@ function installPluginPackages(repoRoot, pmc = (0, package_manager_1.getPackageM
         for (const plugin of plugins) {
             nxJson.installation.plugins[plugin] = versions_1.nxVersion;
         }
+        (0, fileutils_1.writeJsonFile)((0, path_1.join)(repoRoot, 'nx.json'), nxJson);
         // Invoking nx wrapper to install plugins.
         (0, child_process_1.runNxSync)('--version', { stdio: 'ignore' });
     }
@@ -47,21 +49,15 @@ function installPluginPackages(repoRoot, pmc = (0, package_manager_1.getPackageM
  * @returns void
  */
 async function runPluginInitGenerator(plugin, repoRoot = workspace_root_1.workspaceRoot, updatePackageScripts = false, verbose = false, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
+    let command = `g ${plugin}:init ${verbose ? '--verbose' : ''}`;
     try {
         const { schema } = (0, generator_utils_1.getGeneratorInformation)(plugin, 'init', workspace_root_1.workspaceRoot, {});
-        let command = `g ${plugin}:init ${verbose ? '--verbose' : ''}`;
         if (!!schema.properties['keepExistingVersions']) {
             command += ` --keepExistingVersions`;
         }
         if (updatePackageScripts && !!schema.properties['updatePackageScripts']) {
             command += ` --updatePackageScripts`;
         }
-        (0, child_process_1.runNxSync)(command, {
-            stdio: [0, 1, 2],
-            cwd: repoRoot,
-            windowsHide: false,
-            packageManagerCommand: pmc,
-        });
     }
     catch {
         // init generator does not exist, so this function should noop
@@ -72,6 +68,12 @@ async function runPluginInitGenerator(plugin, repoRoot = workspace_root_1.worksp
         }
         return;
     }
+    (0, child_process_1.runNxSync)(command, {
+        stdio: [0, 1, 2],
+        cwd: repoRoot,
+        windowsHide: false,
+        packageManagerCommand: pmc,
+    });
 }
 /**
  * Install plugins

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

@@ -38,7 +38,7 @@ async function initHandler(options) {
             await (0, react_1.addNxToCraRepo)(options);
             (0, utils_1.printFinalMessage)({
                 learnMoreLink: options.integrated
-                    ? 'https://nx.dev/getting-started/tutorials/react-monorepo-tutorial'
+                    ? 'https://nx.dev/tutorials/2-react-monorepo/1r-introduction/1-welcome'
                     : 'https://nx.dev/getting-started/tutorials/react-standalone-tutorial',
             });
             return;

package/src/command-line/release/publish.js

@@ -167,7 +167,7 @@ async function runPublishOnProjects(args, projectGraph, nxJson, projectNames, ex
      * NOTE: Force TUI to be disabled for now.
      */
     process.env.NX_TUI = 'false';
-    const commandResults = await (0, run_command_1.runCommandForTasks)(projectsWithTarget, projectGraph, { nxJson }, {
+    const { taskResults } = await (0, run_command_1.runCommandForTasks)(projectsWithTarget, projectGraph, { nxJson }, {
         targets: [requiredTargetName],
         outputStyle: 'static',
         ...args,
@@ -175,13 +175,13 @@ async function runPublishOnProjects(args, projectGraph, nxJson, projectNames, ex
         nxIgnoreCycles: true,
     }, overrides, null, {}, extraOptions);
     const publishProjectsResult = {};
-    for (const taskData of Object.values(commandResults)) {
+    for (const taskData of Object.values(taskResults)) {
         publishProjectsResult[taskData.task.target.project] = {
             code: taskData.code,
         };
     }
     await (0, tasks_execution_hooks_1.runPostTasksExecution)({
-        taskResults: commandResults,
+        taskResults,
         workspaceRoot: workspace_root_1.workspaceRoot,
         nxJsonConfiguration: nxJson,
     });

package/src/command-line/release/version/release-group-processor.js

@@ -245,6 +245,7 @@ class ReleaseGroupProcessor {
     async setupProjectsToProcess() {
         // Track the projects being directly versioned
         let projectsToProcess = new Set();
+        const resolveVersionActionsForProjectCallbacks = [];
         // Precompute all projects in nx release config
         for (const [groupName, group] of Object.entries(this.nxReleaseConfig.groups)) {
             for (const project of group.projects) {
@@ -276,11 +277,22 @@ class ReleaseGroupProcessor {
                 // Resolve the final configuration for the project
                 const finalConfigForProject = this.resolveFinalConfigForProject(releaseGroup, projectGraphNode);
                 this.finalConfigsByProject.set(project, finalConfigForProject);
-                const { versionActionsPath, versionActions, afterAllProjectsVersioned, } = await (0, version_actions_1.resolveVersionActionsForProject)(this.tree, releaseGroup, projectGraphNode, finalConfigForProject);
-                if (!this.uniqueAfterAllProjectsVersioned.has(versionActionsPath)) {
-                    this.uniqueAfterAllProjectsVersioned.set(versionActionsPath, afterAllProjectsVersioned);
-                }
-                this.projectsToVersionActions.set(project, versionActions);
+                /**
+                 * For our versionActions validation to accurate, we need to wait until the full allProjectsToProcess
+                 * set is populated so that all dependencies, including those across release groups, are included.
+                 *
+                 * In order to save us fully traversing the graph again to arrive at this project level, schedule a callback
+                 * to resolve the versionActions for the project only once we have all the projects to process.
+                 */
+                resolveVersionActionsForProjectCallbacks.push(async () => {
+                    const { versionActionsPath, versionActions, afterAllProjectsVersioned, } = await (0, version_actions_1.resolveVersionActionsForProject)(this.tree, releaseGroup, projectGraphNode, finalConfigForProject, 
+                    // Will be fully populated by the time this callback is executed
+                    this.allProjectsToProcess.has(project));
+                    if (!this.uniqueAfterAllProjectsVersioned.has(versionActionsPath)) {
+                        this.uniqueAfterAllProjectsVersioned.set(versionActionsPath, afterAllProjectsVersioned);
+                    }
+                    this.projectsToVersionActions.set(project, versionActions);
+                });
             }
         }
         // If no filters are applied, process all projects
@@ -293,6 +305,10 @@ class ReleaseGroupProcessor {
             throw new Error('No projects are set to be processed, please report this as a bug on https://github.com/nrwl/nx/issues');
         }
         this.allProjectsToProcess = new Set(projectsToProcess);
+        // Execute all the callbacks to resolve the version actions for the projects
+        for (const cb of resolveVersionActionsForProjectCallbacks) {
+            await cb();
+        }
     }
     /**
      * Find all dependents that should be processed due to dependency updates

package/src/command-line/release/version/test-utils.d.ts

@@ -77,7 +77,7 @@ export declare class ExampleNonSemverVersionActions extends VersionActions {
 export declare function parseGraphDefinition(definition: string): {
     projects: any;
 };
-export declare function mockResolveVersionActionsForProjectImplementation(tree: Tree, releaseGroup: any, projectGraphNode: any, finalConfigForProject: FinalConfigForProject): Promise<{
+export declare function mockResolveVersionActionsForProjectImplementation(tree: Tree, releaseGroup: any, projectGraphNode: any, finalConfigForProject: FinalConfigForProject, isInProjectsToProcess: boolean): Promise<{
     versionActionsPath: string;
     versionActions: ExampleRustVersionActions;
     afterAllProjectsVersioned?: undefined;

package/src/command-line/release/version/test-utils.js

@@ -377,13 +377,13 @@ function setupGraph(tree, graph) {
 }
 const exampleRustVersionActions = '__EXAMPLE_RUST_VERSION_ACTIONS__';
 const exampleNonSemverVersionActions = '__EXAMPLE_NON_SEMVER_VERSION_ACTIONS__';
-async function mockResolveVersionActionsForProjectImplementation(tree, releaseGroup, projectGraphNode, finalConfigForProject) {
+async function mockResolveVersionActionsForProjectImplementation(tree, releaseGroup, projectGraphNode, finalConfigForProject, isInProjectsToProcess) {
     if (projectGraphNode.data.release?.versionActions ===
         exampleRustVersionActions ||
         releaseGroup.versionActions === exampleRustVersionActions) {
         const versionActions = new ExampleRustVersionActions(releaseGroup, projectGraphNode, finalConfigForProject);
         // Initialize the versionActions with all the required manifest paths etc
-        await versionActions.init(tree);
+        await versionActions.init(tree, isInProjectsToProcess);
         return {
             versionActionsPath: exampleRustVersionActions,
             versionActions,
@@ -394,7 +394,7 @@ async function mockResolveVersionActionsForProjectImplementation(tree, releaseGr
         releaseGroup.versionActions === exampleNonSemverVersionActions) {
         const versionActions = new ExampleNonSemverVersionActions(releaseGroup, projectGraphNode, finalConfigForProject);
         // Initialize the versionActions with all the required manifest paths etc
-        await versionActions.init(tree);
+        await versionActions.init(tree, isInProjectsToProcess);
         return {
             versionActionsPath: exampleNonSemverVersionActions,
             versionActions,
@@ -406,7 +406,7 @@ async function mockResolveVersionActionsForProjectImplementation(tree, releaseGr
     const JsVersionActions = loaded.default;
     const versionActions = new JsVersionActions(releaseGroup, projectGraphNode, finalConfigForProject);
     // Initialize the versionActions with all the required manifest paths etc
-    await versionActions.init(tree);
+    await versionActions.init(tree, isInProjectsToProcess);
     return {
         versionActionsPath,
         versionActions: versionActions,

package/src/command-line/release/version/version-actions.d.ts

@@ -27,7 +27,7 @@ export type AfterAllProjectsVersioned = (cwd: string, opts: {
     changedFiles: string[];
     deletedFiles: string[];
 }>;
-export declare function resolveVersionActionsForProject(tree: Tree, releaseGroup: ReleaseGroupWithName, projectGraphNode: ProjectGraphProjectNode, finalConfigForProject: FinalConfigForProject): Promise<{
+export declare function resolveVersionActionsForProject(tree: Tree, releaseGroup: ReleaseGroupWithName, projectGraphNode: ProjectGraphProjectNode, finalConfigForProject: FinalConfigForProject, isInProjectsToProcess: boolean): Promise<{
     versionActionsPath: string;
     versionActions: VersionActions;
     afterAllProjectsVersioned: AfterAllProjectsVersioned;
@@ -61,7 +61,7 @@ export declare abstract class VersionActions {
     /**
      * Asynchronous initialization of the version actions and validation of certain configuration options.
      */
-    init(tree: Tree): Promise<void>;
+    init(tree: Tree, isInProjectsToProcess: boolean): Promise<void>;
     /**
      * The default implementation will calculate the new version based on semver. If semver is not applicable to a
      * particular versioning use-case, this method should be overridden with custom logic.

package/src/command-line/release/version/version-actions.js

@@ -32,7 +32,7 @@ function resolveVersionActionsPath(path, projectGraphNode) {
     }
 }
 const versionActionsResolutionCache = new Map();
-async function resolveVersionActionsForProject(tree, releaseGroup, projectGraphNode, finalConfigForProject) {
+async function resolveVersionActionsForProject(tree, releaseGroup, projectGraphNode, finalConfigForProject, isInProjectsToProcess) {
     // Project level release version config takes priority, if set
     const projectVersionConfig = projectGraphNode.data.release?.version;
     const releaseGroupVersionConfig = releaseGroup.version;
@@ -76,7 +76,7 @@ async function resolveVersionActionsForProject(tree, releaseGroup, projectGraphN
     }
     const versionActions = new VersionActionsClass(releaseGroup, projectGraphNode, finalConfigForProject);
     // Initialize the version actions with all the required manifest paths etc
-    await versionActions.init(tree);
+    await versionActions.init(tree, isInProjectsToProcess);
     return {
         versionActionsPath,
         versionActions,
@@ -101,7 +101,7 @@ class VersionActions {
     /**
      * Asynchronous initialization of the version actions and validation of certain configuration options.
      */
-    async init(tree) {
+    async init(tree, isInProjectsToProcess) {
         // Default to the first available source manifest root, if applicable, if no custom manifest roots are provided
         if (this.validManifestFilenames?.length &&
             this.finalConfigForProject.manifestRootsToUpdate.length === 0) {
@@ -138,11 +138,17 @@ class VersionActions {
                     break;
                 }
             }
-            if (!hasValidManifest) {
+            /**
+             * If projects or groups filters are applied, it is possible that the project is not being actively processed
+             * and we should not throw an error in this case.
+             */
+            if (!hasValidManifest && isInProjectsToProcess) {
                 const validManifestFilenames = this.validManifestFilenames?.join(' or ');
                 throw new Error(`The project "${this.projectGraphNode.name}" does not have a ${validManifestFilenames} file available in ./${interpolatedManifestRoot.path}.
-          
-To fix this you will either need to add a ${validManifestFilenames} file at that location, or configure "release" within your nx.json to exclude "${this.projectGraphNode.name}" from the current release group, or amend the "release.version.manifestRootsToUpdate" configuration to point to where the relevant manifest should be.`);
+
+To fix this you will either need to add a ${validManifestFilenames} file at that location, or configure "release" within your nx.json to exclude "${this.projectGraphNode.name}" from the current release group, or amend the "release.version.manifestRootsToUpdate" configuration to point to where the relevant manifest should be.
+
+It is also possible that the project is being processed because of a dependency relationship between what you are directly versioning and the project/release group, in which case you will need to amend your filters to include all relevant projects and release groups.`);
             }
         }
     }

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

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetHandler = resetHandler;
 const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const client_1 = require("../../daemon/client/client");
 const cache_directory_1 = require("../../utils/cache-directory");
 const output_1 = require("../../utils/output");
 const native_file_cache_location_1 = require("../../native/native-file-cache-location");
 const client_2 = require("../../nx-cloud/utilities/client");
 const get_cloud_options_1 = require("../../nx-cloud/utilities/get-cloud-options");
+const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
+const configuration_1 = require("../../config/configuration");
+const update_manager_1 = require("../../nx-cloud/update-manager");
 // Wait at max 5 seconds before giving up on a failing operation.
 const INCREMENTAL_BACKOFF_MAX_DURATION = 5000;
 // If an operation fails, wait 100ms before first retry.
@@ -17,6 +21,8 @@ async function resetHandler(args) {
     const all = args.onlyDaemon === undefined &&
         args.onlyCache === undefined &&
         args.onlyWorkspaceData === undefined;
+    const nxJson = (0, configuration_1.readNxJson)();
+    const cloudEnabled = (0, nx_cloud_utils_1.isNxCloudUsed)(nxJson);
     const startupMessage = all
         ? 'Resetting the Nx cache and stopping the daemon.'
         : 'Resetting:';
@@ -31,6 +37,9 @@ async function resetHandler(args) {
         if (args.onlyWorkspaceData) {
             bodyLines.push('- Workspace data directory');
         }
+        if (args.onlyCloud && cloudEnabled) {
+            bodyLines.push('- Nx Cloud Client');
+        }
     }
     output_1.output.note({ title: startupMessage, bodyLines });
     if (all || args.onlyDaemon) {
@@ -63,9 +72,10 @@ async function resetHandler(args) {
             errors.push('Failed to clean up the workspace data directory.', e.toString());
         }
     }
-    if (all || args.onlyCloud) {
+    if ((cloudEnabled && all) || args.onlyCloud) {
         try {
             await resetCloudClient();
+            await removeInstalledNxCloudClient();
         }
         catch (e) {
             errors.push('Failed to reset the Nx Cloud client.', e.toString());
@@ -97,6 +107,12 @@ async function resetCloudClient() {
     }
     catch { }
 }
+function removeInstalledNxCloudClient() {
+    return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
+        const cloudClientDir = (0, update_manager_1.getBundleInstallDefaultLocation)();
+        (0, node_fs_1.rmSync)((0, node_path_1.join)(cloudClientDir, 'cloud'), { recursive: true, force: true });
+    });
+}
 function cleanupCacheEntries() {
     return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
         (0, node_fs_1.rmSync)(cache_directory_1.cacheDir, { recursive: true, force: true });

package/src/command-line/yargs-utils/shared-options.d.ts

@@ -64,13 +64,15 @@ export declare function withOverrides<T extends {
 }>(args: T, commandLevel?: number): T & {
     __overrides_unparsed__: string[];
 };
-declare const allOutputStyles: readonly ["tui", "dynamic", "dynamic-legacy", "static", "stream", "stream-without-prefixes", "compact"];
+declare const allOutputStyles: readonly ["tui", "dynamic", "dynamic-legacy", "static", "stream", "stream-without-prefixes"];
 export type OutputStyle = (typeof allOutputStyles)[number];
-export declare function withOutputStyleOption(yargs: Argv, choices?: ReadonlyArray<OutputStyle>): Argv<{
-    "output-style": string;
+export declare function withOutputStyleOption<T>(yargs: Argv<T>, choices?: ReadonlyArray<OutputStyle>): Argv<T & {
+    outputStyle: OutputStyle;
 }>;
 export declare function withRunOneOptions(yargs: Argv): Argv<{
-    "output-style": string;
+    configuration: string;
+} & {
+    outputStyle: OutputStyle;
 } & RunOptions & {
     project: string;
 } & {

package/src/command-line/yargs-utils/shared-options.js

@@ -237,7 +237,6 @@ const allOutputStyles = [
     'static',
     'stream',
     'stream-without-prefixes',
-    'compact',
 ];
 function withOutputStyleOption(yargs, choices = [
     'dynamic-legacy',
@@ -248,7 +247,7 @@ function withOutputStyleOption(yargs, choices = [
     'stream-without-prefixes',
 ]) {
     return yargs
-        .option('output-style', {
+        .option('outputStyle', {
         describe: `Defines how Nx emits outputs tasks logs. **tui**: enables the Nx Terminal UI, recommended for local development environments. **dynamic-legacy**: use dynamic-legacy output life cycle, previous content is overwritten or modified as new outputs are added, display minimal logs by default, always show errors. This output format is recommended for local development environments where tui is not supported. **static**: uses static output life cycle, no previous content is rewritten or modified as new outputs are added. This output format is recommened for CI environments. **stream**: nx by default logs output to an internal output stream, enable this option to stream logs to stdout / stderr. **stream-without-prefixes**: nx prefixes the project name the target is running on, use this option remove the project name prefix from output.`,
         type: 'string',
         choices,