nx 19.5.1 → 19.5.3

package/bin/nx-cloud.d.ts

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
-export {};
+import type { CloudTaskRunnerOptions } from '../src/nx-cloud/nx-cloud-tasks-runner-shell';
+export declare function invokeCommandWithNxCloudClient(options: CloudTaskRunnerOptions): Promise<any>;

package/bin/nx-cloud.js

@@ -1,38 +1,30 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const resolution_helpers_1 = require("../src/nx-cloud/resolution-helpers");
+exports.invokeCommandWithNxCloudClient = invokeCommandWithNxCloudClient;
 const get_cloud_options_1 = require("../src/nx-cloud/utilities/get-cloud-options");
 const update_manager_1 = require("../src/nx-cloud/update-manager");
 const output_1 = require("../src/utils/output");
+const client_1 = require("../src/nx-cloud/utilities/client");
 const command = process.argv[2];
 const options = (0, get_cloud_options_1.getCloudOptions)();
 Promise.resolve().then(async () => invokeCommandWithNxCloudClient(options));
 async function invokeCommandWithNxCloudClient(options) {
     try {
-        const { nxCloudClient } = await (0, update_manager_1.verifyOrUpdateNxCloudClient)(options);
-        const paths = (0, resolution_helpers_1.findAncestorNodeModules)(__dirname, []);
-        nxCloudClient.configureLightClientRequire()(paths);
-        if (command in nxCloudClient.commands) {
-            nxCloudClient.commands[command]()
-                .then(() => process.exit(0))
-                .catch((e) => {
-                console.error(e);
-                process.exit(1);
-            });
-        }
-        else {
+        const client = await (0, client_1.getCloudClient)(options);
+        client.invoke(command);
+    }
+    catch (e) {
+        if (e instanceof client_1.UnknownCommandError) {
             output_1.output.error({
-                title: `Unknown Command "${command}"`,
+                title: `Unknown Command "${e.command}"`,
             });
             output_1.output.log({
                 title: 'Available Commands:',
-                bodyLines: Object.keys(nxCloudClient.commands).map((c) => `- ${c}`),
+                bodyLines: e.availableCommands.map((c) => `- ${c}`),
             });
             process.exit(1);
         }
-    }
-    catch (e) {
         const body = ['Cannot run commands from the `nx-cloud` CLI.'];
         if (e instanceof update_manager_1.NxCloudEnterpriseOutdatedError) {
             try {

package/bin/nx.js

@@ -167,7 +167,7 @@ function warnIfUsingOutdatedGlobalInstall(globalNxVersion, localNxVersion) {
             : [];
         bodyLines.push('For more information, see https://nx.dev/more-concepts/global-nx');
         output_1.output.warn({
-            title: `Its time to update Nx 🎉`,
+            title: `It's time to update Nx 🎉`,
             bodyLines,
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.5.1",
+  "version": "19.5.3",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.5.1"
+    "@nrwl/tao": "19.5.3"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.5.1",
-    "@nx/nx-darwin-arm64": "19.5.1",
-    "@nx/nx-linux-x64-gnu": "19.5.1",
-    "@nx/nx-linux-x64-musl": "19.5.1",
-    "@nx/nx-win32-x64-msvc": "19.5.1",
-    "@nx/nx-linux-arm64-gnu": "19.5.1",
-    "@nx/nx-linux-arm64-musl": "19.5.1",
-    "@nx/nx-linux-arm-gnueabihf": "19.5.1",
-    "@nx/nx-win32-arm64-msvc": "19.5.1",
-    "@nx/nx-freebsd-x64": "19.5.1"
+    "@nx/nx-darwin-x64": "19.5.3",
+    "@nx/nx-darwin-arm64": "19.5.3",
+    "@nx/nx-linux-x64-gnu": "19.5.3",
+    "@nx/nx-linux-x64-musl": "19.5.3",
+    "@nx/nx-win32-x64-msvc": "19.5.3",
+    "@nx/nx-linux-arm64-gnu": "19.5.3",
+    "@nx/nx-linux-arm64-musl": "19.5.3",
+    "@nx/nx-linux-arm-gnueabihf": "19.5.3",
+    "@nx/nx-win32-arm64-msvc": "19.5.3",
+    "@nx/nx-freebsd-x64": "19.5.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/ngcli-adapter.js

@@ -799,13 +799,16 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
                 import: (0, schema_utils_1.resolveImplementation)(executorConfig.implementation, (0, path_1.dirname)(executorsFilePath)),
             };
         }
-        readExecutorsJson(nodeModule, builder) {
-            const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, this.projects, this.root ? [this.root, __dirname] : [__dirname]);
+        readExecutorsJson(nodeModule, builder, extraRequirePaths = []) {
+            const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, this.projects, this.root
+                ? [this.root, __dirname, ...extraRequirePaths]
+                : [__dirname, ...extraRequirePaths]);
             const executorsFile = packageJson.executors ?? packageJson.builders;
             if (!executorsFile) {
                 throw new Error(`The "${nodeModule}" package does not support Nx executors or Angular Devkit Builders.`);
             }
-            const executorsFilePath = require.resolve((0, path_1.join)((0, path_1.dirname)(packageJsonPath), executorsFile));
+            const basePath = (0, path_1.dirname)(packageJsonPath);
+            const executorsFilePath = require.resolve((0, path_1.join)(basePath, executorsFile));
             const executorsJson = (0, fileutils_1.readJsonFile)(executorsFilePath);
             const executorConfig = executorsJson.builders?.[builder] ?? executorsJson.executors?.[builder];
             if (!executorConfig) {
@@ -814,7 +817,7 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
             if (typeof executorConfig === 'string') {
                 // Angular CLI can have a builder pointing to another package:builder
                 const [packageName, executorName] = executorConfig.split(':');
-                return this.readExecutorsJson(packageName, executorName);
+                return this.readExecutorsJson(packageName, executorName, [basePath]);
             }
             return { executorsFilePath, executorConfig, isNgCompat: true };
         }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsViewLogsCommand = exports.yargsConnectCommand = void 0;
 const documentation_1 = require("../yargs-utils/documentation");
+const versions_1 = require("../../utils/versions");
 exports.yargsConnectCommand = {
     command: 'connect',
     aliases: ['connect-to-nx-cloud'],
@@ -9,6 +10,11 @@ exports.yargsConnectCommand = {
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(yargs, 'connect-to-nx-cloud'),
     handler: async () => {
         await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand();
+        await (await Promise.resolve().then(() => require('../../utils/ab-testing'))).recordStat({
+            command: 'connect',
+            nxVersion: versions_1.nxVersion,
+            useCloud: true,
+        });
         process.exit(0);
     },
 };

package/src/command-line/connect/connect-to-nx-cloud.d.ts

@@ -4,5 +4,5 @@ import { MessageKey } from '../../utils/ab-testing';
 export declare function onlyDefaultRunnerIsUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function connectToNxCloudIfExplicitlyAsked(opts: NxArgs): Promise<void>;
 export declare function connectToNxCloudCommand(command?: string): Promise<boolean>;
+export declare function connectExistingRepoToNxCloudPrompt(command?: string, key?: MessageKey): Promise<boolean>;
 export declare function connectToNxCloudWithPrompt(command: string): Promise<void>;
-export declare function connectExistingRepoToNxCloudPrompt(key?: MessageKey): Promise<boolean>;

package/src/command-line/connect/connect-to-nx-cloud.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.onlyDefaultRunnerIsUsed = onlyDefaultRunnerIsUsed;
 exports.connectToNxCloudIfExplicitlyAsked = connectToNxCloudIfExplicitlyAsked;
 exports.connectToNxCloudCommand = connectToNxCloudCommand;
-exports.connectToNxCloudWithPrompt = connectToNxCloudWithPrompt;
 exports.connectExistingRepoToNxCloudPrompt = connectExistingRepoToNxCloudPrompt;
+exports.connectToNxCloudWithPrompt = connectToNxCloudWithPrompt;
 const output_1 = require("../../utils/output");
 const configuration_1 = require("../../config/configuration");
 const tree_1 = require("../../generators/tree");
@@ -71,6 +71,16 @@ async function connectToNxCloudCommand(command) {
     await callback();
     return true;
 }
+async function connectExistingRepoToNxCloudPrompt(command = 'init', key = 'setupNxCloud') {
+    const res = await nxCloudPrompt(key).then((value) => value === 'yes');
+    await (0, ab_testing_1.recordStat)({
+        command,
+        nxVersion: versions_1.nxVersion,
+        useCloud: res,
+        meta: ab_testing_1.messages.codeOfSelectedPromptMessage(key),
+    });
+    return res;
+}
 async function connectToNxCloudWithPrompt(command) {
     const setNxCloud = await nxCloudPrompt('setupNxCloud');
     const useCloud = setNxCloud === 'yes' ? await connectToNxCloudCommand(command) : false;
@@ -81,9 +91,6 @@ async function connectToNxCloudWithPrompt(command) {
         meta: ab_testing_1.messages.codeOfSelectedPromptMessage('setupNxCloud'),
     });
 }
-async function connectExistingRepoToNxCloudPrompt(key = 'setupNxCloud') {
-    return nxCloudPrompt(key).then((value) => value === 'yes');
-}
 async function nxCloudPrompt(key) {
     const { message, choices, initial, footer, hint } = ab_testing_1.messages.getPrompt(key);
     const promptConfig = {

package/src/command-line/connect/view-logs.js

@@ -19,7 +19,7 @@ async function viewLogs() {
         });
         return 1;
     }
-    const setupNxCloud = await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)('setupViewLogs');
+    const setupNxCloud = await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)('view-logs', 'setupViewLogs');
     if (!setupNxCloud) {
         return;
     }

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

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listHandler = listHandler;
-const workspace_root_1 = require("../../utils/workspace-root");
+const nx_json_1 = require("../../config/nx-json");
+const project_graph_1 = require("../../project-graph/project-graph");
 const output_1 = require("../../utils/output");
 const plugins_1 = require("../../utils/plugins");
-const local_plugins_1 = require("../../utils/plugins/local-plugins");
-const project_graph_1 = require("../../project-graph/project-graph");
-const nx_json_1 = require("../../config/nx-json");
+const workspace_root_1 = require("../../utils/workspace-root");
 /**
  * List available plugins or capabilities within a specific plugin
  *
@@ -16,31 +15,28 @@ const nx_json_1 = require("../../config/nx-json");
  *
  */
 async function listHandler(args) {
-    const nxJson = (0, nx_json_1.readNxJson)();
     const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
     const projects = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     if (args.plugin) {
         await (0, plugins_1.listPluginCapabilities)(args.plugin, projects.projects);
     }
     else {
-        const corePlugins = (0, plugins_1.fetchCorePlugins)();
-        const localPlugins = await (0, local_plugins_1.getLocalWorkspacePlugins)(projects, nxJson);
+        const nxJson = (0, nx_json_1.readNxJson)();
+        const localPlugins = await (0, plugins_1.getLocalWorkspacePlugins)(projects, nxJson);
         const installedPlugins = await (0, plugins_1.getInstalledPluginsAndCapabilities)(workspace_root_1.workspaceRoot, projects.projects);
         if (localPlugins.size) {
-            (0, local_plugins_1.listLocalWorkspacePlugins)(localPlugins);
+            (0, plugins_1.listPlugins)(localPlugins, 'Local workspace plugins:');
         }
-        (0, plugins_1.listInstalledPlugins)(installedPlugins);
-        (0, plugins_1.listCorePlugins)(installedPlugins, corePlugins);
+        (0, plugins_1.listPlugins)(installedPlugins, 'Installed plugins:');
+        (0, plugins_1.listAlsoAvailableCorePlugins)(installedPlugins);
         output_1.output.note({
             title: 'Community Plugins',
             bodyLines: [
                 'Looking for a technology / framework not listed above?',
                 'There are many excellent plugins maintained by the Nx community.',
-                'Search for the one you need here: https://nx.dev/plugins/registry.',
+                'Search for the one you need here: https://nx.dev/plugin-registry.',
             ],
         });
-        output_1.output.note({
-            title: `Use "nx list [plugin]" to find out more`,
-        });
+        output_1.output.note({ title: `Use "nx list [plugin]" to find out more` });
     }
 }

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

@@ -120,6 +120,7 @@ function nxCliPath() {
             },
             license: 'MIT',
         });
+        (0, package_manager_1.copyPackageManagerConfigurationFiles)(workspace_root_1.workspaceRoot, tmpDir);
         if (pmc.preInstall) {
             // ensure package.json and repo in tmp folder is set to a proper package manager state
             (0, child_process_2.execSync)(pmc.preInstall, {

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

@@ -5,6 +5,7 @@ const yargs_1 = require("yargs");
 const nx_json_1 = require("../../config/nx-json");
 const logger_1 = require("../../utils/logger");
 const shared_options_1 = require("../yargs-utils/shared-options");
+const command_line_utils_1 = require("../../utils/command-line-utils");
 exports.yargsReleaseCommand = {
     command: 'release',
     describe: 'Orchestrate versioning and publishing of applications and libraries',
@@ -223,27 +224,10 @@ const planCommand = {
     },
 };
 function coerceParallelOption(args) {
-    if (args['parallel'] === 'false' || args['parallel'] === false) {
-        return {
-            ...args,
-            parallel: 1,
-        };
-    }
-    else if (args['parallel'] === 'true' ||
-        args['parallel'] === true ||
-        args['parallel'] === '') {
-        return {
-            ...args,
-            parallel: Number(args['maxParallel'] || args['max-parallel'] || 3),
-        };
-    }
-    else if (args['parallel'] !== undefined) {
-        return {
-            ...args,
-            parallel: Number(args['parallel']),
-        };
-    }
-    return args;
+    return {
+        ...args,
+        parallel: (0, command_line_utils_1.readParallelFromArgsAndEnv)(args),
+    };
 }
 function withGitCommitAndGitTagOptions(yargs) {
     return yargs

package/src/command-line/reset/command-object.d.ts

@@ -3,5 +3,6 @@ export type ResetCommandOptions = {
     onlyCache?: boolean;
     onlyDaemon?: boolean;
     onlyWorkspaceData?: boolean;
+    onlyCloud?: boolean;
 };
 export declare const yargsResetCommand: CommandModule<Record<string, unknown>, ResetCommandOptions>;

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

@@ -13,6 +13,10 @@ exports.yargsResetCommand = {
         .option('onlyDaemon', {
         description: 'Stops the Nx Daemon, it will be restarted fresh when the next Nx command is run.',
         type: 'boolean',
+    })
+        .option('onlyCloud', {
+        description: 'Resets the Nx Cloud client. NOTE: Does not clear the remote cache.',
+        type: 'boolean',
     })
         .option('onlyWorkspaceData', {
         description: 'Clears the workspace data directory. Used by Nx to store cached data about the current workspace (e.g. partial results, incremental data, etc)',

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

@@ -6,6 +6,8 @@ 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");
 // 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.
@@ -61,6 +63,9 @@ async function resetHandler(args) {
             errors.push('Failed to clean up the workspace data directory.');
         }
     }
+    if (all || args.onlyCloud) {
+        await resetCloudClient();
+    }
     if (errors.length > 0) {
         output_1.output.error({
             title: 'Failed to reset the Nx workspace.',
@@ -77,6 +82,14 @@ async function resetHandler(args) {
 function killDaemon() {
     return client_1.daemonClient.stop();
 }
+async function resetCloudClient() {
+    // Remove nx cloud marker files. This helps if the use happens to run `nx-cloud start-ci-run` or
+    // similar commands on their local machine.
+    try {
+        (await (0, client_2.getCloudClient)((0, get_cloud_options_1.getCloudOptions)())).invoke('cleanup');
+    }
+    catch { }
+}
 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 });

package/src/command-line/run/executor-utils.js

@@ -53,15 +53,22 @@ function getExecutorInformation(nodeModule, executor, root, projects) {
         throw new Error(`Unable to resolve ${nodeModule}:${executor}.\n${e.message}`);
     }
 }
-function readExecutorJson(nodeModule, executor, root, projects) {
+function readExecutorJson(nodeModule, executor, root, projects, extraRequirePaths = []) {
     const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, projects, root
-        ? [root, __dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)()]
-        : [__dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)()]);
+        ? [
+            root,
+            __dirname,
+            process.cwd(),
+            ...(0, installation_directory_1.getNxRequirePaths)(),
+            ...extraRequirePaths,
+        ]
+        : [__dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)(), ...extraRequirePaths]);
     const executorsFile = packageJson.executors ?? packageJson.builders;
     if (!executorsFile) {
         throw new Error(`The "${nodeModule}" package does not support Nx executors.`);
     }
-    const executorsFilePath = require.resolve((0, path_1.join)((0, path_1.dirname)(packageJsonPath), executorsFile));
+    const basePath = (0, path_1.dirname)(packageJsonPath);
+    const executorsFilePath = require.resolve((0, path_1.join)(basePath, executorsFile));
     const executorsJson = (0, fileutils_1.readJsonFile)(executorsFilePath);
     const executorConfig = executorsJson.executors?.[executor] || executorsJson.builders?.[executor];
     if (!executorConfig) {
@@ -70,7 +77,9 @@ function readExecutorJson(nodeModule, executor, root, projects) {
     if (typeof executorConfig === 'string') {
         // Angular CLI can have a builder pointing to another package:builder
         const [packageName, executorName] = executorConfig.split(':');
-        return readExecutorJson(packageName, executorName, root, projects);
+        return readExecutorJson(packageName, executorName, root, projects, [
+            basePath,
+        ]);
     }
     const isNgCompat = !executorsJson.executors?.[executor];
     return { executorsFilePath, executorConfig, isNgCompat };

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

@@ -35,20 +35,8 @@ async function* promiseToIterator(v) {
     yield await v;
 }
 async function iteratorToProcessStatusCode(i) {
-    // This is a workaround to fix an issue that only happens with
-    // the @angular-devkit/build-angular:browser builder. Starting
-    // on version 12.0.1, a SASS compilation implementation was
-    // introduced making use of workers and it's unref()-ing the worker
-    // too early, causing the process to exit early in environments
-    // like CI or when running Docker builds.
-    const keepProcessAliveInterval = setInterval(() => { }, 1000);
-    try {
-        const { success } = await (0, async_iterator_1.getLastValueFromAsyncIterableIterator)(i);
-        return success ? 0 : 1;
-    }
-    finally {
-        clearInterval(keepProcessAliveInterval);
-    }
+    const { success } = await (0, async_iterator_1.getLastValueFromAsyncIterableIterator)(i);
+    return success ? 0 : 1;
 }
 async function parseExecutorAndTarget({ project, target }, root, projectsConfigurations) {
     const proj = projectsConfigurations.projects[project];

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

@@ -117,7 +117,7 @@ async function watch(args) {
     if (args.verbose) {
         process.env.NX_VERBOSE_LOGGING = 'true';
     }
-    if (client_1.daemonClient.enabled()) {
+    if (!client_1.daemonClient.enabled()) {
         output_1.output.error({
             title: 'Daemon is not running. The watch command is not supported without the Nx Daemon.',
         });