nx 19.2.0-canary.20240604-0594deb → 19.2.0-canary.20240605-5a06daa

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

@@ -6,25 +6,107 @@ 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");
-async function resetHandler() {
-    output_1.output.note({
-        title: 'Resetting the Nx workspace cache and stopping the Nx Daemon.',
-        bodyLines: [`This might take a few minutes.`],
+// 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.
+const INCREMENTAL_BACKOFF_FIRST_DELAY = 100;
+async function resetHandler(args) {
+    let errors = [];
+    const all = args.onlyDaemon === undefined &&
+        args.onlyCache === undefined &&
+        args.onlyWorkspaceData === undefined;
+    const startupMessage = all
+        ? 'Resetting the Nx cache and stopping the daemon.'
+        : 'Resetting:';
+    const bodyLines = [];
+    if (!all) {
+        if (args.onlyDaemon) {
+            bodyLines.push('- Nx Daemon');
+        }
+        if (args.onlyCache) {
+            bodyLines.push('- Cache directory');
+        }
+        if (args.onlyWorkspaceData) {
+            bodyLines.push('- Workspace data directory');
+        }
+    }
+    output_1.output.note({ title: startupMessage, bodyLines });
+    if (all || args.onlyDaemon) {
+        try {
+            await killDaemon();
+        }
+        catch {
+            errors.push('Failed to stop the Nx Daemon.');
+        }
+    }
+    if (all || args.onlyCache) {
+        try {
+            await cleanupCacheEntries();
+        }
+        catch {
+            errors.push('Failed to clean up the cache directory.');
+        }
+    }
+    if (all || args.onlyWorkspaceData) {
+        try {
+            await cleanupNativeFileCache();
+        }
+        catch {
+            errors.push('Failed to clean up the native file cache.');
+        }
+        try {
+            await cleanupWorkspaceData();
+        }
+        catch {
+            errors.push('Failed to clean up the workspace data directory.');
+        }
+    }
+    if (errors.length > 0) {
+        output_1.output.error({
+            title: 'Failed to reset the Nx workspace.',
+            bodyLines: errors,
+        });
+        process.exit(1);
+    }
+    else {
+        output_1.output.success({
+            title: 'Successfully reset the Nx workspace.',
+        });
+    }
+}
+exports.resetHandler = resetHandler;
+function killDaemon() {
+    return client_1.daemonClient.stop();
+}
+function cleanupCacheEntries() {
+    return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
+        (0, fs_extra_1.rmSync)(cache_directory_1.cacheDir, { recursive: true, force: true });
     });
-    await client_1.daemonClient.stop();
-    output_1.output.log({ title: 'Daemon Server - Stopped' });
-    try {
+}
+function cleanupNativeFileCache() {
+    return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
         (0, fs_extra_1.rmSync)((0, native_file_cache_location_1.getNativeFileCacheLocation)(), { recursive: true, force: true });
+    });
+}
+function cleanupWorkspaceData() {
+    return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
+        (0, fs_extra_1.rmSync)(cache_directory_1.workspaceDataDirectory, { recursive: true, force: true });
+    });
+}
+async function incrementalBackoff(ms, maxDuration, callback) {
+    try {
+        callback();
     }
     catch (e) {
-        // ignore, deleting the native file cache is not critical and can fail if another process is locking the file
-    }
-    (0, fs_extra_1.rmSync)(cache_directory_1.cacheDir, { recursive: true, force: true });
-    if (cache_directory_1.projectGraphCacheDirectory !== cache_directory_1.cacheDir) {
-        (0, fs_extra_1.rmSync)(cache_directory_1.projectGraphCacheDirectory, { recursive: true, force: true });
+        if (ms < maxDuration) {
+            await sleep(ms);
+            await incrementalBackoff(ms * 2, maxDuration, callback);
+        }
+        else {
+            throw e;
+        }
     }
-    output_1.output.success({
-        title: 'Successfully reset the Nx workspace.',
-    });
 }
-exports.resetHandler = resetHandler;
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}

package/src/command-line/run/command-object.js

@@ -13,9 +13,12 @@ exports.yargsRunCommand = {
 
     You can skip the use of Nx cache by using the --skip-nx-cache option.`,
     builder: (yargs) => (0, shared_options_1.withRunOneOptions)((0, shared_options_1.withBatch)(yargs)),
-    handler: async (args) => await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
-        (await Promise.resolve().then(() => require('./run-one'))).runOne(process.cwd(), (0, shared_options_1.withOverrides)(args));
-    }),
+    handler: async (args) => {
+        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+            await Promise.resolve().then(() => require('./run-one')).then((m) => m.runOne(process.cwd(), (0, shared_options_1.withOverrides)(args)));
+        });
+        process.exit(exitCode);
+    },
 };
 /**
  * Handles the infix notation for running a target.

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

@@ -45,7 +45,7 @@ export declare function runExecutor<T extends {
 }>(targetDescription: Target, overrides: {
     [k: string]: any;
 }, context: ExecutorContext): Promise<AsyncIterableIterator<T>>;
-export declare function printTargetRunHelp(targetDescription: Target, root: string): Promise<any>;
+export declare function printTargetRunHelp(targetDescription: Target, root: string): Promise<number>;
 export declare function run(cwd: string, root: string, targetDescription: Target, overrides: {
     [k: string]: any;
-}, isVerbose: boolean, taskGraph: TaskGraph): Promise<any>;
+}, isVerbose: boolean, taskGraph: TaskGraph): Promise<number>;

package/src/command-line/run-many/command-object.js

@@ -8,7 +8,10 @@ exports.yargsRunManyCommand = {
     command: 'run-many',
     describe: 'Run target for multiple listed projects',
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withRunManyOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withTargetAndConfigurationOption)((0, shared_options_1.withBatch)(yargs)))), 'run-many'),
-    handler: async (args) => await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
-        (await Promise.resolve().then(() => require('./run-many'))).runMany((0, shared_options_1.withOverrides)(args));
-    }),
+    handler: async (args) => {
+        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+            await Promise.resolve().then(() => require('./run-many')).then((m) => m.runMany((0, shared_options_1.withOverrides)(args)));
+        });
+        process.exit(exitCode);
+    },
 };

package/src/command-line/show/command-object.js

@@ -64,12 +64,12 @@ const showProjectsCommand = {
         .example('$0 show projects --affected', 'Show affected projects in the workspace')
         .example('$0 show projects --type app --affected', 'Show affected apps in the workspace')
         .example('$0 show projects --affected --exclude=*-e2e', 'Show affected projects in the workspace, excluding end-to-end projects'),
-    handler: (args) => {
-        return (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+    handler: async (args) => {
+        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             const { showProjectsHandler } = await Promise.resolve().then(() => require('./projects'));
             await showProjectsHandler(args);
-            process.exit(0);
         });
+        process.exit(exitCode);
     },
 };
 const showProjectCommand = {
@@ -105,11 +105,11 @@ const showProjectCommand = {
     })
         .example('$0 show project my-app', 'View project information for my-app in JSON format')
         .example('$0 show project my-app --web', 'View project information for my-app in the browser'),
-    handler: (args) => {
-        return (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+    handler: async (args) => {
+        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             const { showProjectHandler } = await Promise.resolve().then(() => require('./project'));
             await showProjectHandler(args);
-            process.exit(0);
         });
+        process.exit(exitCode);
     },
 };

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

@@ -89,17 +89,29 @@ export interface ExecutorConfig {
     batchImplementationFactory?: () => TaskGraphExecutor;
 }
 /**
- * Implementation of a target of a project
+ * An executor implementation that returns a promise
  */
-export type Executor<T = any> = (
+export type PromiseExecutor<T = any> = (
 /**
  * Options that users configure or pass via the command line
  */
 options: T, context: ExecutorContext) => Promise<{
     success: boolean;
-}> | AsyncIterableIterator<{
+}>;
+/**
+ * An executor implementation that returns an async iterator
+ */
+export type AsyncIteratorExecutor<T = any> = (
+/**
+ * Options that users configure or pass via the command line
+ */
+options: T, context: ExecutorContext) => AsyncIterableIterator<{
     success: boolean;
 }>;
+/**
+ * Implementation of a target of a project
+ */
+export type Executor<T = any> = PromiseExecutor<T> | AsyncIteratorExecutor<T>;
 export interface HasherContext {
     hasher: TaskHasher;
     projectGraph: ProjectGraph;

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

@@ -22,6 +22,7 @@ export interface NrwlJsPluginConfig {
     analyzeSourceFiles?: boolean;
     analyzePackageJson?: boolean;
     analyzeLockfile?: boolean;
+    projectsAffectedByDependencyUpdates?: 'all' | 'auto' | string[];
 }
 interface NxInstallationConfiguration {
     /**
@@ -188,6 +189,11 @@ interface NxReleaseConfiguration {
          * Optionally override the git/release tag pattern to use for this group.
          */
         releaseTagPattern?: string;
+        /**
+         * Enables using version plans as a specifier source for versioning and
+         * to determine changes for changelog generation.
+         */
+        versionPlans?: boolean;
     }>;
     /**
      * Configures the default value for all groups that don't explicitly state their own projectsRelationship.
@@ -254,6 +260,11 @@ interface NxReleaseConfiguration {
      */
     git?: NxReleaseGitConfiguration;
     conventionalCommits?: NxReleaseConventionalCommitsConfiguration;
+    /**
+     * Enables using version plans as a specifier source for versioning and
+     * to determine changes for changelog generation.
+     */
+    versionPlans?: boolean;
 }
 /**
  * Nx.json configuration