nx 19.4.0-canary.20240626-3a2e8d4 → 19.4.0-canary.20240628-336d371

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.4.0-canary.20240626-3a2e8d4",
+  "version": "19.4.0-canary.20240628-336d371",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -45,8 +45,8 @@
     "cli-cursor": "3.1.0",
     "cli-spinners": "2.6.1",
     "cliui": "^8.0.1",
-    "dotenv": "~16.3.1",
-    "dotenv-expand": "~10.0.0",
+    "dotenv": "~16.4.5",
+    "dotenv-expand": "~11.0.6",
     "enquirer": "~2.3.6",
     "figures": "3.2.0",
     "flat": "^5.0.2",
@@ -70,7 +70,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.4.0-canary.20240626-3a2e8d4"
+    "@nrwl/tao": "19.4.0-canary.20240628-336d371"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -85,16 +85,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.4.0-canary.20240626-3a2e8d4",
-    "@nx/nx-darwin-arm64": "19.4.0-canary.20240626-3a2e8d4",
-    "@nx/nx-linux-x64-gnu": "19.4.0-canary.20240626-3a2e8d4",
-    "@nx/nx-linux-x64-musl": "19.4.0-canary.20240626-3a2e8d4",
-    "@nx/nx-win32-x64-msvc": "19.4.0-canary.20240626-3a2e8d4",
-    "@nx/nx-linux-arm64-gnu": "19.4.0-canary.20240626-3a2e8d4",
-    "@nx/nx-linux-arm64-musl": "19.4.0-canary.20240626-3a2e8d4",
-    "@nx/nx-linux-arm-gnueabihf": "19.4.0-canary.20240626-3a2e8d4",
-    "@nx/nx-win32-arm64-msvc": "19.4.0-canary.20240626-3a2e8d4",
-    "@nx/nx-freebsd-x64": "19.4.0-canary.20240626-3a2e8d4"
+    "@nx/nx-darwin-x64": "19.4.0-canary.20240628-336d371",
+    "@nx/nx-darwin-arm64": "19.4.0-canary.20240628-336d371",
+    "@nx/nx-linux-x64-gnu": "19.4.0-canary.20240628-336d371",
+    "@nx/nx-linux-x64-musl": "19.4.0-canary.20240628-336d371",
+    "@nx/nx-win32-x64-msvc": "19.4.0-canary.20240628-336d371",
+    "@nx/nx-linux-arm64-gnu": "19.4.0-canary.20240628-336d371",
+    "@nx/nx-linux-arm64-musl": "19.4.0-canary.20240628-336d371",
+    "@nx/nx-linux-arm-gnueabihf": "19.4.0-canary.20240628-336d371",
+    "@nx/nx-win32-arm64-msvc": "19.4.0-canary.20240628-336d371",
+    "@nx/nx-freebsd-x64": "19.4.0-canary.20240628-336d371"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -3,6 +3,6 @@ import { NxArgs } from '../../utils/command-line-utils';
 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(): Promise<boolean>;
+export declare function connectToNxCloudCommand(command?: string): 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

@@ -41,38 +41,29 @@ async function connectToNxCloudIfExplicitlyAsked(opts) {
     }
 }
 exports.connectToNxCloudIfExplicitlyAsked = connectToNxCloudIfExplicitlyAsked;
-async function connectToNxCloudCommand() {
+async function connectToNxCloudCommand(command) {
     const nxJson = (0, configuration_1.readNxJson)();
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
-        if (process.env.NX_NEW_CLOUD_ONBOARDING !== 'true') {
-            output_1.output.log({
-                title: '✔ This workspace already has Nx Cloud set up',
-                bodyLines: [
-                    'If you have not done so already, connect your workspace to your Nx Cloud account:',
-                    `- Login at ${(0, nx_cloud_utils_1.getNxCloudUrl)(nxJson)} to connect your repository`,
-                ],
-            });
+        const token = process.env.NX_CLOUD_ACCESS_TOKEN || nxJson.nxCloudAccessToken;
+        if (!token) {
+            throw new Error(`Unable to authenticate. Either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable.`);
         }
-        else {
-            const token = process.env.NX_CLOUD_ACCESS_TOKEN || nxJson.nxCloudAccessToken;
-            if (!token) {
-                throw new Error(`Unable to authenticate. Either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable.`);
-            }
-            const connectCloudUrl = await (0, url_shorten_1.shortenedCloudUrl)('nx-connect', token);
-            output_1.output.log({
-                title: '✔ This workspace already has Nx Cloud set up',
-                bodyLines: [
-                    'If you have not done so already, connect your workspace to your Nx Cloud account:',
-                    `- Connect with Nx Cloud at: 
+        const connectCloudUrl = await (0, url_shorten_1.shortenedCloudUrl)('nx-connect', token);
+        output_1.output.log({
+            title: '✔ This workspace already has Nx Cloud set up',
+            bodyLines: [
+                'If you have not done so already, connect your workspace to your Nx Cloud account:',
+                `- Connect with Nx Cloud at: 
       
         ${connectCloudUrl}`,
-                ],
-            });
-        }
+            ],
+        });
         return false;
     }
     const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, false, 'connect-to-nx-cloud');
-    const callback = await (0, connect_to_nx_cloud_1.connectToNxCloud)(tree, {});
+    const callback = await (0, connect_to_nx_cloud_1.connectToNxCloud)(tree, {
+        installationSource: command ?? 'nx-connect',
+    });
     tree.lock();
     (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, tree.listChanges());
     await callback();
@@ -81,7 +72,7 @@ async function connectToNxCloudCommand() {
 exports.connectToNxCloudCommand = connectToNxCloudCommand;
 async function connectToNxCloudWithPrompt(command) {
     const setNxCloud = await nxCloudPrompt('setupNxCloud');
-    const useCloud = setNxCloud === 'yes' ? await connectToNxCloudCommand() : false;
+    const useCloud = setNxCloud === 'yes' ? await connectToNxCloudCommand(command) : false;
     await (0, ab_testing_1.recordStat)({
         command,
         nxVersion: versions_1.nxVersion,

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

@@ -23,6 +23,7 @@ export interface ProjectGraphClientResponse {
     exclude: string[];
     isPartial: boolean;
     errors?: GraphError[];
+    connectedToCloud?: boolean;
 }
 export interface TaskGraphClientResponse {
     taskGraphs: Record<string, TaskGraph>;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateGraph = void 0;
 const crypto_1 = require("crypto");
+const node_child_process_1 = require("node:child_process");
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const http = require("http");
@@ -25,9 +26,10 @@ const native_1 = require("../../native");
 const transform_objects_1 = require("../../native/transform-objects");
 const affected_1 = require("../affected/affected");
 const nx_deps_cache_1 = require("../../project-graph/nx-deps-cache");
-const create_task_hasher_1 = require("../../hasher/create-task-hasher");
 const task_hasher_1 = require("../../hasher/task-hasher");
+const create_task_hasher_1 = require("../../hasher/create-task-hasher");
 const error_types_1 = require("../../project-graph/error-types");
+const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 // maps file extention to MIME types
 const mimeType = {
     '.ico': 'image/x-icon',
@@ -372,6 +374,20 @@ async function startServer(html, environmentJs, host, port = 4211, watchForchang
             res.end(environmentJs);
             return;
         }
+        if (sanitizePath === 'help') {
+            const project = parsedUrl.searchParams.get('project');
+            const target = parsedUrl.searchParams.get('target');
+            try {
+                const text = getHelpTextFromTarget(project, target);
+                res.writeHead(200, { 'Content-Type': 'application/javascript' });
+                res.end(JSON.stringify({ text, success: true }));
+            }
+            catch (err) {
+                res.writeHead(200, { 'Content-Type': 'application/javascript' });
+                res.end(JSON.stringify({ text: err.message, success: false }));
+            }
+            return;
+        }
         let pathname = (0, path_1.join)(__dirname, '../../core/graph/', sanitizePath);
         // if the file is not found or is a directory, return index.html
         if (!(0, fs_1.existsSync)(pathname) || (0, fs_1.statSync)(pathname).isDirectory()) {
@@ -478,10 +494,12 @@ async function createProjectGraphAndSourceMapClientResponse(affected = []) {
     let sourceMaps;
     let isPartial = false;
     let errors;
+    let connectedToCloud;
     try {
         const projectGraphAndSourceMaps = await (0, project_graph_1.createProjectGraphAndSourceMapsAsync)({ exitOnError: false });
         projectGraph = projectGraphAndSourceMaps.projectGraph;
         sourceMaps = projectGraphAndSourceMaps.sourceMaps;
+        connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)((0, configuration_1.readNxJson)());
     }
     catch (e) {
         if (e instanceof error_types_1.ProjectGraphError) {
@@ -509,7 +527,14 @@ async function createProjectGraphAndSourceMapClientResponse(affected = []) {
     const projects = Object.values(graph.nodes);
     const dependencies = graph.dependencies;
     const hasher = (0, crypto_1.createHash)('sha256');
-    hasher.update(JSON.stringify({ layout, projects, dependencies, sourceMaps, errors }));
+    hasher.update(JSON.stringify({
+        layout,
+        projects,
+        dependencies,
+        sourceMaps,
+        errors,
+        connectedToCloud,
+    }));
     const hash = hasher.digest('hex');
     perf_hooks_1.performance.mark('project graph response generation:end');
     perf_hooks_1.performance.measure('project graph watch calculation', 'project graph watch calculation:start', 'project graph watch calculation:end');
@@ -525,6 +550,7 @@ async function createProjectGraphAndSourceMapClientResponse(affected = []) {
             fileMap,
             isPartial,
             errors,
+            connectedToCloud,
         },
         sourceMapResponse: sourceMaps,
     };
@@ -733,3 +759,21 @@ async function createJsonOutput(prunedGraph, rawGraph, projects, targets) {
     }
     return response;
 }
+function getHelpTextFromTarget(projectName, targetName) {
+    if (!projectName)
+        throw new Error(`Missing project`);
+    if (!targetName)
+        throw new Error(`Missing target`);
+    const project = currentProjectGraphClientResponse.projects?.find((p) => p.name === projectName);
+    if (!project)
+        throw new Error(`Cannot find project ${projectName}`);
+    const target = project.data.targets[targetName];
+    if (!target)
+        throw new Error(`Cannot find target ${targetName}`);
+    const command = target.metadata?.help?.command;
+    if (!command)
+        throw new Error(`No help command found for ${projectName}:${targetName}`);
+    return (0, node_child_process_1.execSync)(command, {
+        cwd: (0, path_1.join)(workspace_root_1.workspaceRoot, project.data.root),
+    }).toString();
+}

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

@@ -28,8 +28,9 @@ exports.yargsNxInfixCommand = {
     command: '$0 <target> [project] [_..]',
     describe: 'Run a target for a project',
     handler: async (args) => {
-        await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             return (await Promise.resolve().then(() => require('./run-one'))).runOne(process.cwd(), (0, shared_options_1.withOverrides)(args, 0));
         });
+        process.exit(exitCode);
     },
 };

package/src/config/workspace-json-project-json.d.ts

@@ -113,6 +113,14 @@ export interface TargetMetadata {
     [k: string]: any;
     description?: string;
     technologies?: string[];
+    nonAtomizedTarget?: string;
+    help?: {
+        command: string;
+        example: {
+            options?: Record<string, unknown>;
+            args?: string[];
+        };
+    };
 }
 export interface TargetDependencyConfig {
     /**