nx 19.5.1 → 19.5.2

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.2",
   "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.2"
   },
   "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.2",
+    "@nx/nx-darwin-arm64": "19.5.2",
+    "@nx/nx-linux-x64-gnu": "19.5.2",
+    "@nx/nx-linux-x64-musl": "19.5.2",
+    "@nx/nx-win32-x64-msvc": "19.5.2",
+    "@nx/nx-linux-arm64-gnu": "19.5.2",
+    "@nx/nx-linux-arm64-musl": "19.5.2",
+    "@nx/nx-linux-arm-gnueabihf": "19.5.2",
+    "@nx/nx-win32-arm64-msvc": "19.5.2",
+    "@nx/nx-freebsd-x64": "19.5.2"
   },
   "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/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/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 };