nx 21.5.0-beta.0 → 21.5.0-beta.2

package/package.json

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

package/src/adapter/ngcli-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ngcli-adapter.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ngcli-adapter.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}

package/src/adapter/ngcli-adapter.js

@@ -251,7 +251,7 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
     read(path) {
         if ((path === 'angular.json' || path === '/angular.json') &&
             (0, angular_json_1.isAngularPluginInstalled)()) {
-            return this.readMergedWorkspaceConfiguration().pipe((0, operators_1.map)((r) => Buffer.from(JSON.stringify((0, angular_json_1.toOldFormat)(r)))));
+            return this.readMergedWorkspaceConfiguration().pipe((0, operators_1.map)((r) => stringToArrayBuffer(JSON.stringify((0, angular_json_1.toOldFormat)(r)))));
         }
         else {
             return super.read(path);
@@ -332,11 +332,11 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
                                     const updatedContent = this.mergeProjectConfiguration(existingConfig.projects[projectName], projects[projectName], projectName);
                                     if (updatedContent) {
                                         delete updatedContent.root;
-                                        allObservables.push(super.write(path, Buffer.from(JSON.stringify(updatedContent, null, 2))));
+                                        allObservables.push(super.write(path, stringToArrayBuffer(JSON.stringify(updatedContent, null, 2))));
                                     }
                                 }
                                 else {
-                                    allObservables.push(super.write(path, Buffer.from(content)));
+                                    allObservables.push(super.write(path, stringToArrayBuffer(content)));
                                 }
                             },
                         }, projectName, projects[projectName]);
@@ -473,7 +473,7 @@ class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
             const projectJsonConfig = (0, angular_json_1.toOldFormat)({ projects });
             return super.readExistingAngularJson().pipe((0, operators_1.map)((angularJson) => {
                 if (angularJson) {
-                    return Buffer.from(JSON.stringify({
+                    return stringToArrayBuffer(JSON.stringify({
                         version: 1,
                         projects: {
                             ...projectJsonConfig.projects,
@@ -482,14 +482,14 @@ class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
                     }));
                 }
                 else {
-                    return Buffer.from(JSON.stringify(projectJsonConfig));
+                    return stringToArrayBuffer(JSON.stringify(projectJsonConfig));
                 }
             }));
         }
         else {
             const match = findMatchingFileChange(this.host, path);
             if (match) {
-                return (0, rxjs_1.of)(Buffer.from(match.content));
+                return (0, rxjs_1.of)(bufferToArrayBuffer(Buffer.from(match.content)));
             }
             else {
                 return super.read(path);
@@ -706,11 +706,11 @@ function wrapAngularDevkitSchematic(collectionName, generatorName) {
                     saveProjectsConfigurationsInWrappedSchematic(host, event.content.toString());
                 }
                 else {
-                    host.write(eventPath, event.content);
+                    host.write(eventPath, toBufferOrString(event.content));
                 }
             }
             else if (event.kind === 'create') {
-                host.write(eventPath, event.content);
+                host.write(eventPath, toBufferOrString(event.content));
             }
             else if (event.kind === 'delete') {
                 host.delete(eventPath);
@@ -946,3 +946,16 @@ function restoreNxTokensInOptions(newOptions, previousOptions, project) {
     }
     return result;
 }
+function toBufferOrString(content) {
+    if (Buffer.isBuffer(content) || typeof content === 'string') {
+        return content;
+    }
+    // it's an ArrayBuffer
+    return Buffer.from(content);
+}
+function stringToArrayBuffer(str) {
+    return new TextEncoder().encode(str).buffer;
+}
+function bufferToArrayBuffer(buffer) {
+    return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+}

package/src/command-line/affected/affected.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affected.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/affected.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAQ7D,OAAO,EACL,YAAY,EACZ,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAMlF,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,OAAO,GAAG,gBAAgB,GAAG,UAAU,EAChD,IAAI,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,uBAAuB,GAAE,MAAM,CAC7B,MAAM,EACN,CAAC,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAC/B,EACN,YAAY,GAGP;IACH,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CAAC,IAAI,CAAC,CA8Df;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAuBpC"}
+{"version":3,"file":"affected.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/affected.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAQ7D,OAAO,EACL,YAAY,EACZ,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAMlF,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,OAAO,GAAG,gBAAgB,GAAG,UAAU,EAChD,IAAI,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,uBAAuB,GAAE,MAAM,CAC7B,MAAM,EACN,CAAC,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAC/B,EACN,YAAY,GAGP;IACH,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CAAC,IAAI,CAAC,CAiEf;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAuBpC"}

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

@@ -42,6 +42,8 @@ async function affected(command, args, extraTargetDependencies = {}, extraOption
                         open: true,
                         view: 'tasks',
                         targets: nxArgs.targets,
+                        all: nxArgs.all &&
+                            (!nxArgs.projects || nxArgs.projects.length === 0),
                         projects: projectNames,
                         file,
                     }, projectNames);

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

@@ -27,9 +27,9 @@ export interface ProjectGraphClientResponse {
     disabledTaskSyncGenerators?: string[];
 }
 export interface TaskGraphClientResponse {
-    taskGraphs: Record<string, TaskGraph>;
+    taskGraph: TaskGraph;
     plans?: Record<string, string[]>;
-    errors: Record<string, string>;
+    error?: string | null;
 }
 export interface ExpandedTaskInputsReponse {
     [taskId: string]: Record<string, string[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/graph/graph.ts"],"names":[],"mappings":"AA0BA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAuBpD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,uBAAuB,EAAE,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,yBAAyB;IACxC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC5C;AAiJD,wBAAsB,aAAa,CACjC,IAAI,EAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,iBAAiB,CAAC;IAC/C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,gBAAgB,EAAE,MAAM,EAAE,GACzB,OAAO,CAAC,IAAI,CAAC,CAuSf;AA4zBD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;CACrB"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/graph/graph.ts"],"names":[],"mappings":"AA0BA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAuBpD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,uBAAuB,EAAE,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,yBAAyB;IACxC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC5C;AAiJD,wBAAsB,aAAa,CACjC,IAAI,EAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,iBAAiB,CAAC;IAC/C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,gBAAgB,EAAE,MAAM,EAAE,GACzB,OAAO,CAAC,IAAI,CAAC,CA+Rf;AAyuBD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;CACrB"}

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

@@ -129,17 +129,6 @@ function filterGraph(graph, focus, exclude) {
     return filteredGraph;
 }
 async function generateGraph(args, affectedProjects) {
-    if (Array.isArray(args.targets) &&
-        args.targets.length > 1 &&
-        args.file &&
-        !(args.file === 'stdout' || args.file.endsWith('.json'))) {
-        output_1.output.warn({
-            title: 'Showing Multiple Targets is not supported yet',
-            bodyLines: [
-                `Only the task graph for "${args.targets[0]}" tasks will be shown`,
-            ],
-        });
-    }
     if (args.view === 'project-details' && !args.focus) {
         output_1.output.error({
             title: `The project details view requires the --focus option.`,
@@ -155,10 +144,6 @@ async function generateGraph(args, affectedProjects) {
         });
         process.exit(1);
     }
-    // TODO: Graph Client should support multiple targets
-    const target = Array.isArray(args.targets && args.targets.length >= 1)
-        ? args.targets[0]
-        : args.targets;
     let rawGraph;
     let sourceMaps;
     let isPartial = false;
@@ -253,7 +238,9 @@ async function generateGraph(args, affectedProjects) {
                 recursive: true,
             });
             const { projectGraphClientResponse } = await createProjectGraphAndSourceMapClientResponse(affectedProjects);
-            const taskGraphClientResponse = await createTaskGraphClientResponse();
+            const taskGraphClientResponse = args.targets
+                ? await createTaskGraphForTargetsAndProjects(args.targets, args.projects)
+                : await createTaskGraphClientResponse();
             const taskInputsReponse = await createExpandedTaskInputResponse(taskGraphClientResponse, projectGraphClientResponse);
             const environmentJs = buildEnvironmentJs(args.exclude || [], args.watch, !!args.file && args.file.endsWith('html') ? 'build' : 'serve', projectGraphClientResponse, taskGraphClientResponse, taskInputsReponse, sourceMaps);
             html = html.replace(/src="/g, 'src="static/');
@@ -305,15 +292,19 @@ async function generateGraph(args, affectedProjects) {
         if (args.focus) {
             url.pathname += '/' + encodeURIComponent(args.focus);
         }
-        if (target) {
-            url.pathname += '/' + target;
-        }
-        if (args.projects) {
-            url.searchParams.append('projects', args.projects.map((projectName) => projectName).join(' '));
+        // Add targets as query parameters for tasks view
+        if (args.view === 'tasks' && args.targets && args.targets.length > 0) {
+            const targets = Array.isArray(args.targets)
+                ? args.targets
+                : [args.targets];
+            url.searchParams.append('targets', targets.join(' '));
         }
-        else if (args.all) {
+        if (args.all) {
             url.pathname += '/all';
         }
+        else if (args.projects) {
+            url.searchParams.append('projects', args.projects.map((projectName) => projectName).join(' '));
+        }
         else if (args.affected) {
             url.pathname += '/affected';
         }
@@ -384,20 +375,18 @@ async function startServer(html, environmentJs, host, port = 4211, watchForChang
             return;
         }
         if (sanitizePath === 'task-graph.json') {
-            const projectsParam = parsedUrl.searchParams.get('projects'); // Multiple projects
-            const targetName = parsedUrl.searchParams.get('target');
+            const projectsParam = parsedUrl.searchParams.get('projects');
+            const targetsParam = parsedUrl.searchParams.get('targets');
             const configuration = parsedUrl.searchParams.get('configuration');
             res.writeHead(200, { 'Content-Type': 'application/json' });
-            if (projectsParam && targetName) {
-                // Multiple projects + target (UI: selected specific projects)
-                const projectNames = projectsParam.split(' ').filter(Boolean);
-                return res.end(JSON.stringify(await createTaskGraphsForTargetAndProjects(targetName, projectNames, configuration)));
-            }
-            if (targetName) {
-                // Target only (UI: all projects with this target)
-                return res.end(JSON.stringify(await createTaskGraphsForTargetAndProjects(targetName)));
+            if (targetsParam) {
+                const targetNames = targetsParam.split(' ').filter(Boolean);
+                const projectNames = projectsParam
+                    ? projectsParam.split(' ').filter(Boolean)
+                    : undefined;
+                return res.end(JSON.stringify(await createTaskGraphForTargetsAndProjects(targetNames, projectNames, configuration)));
             }
-            // Legacy - load all task graphs
+            // load all task graphs if there's no targets specified
             return res.end(JSON.stringify(await createTaskGraphClientResponse()));
         }
         if (sanitizePath === 'task-inputs.json') {
@@ -638,26 +627,41 @@ async function createTaskGraphClientResponse(pruneExternal = false) {
     }
     const nxJson = (0, configuration_1.readNxJson)();
     node_perf_hooks_1.performance.mark('task graph generation:start');
-    const taskGraphs = getAllTaskGraphsForWorkspace(graph);
-    node_perf_hooks_1.performance.mark('task graph generation:end');
-    const planner = new native_1.HashPlanner(nxJson, (0, native_1.transferProjectGraph)((0, transform_objects_1.transformProjectGraphForRust)(graph)));
-    node_perf_hooks_1.performance.mark('task hash plan generation:start');
-    const plans = {};
-    for (const individualTaskGraph of Object.values(taskGraphs.taskGraphs)) {
-        for (const task of Object.values(individualTaskGraph.tasks)) {
-            if (plans[task.id]) {
-                continue;
-            }
-            plans[task.id] = planner.getPlans([task.id], individualTaskGraph)[task.id];
-        }
+    const projects = Object.keys(graph.nodes);
+    const allTargets = new Set();
+    for (const projectName in graph.nodes) {
+        const project = graph.nodes[projectName];
+        Object.keys(project.data.targets ?? {}).forEach((target) => {
+            allTargets.add(target);
+        });
+    }
+    const targets = Array.from(allTargets);
+    try {
+        const taskGraph = (0, create_task_graph_1.createTaskGraph)(graph, {}, projects, targets, undefined, {});
+        node_perf_hooks_1.performance.mark('task graph generation:end');
+        const planner = new native_1.HashPlanner(nxJson, (0, native_1.transferProjectGraph)((0, transform_objects_1.transformProjectGraphForRust)(graph)));
+        node_perf_hooks_1.performance.mark('task hash plan generation:start');
+        const taskIds = Object.keys(taskGraph.tasks);
+        const plans = taskIds.length > 0 ? planner.getPlans(taskIds, taskGraph) : {};
+        node_perf_hooks_1.performance.mark('task hash plan generation:end');
+        node_perf_hooks_1.performance.measure('task graph generation', 'task graph generation:start', 'task graph generation:end');
+        node_perf_hooks_1.performance.measure('task hash plan generation', 'task hash plan generation:start', 'task hash plan generation:end');
+        return { taskGraph, plans, error: null };
+    }
+    catch (err) {
+        node_perf_hooks_1.performance.mark('task graph generation:end');
+        node_perf_hooks_1.performance.measure('task graph generation (failed)', 'task graph generation:start', 'task graph generation:end');
+        return {
+            taskGraph: {
+                tasks: {},
+                dependencies: {},
+                continuousDependencies: {},
+                roots: [],
+            },
+            plans: {},
+            error: err.message,
+        };
     }
-    node_perf_hooks_1.performance.mark('task hash plan generation:end');
-    node_perf_hooks_1.performance.measure('task graph generation', 'task graph generation:start', 'task graph generation:end');
-    node_perf_hooks_1.performance.measure('task hash plan generation', 'task hash plan generation:start', 'task hash plan generation:end');
-    return {
-        ...taskGraphs,
-        plans,
-    };
 }
 async function createExpandedTaskInputResponse(taskGraphClientResponse, depGraphClientResponse) {
     node_perf_hooks_1.performance.mark('task input static generation:start');
@@ -672,57 +676,6 @@ async function createExpandedTaskInputResponse(taskGraphClientResponse, depGraph
     node_perf_hooks_1.performance.measure('task input static generation', 'task input static generation:start', 'task input static generation:end');
     return response;
 }
-function getAllTaskGraphsForWorkspace(projectGraph) {
-    const taskGraphs = {};
-    const taskGraphErrors = {};
-    // TODO(cammisuli): improve performance here. Cache results or something.
-    for (const projectName in projectGraph.nodes) {
-        const project = projectGraph.nodes[projectName];
-        const targets = Object.keys(project.data.targets ?? {});
-        targets.forEach((target) => {
-            const taskId = createTaskId(projectName, target);
-            try {
-                taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, {}, [projectName], [target], undefined, {});
-            }
-            catch (err) {
-                taskGraphs[taskId] = {
-                    tasks: {},
-                    dependencies: {},
-                    continuousDependencies: {},
-                    roots: [],
-                };
-                taskGraphErrors[taskId] = err.message;
-            }
-            const configurations = Object.keys(project.data.targets[target]?.configurations || {});
-            if (configurations.length > 0) {
-                configurations.forEach((configuration) => {
-                    const taskId = createTaskId(projectName, target, configuration);
-                    try {
-                        taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, {}, [projectName], [target], configuration, {});
-                    }
-                    catch (err) {
-                        taskGraphs[taskId] = {
-                            tasks: {},
-                            dependencies: {},
-                            continuousDependencies: {},
-                            roots: [],
-                        };
-                        taskGraphErrors[taskId] = err.message;
-                    }
-                });
-            }
-        });
-    }
-    return { taskGraphs, errors: taskGraphErrors };
-}
-function createTaskId(projectId, targetId, configurationId) {
-    if (configurationId) {
-        return `${projectId}:${targetId}:${configurationId}`;
-    }
-    else {
-        return `${projectId}:${targetId}`;
-    }
-}
 // Performance optimized functions for lazy loading task graphs
 // In-memory cache for task graphs to avoid regeneration
 const taskGraphCache = new Map();
@@ -734,10 +687,10 @@ function clearTaskGraphCache() {
     expandedTaskInputsCache.clear();
 }
 /**
- * Creates task graphs for multiple projects with a specific target
- * If no projects specified, returns graphs for all projects with the target
+ * Creates a single task graph for multiple projects with multiple targets
+ * If no projects specified, returns graph for all projects with the targets
  */
-async function createTaskGraphsForTargetAndProjects(targetName, projectNames, configuration) {
+async function createTaskGraphForTargetsAndProjects(targetNames, projectNames, configuration) {
     // Get project graph
     let graph;
     try {
@@ -749,74 +702,44 @@ async function createTaskGraphsForTargetAndProjects(targetName, projectNames, co
         }
     }
     const nxJson = (0, configuration_1.readNxJson)();
-    // Determine which projects to process
-    let projectsToProcess;
+    node_perf_hooks_1.performance.mark(`task graph generation:start`);
+    let projectsToUse;
     if (projectNames && projectNames.length > 0) {
-        // Use specified projects (filter to only those that have the target)
-        projectsToProcess = projectNames.filter((projectName) => graph.nodes[projectName]?.data.targets?.[targetName]);
+        projectsToUse = projectNames;
     }
     else {
-        // Get all projects with the target
-        projectsToProcess = Object.entries(graph.nodes)
-            .filter(([_, project]) => project.data.targets?.[targetName])
+        // Get all projects that have at least one of the targets
+        projectsToUse = Object.entries(graph.nodes)
+            .filter(([_, project]) => targetNames.some((targetName) => project.data.targets?.[targetName]))
             .map(([projectName]) => projectName);
     }
-    node_perf_hooks_1.performance.mark(`target task graphs generation:start`);
-    // Create task graphs for each project
-    const taskGraphs = {};
-    const taskGraphErrors = {};
-    for (const projectName of projectsToProcess) {
-        const taskId = createTaskId(projectName, targetName, configuration);
-        // Check cache first
-        const cached = taskGraphCache.get(taskId);
-        if (cached) {
-            Object.assign(taskGraphs, cached.taskGraphs);
-            Object.assign(taskGraphErrors, cached.errors);
-            continue;
-        }
-        // Create task graph
-        try {
-            taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(graph, {}, [projectName], [targetName], configuration, {});
-        }
-        catch (err) {
-            taskGraphs[taskId] = {
+    try {
+        // Create single task graph
+        const taskGraph = (0, create_task_graph_1.createTaskGraph)(graph, {}, projectsToUse, targetNames, configuration, {});
+        node_perf_hooks_1.performance.mark(`task graph generation:end`);
+        const planner = new native_1.HashPlanner(nxJson, (0, native_1.transferProjectGraph)((0, transform_objects_1.transformProjectGraphForRust)(graph)));
+        node_perf_hooks_1.performance.mark('task hash plan generation:start');
+        const taskIds = Object.keys(taskGraph.tasks);
+        const plans = taskIds.length > 0 ? planner.getPlans(taskIds, taskGraph) : {};
+        node_perf_hooks_1.performance.mark('task hash plan generation:end');
+        node_perf_hooks_1.performance.measure(`task graph generation for ${targetNames.join(', ')}`, `task graph generation:start`, `task graph generation:end`);
+        node_perf_hooks_1.performance.measure('task hash plan generation', 'task hash plan generation:start', 'task hash plan generation:end');
+        return { taskGraph, plans, error: null };
+    }
+    catch (err) {
+        node_perf_hooks_1.performance.mark(`task graph generation:end`);
+        node_perf_hooks_1.performance.measure(`task graph generation for ${targetNames.join(', ')} (failed)`, `task graph generation:start`, `task graph generation:end`);
+        return {
+            taskGraph: {
                 tasks: {},
                 dependencies: {},
                 continuousDependencies: {},
                 roots: [],
-            };
-            taskGraphErrors[taskId] = err.message;
-        }
-    }
-    node_perf_hooks_1.performance.mark(`target task graphs generation:end`);
-    // Generate hash plans
-    const planner = new native_1.HashPlanner(nxJson, (0, native_1.transferProjectGraph)((0, transform_objects_1.transformProjectGraphForRust)(graph)));
-    node_perf_hooks_1.performance.mark('target task hash plan generation:start');
-    const plans = {};
-    for (const taskGraph of Object.values(taskGraphs)) {
-        const taskIds = Object.keys(taskGraph.tasks);
-        if (taskIds.length > 0) {
-            const taskPlans = planner.getPlans(taskIds, taskGraph);
-            Object.assign(plans, taskPlans);
-        }
-    }
-    node_perf_hooks_1.performance.mark('target task hash plan generation:end');
-    // Cache individual results for future requests
-    for (const projectName of projectsToProcess) {
-        const taskId = createTaskId(projectName, targetName, configuration);
-        if (!taskGraphCache.has(taskId)) {
-            taskGraphCache.set(taskId, {
-                taskGraphs: { [taskId]: taskGraphs[taskId] },
-                plans: Object.fromEntries(Object.entries(plans).filter(([key]) => key.startsWith(projectName))),
-                errors: taskGraphErrors[taskId]
-                    ? { [taskId]: taskGraphErrors[taskId] }
-                    : {},
-            });
-        }
+            },
+            plans: {},
+            error: err.message,
+        };
     }
-    node_perf_hooks_1.performance.measure(`target task graphs generation for ${targetName}`, `target task graphs generation:start`, `target task graphs generation:end`);
-    node_perf_hooks_1.performance.measure('target task hash plan generation', 'target task hash plan generation:start', 'target task hash plan generation:end');
-    return { taskGraphs, plans, errors: taskGraphErrors };
 }
 async function getExpandedTaskInputs(taskId) {
     // Check cache first
@@ -825,9 +748,9 @@ async function getExpandedTaskInputs(taskId) {
     }
     // Use the optimized version that only creates the specific task graph needed
     const [projectName, targetName, configuration] = taskId.split(':');
-    const taskGraphResponse = await createTaskGraphsForTargetAndProjects(targetName, [projectName], configuration);
+    const taskGraphResponse = await createTaskGraphForTargetsAndProjects([targetName], [projectName], configuration);
     const allWorkspaceFiles = await (0, all_file_data_1.allFileData)();
-    const inputs = taskGraphResponse.plans[taskId];
+    const inputs = taskGraphResponse.plans?.[taskId];
     let result = {};
     if (inputs) {
         result = expandInputs(inputs, currentProjectGraphClientResponse.projects.find((p) => p.name === projectName), allWorkspaceFiles, currentProjectGraphClientResponse);

package/src/command-line/init/implementation/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,sBAAsB,EACvB,MAAM,gCAAgC,CAAC;AASxC,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,EAAE,EAC5B,mBAAmB,EAAE,MAAM,EAAE,EAC7B,aAAa,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,QA0C1C;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC7B,mBAAmB,CA+GrB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,kBAAkB,CAAC,EAAE,MAAM,EAAE,QAY9B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,QAqC3C;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,sBAAmD,QAOzD;AAED,wBAAsB,SAAS,CAC7B,kBAAkB,EACd,SAAS,GACT,iBAAiB,GACjB,aAAa,GACb,kBAAkB,GAClB,cAAc,GACd,kBAAkB,GAClB,mBAAmB,iBAMxB;AAED,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,GACnB,IAAI,CAiBN;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,GAAG,EAAE,sBAAsB,QAqB5B;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,MAAM,QAQjE;AAED,wBAAgB,iBAAiB,CAAC,EAChC,aAAa,EACb,WAAW,GACZ,EAAE;IACD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,IAAI,CAUP;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,WASlD;AAED,wBAAgB,KAAK,CAAC,WAAW,EAAE,WAAW,WAa7C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,sBAAsB,EACvB,MAAM,gCAAgC,CAAC;AASxC,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,EAAE,EAC5B,mBAAmB,EAAE,MAAM,EAAE,EAC7B,aAAa,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,QA0C1C;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC7B,mBAAmB,CA+GrB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,kBAAkB,CAAC,EAAE,MAAM,EAAE,QAY9B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,QAqC3C;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,sBAAmD,QAOzD;AAED,wBAAsB,SAAS,CAC7B,kBAAkB,EACd,SAAS,GACT,iBAAiB,GACjB,aAAa,GACb,kBAAkB,GAClB,cAAc,GACd,kBAAkB,GAClB,mBAAmB,iBAMxB;AAED,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,GACnB,IAAI,CAiBN;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,GAAG,EAAE,sBAAsB,QAqB5B;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,MAAM,QAQjE;AAED,wBAAgB,iBAAiB,CAAC,EAChC,aAAa,EACb,WAAW,GACZ,EAAE;IACD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,IAAI,CAUP;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,WAgBlD;AAED,wBAAgB,KAAK,CAAC,WAAW,EAAE,WAAW,WAa7C"}

package/src/command-line/init/implementation/utils.js

@@ -272,8 +272,15 @@ function printFinalMessage({ learnMoreLink, appendLines, }) {
 function isMonorepo(packageJson) {
     if (!!packageJson.workspaces)
         return true;
-    if ((0, fs_1.existsSync)('pnpm-workspace.yaml') || (0, fs_1.existsSync)('pnpm-workspace.yml'))
-        return true;
+    try {
+        const content = (0, fs_1.readFileSync)('pnpm-workspace.yaml', 'utf-8');
+        const { load } = require('@zkochan/js-yaml');
+        const { packages } = load(content) ?? {};
+        if (packages) {
+            return true;
+        }
+    }
+    catch { }
     if ((0, fs_1.existsSync)('lerna.json'))
         return true;
     return false;

package/src/command-line/mcp/mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/mcp/mcp.ts"],"names":[],"mappings":"AAIA,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,iBAazC;AAED,wBAAsB,QAAQ,kBAa7B"}
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/mcp/mcp.ts"],"names":[],"mappings":"AAOA,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,iBA4BzC;AAED,wBAAsB,QAAQ,kBAyB7B"}

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

@@ -6,16 +6,51 @@ const child_process_1 = require("child_process");
 const package_manager_1 = require("../../utils/package-manager");
 const workspace_root_1 = require("../../utils/workspace-root");
 async function mcpHandler(args) {
-    const packageManagerCommands = (0, package_manager_1.getPackageManagerCommand)();
+    const packageManager = (0, package_manager_1.detectPackageManager)();
+    const packageManagerCommands = (0, package_manager_1.getPackageManagerCommand)(packageManager);
     const passthroughArgs = args['_'][0] === 'mcp' ? args['_'].slice(1) : args['_'];
-    (0, child_process_1.spawnSync)(packageManagerCommands.dlx, ['-y', 'nx-mcp@latest', ...passthroughArgs], {
+    let dlxArgs;
+    if (packageManager === 'npm') {
+        dlxArgs = ['-y', 'nx-mcp@latest', ...passthroughArgs];
+    }
+    else if (packageManager === 'yarn') {
+        dlxArgs = ['--quiet', 'nx-mcp@latest', ...passthroughArgs];
+    }
+    else if (packageManager === 'bun') {
+        dlxArgs = ['--silent', 'nx-mcp@latest', ...passthroughArgs];
+    }
+    else {
+        dlxArgs = ['nx-mcp@latest', ...passthroughArgs];
+    }
+    // For commands that might contain spaces like "pnpm dlx"
+    const dlxCommand = packageManagerCommands.dlx.split(' ');
+    const executable = dlxCommand[0];
+    const execArgs = [...dlxCommand.slice(1), ...dlxArgs];
+    (0, child_process_1.spawnSync)(executable, execArgs, {
         stdio: 'inherit',
         cwd: workspace_root_1.workspaceRoot,
     });
 }
 async function showHelp() {
-    const packageManagerCommands = (0, package_manager_1.getPackageManagerCommand)();
-    const helpOutput = (0, child_process_1.spawnSync)(packageManagerCommands.dlx, ['-y', 'nx-mcp@latest', '--help'], {
+    const packageManager = (0, package_manager_1.detectPackageManager)();
+    const packageManagerCommands = (0, package_manager_1.getPackageManagerCommand)(packageManager);
+    let dlxArgs;
+    if (packageManager === 'npm') {
+        dlxArgs = ['-y', 'nx-mcp@latest', '--help'];
+    }
+    else if (packageManager === 'yarn') {
+        dlxArgs = ['--quiet', 'nx-mcp@latest', '--help'];
+    }
+    else if (packageManager === 'bun') {
+        dlxArgs = ['--silent', 'nx-mcp@latest', '--help'];
+    }
+    else {
+        dlxArgs = ['nx-mcp@latest', '--help'];
+    }
+    const dlxCommand = packageManagerCommands.dlx.split(' ');
+    const executable = dlxCommand[0];
+    const execArgs = [...dlxCommand.slice(1), ...dlxArgs];
+    const helpOutput = (0, child_process_1.spawnSync)(executable, execArgs, {
         cwd: workspace_root_1.workspaceRoot,
         encoding: 'utf-8',
     });

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

@@ -64,6 +64,7 @@ export declare class Migrator {
     private shouldApplyPackageUpdate;
     private addPackageUpdate;
     private areRequirementsMet;
+    private areIncompatiblePackagesPresent;
     private areMigrationRequirementsMet;
     private isMigrationForHigherVersionThanWhatIsInstalled;
     private wasMigrationSkipped;