nx 16.1.4 → 16.2.0-beta.0

package/bin/nx.js

@@ -10,8 +10,8 @@ const semver_1 = require("semver");
 const strip_indents_1 = require("../src/utils/strip-indents");
 const package_json_1 = require("../src/utils/package-json");
 const child_process_1 = require("child_process");
+const path_1 = require("path");
 function main() {
-    var _a;
     const workspace = (0, find_workspace_root_1.findWorkspaceRoot)(process.cwd());
     // new is a special case because there is no local workspace to load
     if (process.argv[2] === 'new' ||
@@ -29,43 +29,21 @@ function main() {
         // https://twitter.com/BenLesh/status/1192478226385428483?s=20
         if (!Symbol.observable)
             Symbol.observable = Symbol('observable polyfill');
-        if (!workspace) {
-            output_1.output.log({
-                title: `The current directory isn't part of an Nx workspace.`,
-                bodyLines: [
-                    `To create a workspace run:`,
-                    chalk.bold.white(`npx create-nx-workspace@latest <workspace name>`),
-                    '',
-                    `To add Nx to an existing workspace with a workspace-specific nx.json, run:`,
-                    chalk.bold.white(`npx nx@latest init`),
-                ],
-            });
-            output_1.output.note({
-                title: `For more information please visit https://nx.dev/`,
-            });
-            process.exit(1);
-        }
         // Make sure that a local copy of Nx exists in workspace
         let localNx;
         try {
-            localNx = resolveNx(workspace);
+            localNx = workspace && resolveNx(workspace);
         }
-        catch (_b) {
+        catch (_a) {
             localNx = null;
         }
         const isLocalInstall = localNx === resolveNx(null);
-        const LOCAL_NX_VERSION = localNx
-            ? getLocalNxVersion(workspace)
-            : null;
-        const GLOBAL_NX_VERSION = isLocalInstall
-            ? null
-            : require('../package.json').version;
-        (_a = globalThis.GLOBAL_NX_VERSION) !== null && _a !== void 0 ? _a : (globalThis.GLOBAL_NX_VERSION = GLOBAL_NX_VERSION);
+        const { LOCAL_NX_VERSION, GLOBAL_NX_VERSION } = determineNxVersions(localNx, workspace, isLocalInstall);
         if (process.argv[2] === '--version') {
-            console.log((0, strip_indents_1.stripIndents) `Nx Version:
-      - Local: ${LOCAL_NX_VERSION ? 'v' + LOCAL_NX_VERSION : 'Not found'}
-      - Global: ${GLOBAL_NX_VERSION ? 'v' + GLOBAL_NX_VERSION : 'Not found'}`);
-            process.exit(0);
+            handleNxVersionCommand(LOCAL_NX_VERSION, GLOBAL_NX_VERSION);
+        }
+        if (!workspace) {
+            handleNoWorkspace();
         }
         if (!localNx) {
             handleMissingLocalInstallation();
@@ -87,25 +65,60 @@ function main() {
         }
     }
 }
+function handleNoWorkspace() {
+    output_1.output.log({
+        title: `The current directory isn't part of an Nx workspace.`,
+        bodyLines: [
+            `To create a workspace run:`,
+            chalk.bold.white(`npx create-nx-workspace@latest <workspace name>`),
+            '',
+            `To add Nx to an existing workspace with a workspace-specific nx.json, run:`,
+            chalk.bold.white(`npx nx@latest init`),
+        ],
+    });
+    output_1.output.note({
+        title: `For more information please visit https://nx.dev/`,
+    });
+    process.exit(1);
+}
+function handleNxVersionCommand(LOCAL_NX_VERSION, GLOBAL_NX_VERSION) {
+    console.log((0, strip_indents_1.stripIndents) `Nx Version:
+      - Local: ${LOCAL_NX_VERSION ? 'v' + LOCAL_NX_VERSION : 'Not found'}
+      - Global: ${GLOBAL_NX_VERSION ? 'v' + GLOBAL_NX_VERSION : 'Not found'}`);
+    process.exit(0);
+}
+function determineNxVersions(localNx, workspace, isLocalInstall) {
+    var _a;
+    const LOCAL_NX_VERSION = localNx
+        ? getLocalNxVersion(workspace)
+        : null;
+    const GLOBAL_NX_VERSION = isLocalInstall
+        ? null
+        : require('../package.json').version;
+    (_a = globalThis.GLOBAL_NX_VERSION) !== null && _a !== void 0 ? _a : (globalThis.GLOBAL_NX_VERSION = GLOBAL_NX_VERSION);
+    return { LOCAL_NX_VERSION, GLOBAL_NX_VERSION };
+}
 function resolveNx(workspace) {
+    // root relative to location of the nx bin
+    const globalsRoot = (0, path_1.join)(__dirname, '../../../');
     // prefer Nx installed in .nx/installation
     try {
         return require.resolve('nx/bin/nx.js', {
-            paths: workspace ? [(0, installation_directory_1.getNxInstallationPath)(workspace.dir)] : undefined,
+            paths: [(0, installation_directory_1.getNxInstallationPath)(workspace ? workspace.dir : globalsRoot)],
         });
     }
     catch (_a) { }
     // check for root install
     try {
         return require.resolve('nx/bin/nx.js', {
-            paths: workspace ? [workspace.dir] : undefined,
+            paths: [workspace ? workspace.dir : globalsRoot],
         });
     }
     catch (_b) {
         // TODO(v17): Remove this
         // fallback for old CLI install setup
         return require.resolve('@nrwl/cli/bin/nx.js', {
-            paths: workspace ? [workspace.dir] : undefined,
+            paths: [workspace ? workspace.dir : globalsRoot],
         });
     }
 }
@@ -145,15 +158,11 @@ function warnIfUsingOutdatedGlobalInstall(globalNxVersion, localNxVersion) {
     }
 }
 function getLocalNxVersion(workspace) {
-    // TODO(v17): Remove @nrwl/cli from this list
-    const localNxPackages = ['nx', '@nrwl/tao', '@nrwl/cli'];
-    for (const pkg of localNxPackages) {
-        try {
-            const { packageJson } = (0, package_json_1.readModulePackageJson)('nx', (0, installation_directory_1.getNxRequirePaths)(workspace.dir));
-            return packageJson.version;
-        }
-        catch (_a) { }
+    try {
+        const { packageJson } = (0, package_json_1.readModulePackageJson)('nx', (0, installation_directory_1.getNxRequirePaths)(workspace.dir));
+        return packageJson.version;
     }
+    catch (_a) { }
 }
 function _getLatestVersionOfNx() {
     try {

package/bin/nx.js.map

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

package/bin/run-executor.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
-const run_1 = require("../src/command-line/run");
+const run_1 = require("../src/command-line/run/run");
 if (process.env.NX_TERMINAL_OUTPUT_PATH) {
     setUpOutputWatching(process.env.NX_TERMINAL_CAPTURE_STDERR === 'true', process.env.NX_STREAM_OUTPUT === 'true');
 }

package/bin/run-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-executor.js","sourceRoot":"","sources":["../../../../packages/nx/bin/run-executor.ts"],"names":[],"mappings":";;AAAA,2BAA6D;AAC7D,iDAA8C;AAE9C,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;IACvC,mBAAmB,CACjB,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,MAAM,EACjD,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,MAAM,CACxC,CAAC;CACH;AAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;IAClC,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB;AACD,UAAU,EAAE,CAAC;AAEb,SAAS,UAAU;IACjB,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC;IAChC,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAA,SAAG,EACD,OAAO,CAAC,GAAG,EAAE,EACb,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAC7B,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,SAAS,EACd,KAAK,CACN;aACE,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3B,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAClC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;KACN;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,+CAA+C,EAAE,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,mBAAmB,CAAC,aAAsB,EAAE,YAAqB;IACxE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IAE1C,4CAA4C;IAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IACvD,MAAM,4BAA4B,GAAG,IAAA,aAAQ,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAE/D,MAAM,UAAU,GAAG,EAAc,CAAC;IAClC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CACtB,KAAU,EACV,QAAgB,EAChB,QAAkB,EAClB,EAAE;QACF,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,IAAA,mBAAc,EAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,YAAY,EAAE;YAChB,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;SAChE;aAAM;YACL,QAAQ,EAAE,CAAC;SACZ;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CACtB,KAAU,EACV,QAAgB,EAChB,QAAkB,EAClB,EAAE;QACF,IAAA,mBAAc,EAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,YAAY,EAAE;YAChB,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;SAChE;aAAM;YACL,QAAQ,EAAE,CAAC;SACZ;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1B,8EAA8E;QAC9E,qCAAqC;QACrC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE;YAChC,IAAA,kBAAa,EAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;SAChD;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"run-executor.js","sourceRoot":"","sources":["../../../../packages/nx/bin/run-executor.ts"],"names":[],"mappings":"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"}

package/migrations.json

@@ -71,6 +71,12 @@
       "version": "16.0.0-beta.0",
       "description": "Replace @nrwl/nx-cloud with nx-cloud",
       "implementation": "./src/migrations/update-16-0-0/update-nx-cloud-runner"
+    },
+    "16.2.0-remove-output-path-from-run-commands": {
+      "cli": "nx",
+      "version": "16.2.0-beta.0",
+      "description": "Remove outputPath from run commands",
+      "implementation": "./src/migrations/update-16-2-0/remove-run-commands-output-path"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.1.4",
+  "version": "16.2.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.1.4",
+    "@nrwl/tao": "16.2.0-beta.0",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "^3.0.0-rc.18",
@@ -80,15 +80,15 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.1.4",
-    "@nx/nx-darwin-x64": "16.1.4",
-    "@nx/nx-linux-arm-gnueabihf": "16.1.4",
-    "@nx/nx-linux-arm64-gnu": "16.1.4",
-    "@nx/nx-linux-arm64-musl": "16.1.4",
-    "@nx/nx-linux-x64-gnu": "16.1.4",
-    "@nx/nx-linux-x64-musl": "16.1.4",
-    "@nx/nx-win32-arm64-msvc": "16.1.4",
-    "@nx/nx-win32-x64-msvc": "16.1.4"
+    "@nx/nx-darwin-arm64": "16.2.0-beta.0",
+    "@nx/nx-darwin-x64": "16.2.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "16.2.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "16.2.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "16.2.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "16.2.0-beta.0",
+    "@nx/nx-linux-x64-musl": "16.2.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "16.2.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "16.2.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -173,5 +173,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "16f098804653374057eff7e2f9565fb4c7a90b29"
+  "gitHead": "f7ba85e8ec9c074eaee81731a20aee7ea6dbc8aa"
 }

package/schemas/nx-schema.json

@@ -21,7 +21,8 @@
     },
     "npmScope": {
       "type": "string",
-      "description": "NPM Scope that the workspace uses."
+      "description": "NPM Scope that the workspace uses.",
+      "x-deprecated": "This is inferred from the package.json in the workspace root instead."
     },
     "tasksRunnerOptions": {
       "type": "object",
@@ -157,6 +158,16 @@
               }
             },
             "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "externalDependencies": {
+                "type": "string",
+                "description": "The list of external dependencies that our target depends on for `nx:run-commands` and community plugins."
+              }
+            },
+            "additionalProperties": false
           }
         ]
       }

package/schemas/project-schema.json

@@ -206,6 +206,16 @@
               }
             },
             "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "externalDependencies": {
+                "type": "string",
+                "description": "The list of external dependencies that our target depends on for `nx:run-commands` and community plugins."
+              }
+            },
+            "additionalProperties": false
           }
         ]
       }

package/src/adapter/angular-json.d.ts

@@ -3,7 +3,7 @@ export declare function shouldMergeAngularProjects(root: string, includeProjects
 export declare function isAngularPluginInstalled(): boolean;
 export declare function mergeAngularJsonAndGlobProjects(globProjects: {
     [name: string]: ProjectConfiguration;
-}): {
+}, angularCliWorkspaceRoot: string): {
     [name: string]: ProjectConfiguration;
 };
 export declare function toNewFormat(w: any): ProjectsConfigurations;

package/src/adapter/angular-json.js

@@ -5,7 +5,6 @@ const fs_1 = require("fs");
 const path = require("path");
 const fileutils_1 = require("../utils/fileutils");
 const workspaces_1 = require("../config/workspaces");
-const workspace_root_1 = require("../utils/workspace-root");
 function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
     if ((0, fs_1.existsSync)(path.join(root, 'angular.json')) &&
         // Include projects from angular.json if explicitly required.
@@ -36,12 +35,11 @@ function isAngularPluginInstalled() {
     }
 }
 exports.isAngularPluginInstalled = isAngularPluginInstalled;
-function readAngularJson() {
-    return toNewFormat((0, fileutils_1.readJsonFile)(path.join(workspace_root_1.workspaceRoot, 'angular.json')))
-        .projects;
+function readAngularJson(angularCliWorkspaceRoot) {
+    return toNewFormat((0, fileutils_1.readJsonFile)(path.join(angularCliWorkspaceRoot, 'angular.json'))).projects;
 }
-function mergeAngularJsonAndGlobProjects(globProjects) {
-    const res = readAngularJson();
+function mergeAngularJsonAndGlobProjects(globProjects, angularCliWorkspaceRoot) {
+    const res = readAngularJson(angularCliWorkspaceRoot);
     const folders = new Set();
     for (let k of Object.keys(res)) {
         folders.add(res[k].root);

package/src/adapter/angular-json.js.map

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

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

@@ -1,7 +1,7 @@
 import { logging, Path, PathFragment, virtualFs } from '@angular-devkit/core';
 import { FileBuffer } from '@angular-devkit/core/src/virtual-fs/host/interface';
 import { Observable } from 'rxjs';
-import { GenerateOptions } from '../command-line/generate';
+import type { GenerateOptions } from '../command-line/generate/generate';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { Tree } from '../generators/tree';
 export declare function scheduleTarget(root: string, opts: {

package/src/command-line/{affected.d.ts → affected/affected.d.ts}

@@ -1,4 +1,4 @@
-import { TargetDependencyConfig } from '../config/workspace-json-project-json';
+import { TargetDependencyConfig } from '../../config/workspace-json-project-json';
 export declare function affected(command: 'graph' | 'print-affected' | 'affected', args: {
     [k: string]: any;
 }, extraTargetDependencies?: Record<string, (TargetDependencyConfig | string)[]>): Promise<void>;

package/src/command-line/{affected.js → affected/affected.js}

@@ -2,39 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.affected = void 0;
 const tslib_1 = require("tslib");
-const file_utils_1 = require("../project-graph/file-utils");
-const run_command_1 = require("../tasks-runner/run-command");
-const output_1 = require("../utils/output");
-const dep_graph_1 = require("./dep-graph");
+const file_utils_1 = require("../../project-graph/file-utils");
+const run_command_1 = require("../../tasks-runner/run-command");
+const output_1 = require("../../utils/output");
+const graph_1 = require("../graph/graph");
 const print_affected_1 = require("./print-affected");
-const connect_1 = require("./connect");
-const command_line_utils_1 = require("../utils/command-line-utils");
+const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
+const command_line_utils_1 = require("../../utils/command-line-utils");
+const command_line_utils_2 = require("../../utils/command-line-utils");
 const perf_hooks_1 = require("perf_hooks");
-const project_graph_1 = require("../project-graph/project-graph");
-const project_graph_utils_1 = require("../utils/project-graph-utils");
-const affected_project_graph_1 = require("../project-graph/affected/affected-project-graph");
-const configuration_1 = require("../config/configuration");
-const workspace_configuration_check_1 = require("../utils/workspace-configuration-check");
-const find_matching_projects_1 = require("../utils/find-matching-projects");
+const project_graph_1 = require("../../project-graph/project-graph");
+const project_graph_utils_1 = require("../../utils/project-graph-utils");
+const affected_project_graph_1 = require("../../project-graph/affected/affected-project-graph");
+const configuration_1 = require("../../config/configuration");
+const workspace_configuration_check_1 = require("../../utils/workspace-configuration-check");
+const find_matching_projects_1 = require("../../utils/find-matching-projects");
 function affected(command, args, extraTargetDependencies = {}) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         perf_hooks_1.performance.mark('command-execution-begins');
         (0, workspace_configuration_check_1.workspaceConfigurationCheck)();
         const nxJson = (0, configuration_1.readNxJson)();
-        const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', {
-            printWarnings: command !== 'print-affected' && !args.plain,
+        const { nxArgs, overrides } = (0, command_line_utils_2.splitArgsIntoNxArgsAndOverrides)(args, 'affected', {
+            printWarnings: command !== 'print-affected' && !args.plain && args.graph !== 'stdout',
         }, nxJson);
         if (nxArgs.verbose) {
             process.env.NX_VERBOSE_LOGGING = 'true';
         }
-        yield (0, connect_1.connectToNxCloudIfExplicitlyAsked)(nxArgs);
+        yield (0, connect_to_nx_cloud_1.connectToNxCloudIfExplicitlyAsked)(nxArgs);
         const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
         const projects = yield projectsToRun(nxArgs, projectGraph);
         try {
             switch (command) {
                 case 'graph':
                     const projectNames = projects.map((p) => p.name);
-                    yield (0, dep_graph_1.generateGraph)(args, projectNames);
+                    yield (0, graph_1.generateGraph)(args, projectNames);
                     break;
                 case 'print-affected':
                     if (nxArgs.targets && nxArgs.targets.length > 0) {
@@ -48,12 +49,14 @@ function affected(command, args, extraTargetDependencies = {}) {
                     const projectsWithTarget = allProjectsWithTarget(projects, nxArgs);
                     if (nxArgs.graph) {
                         const projectNames = projectsWithTarget.map((t) => t.name);
-                        return yield (0, dep_graph_1.generateGraph)({
+                        const file = (0, command_line_utils_1.readGraphFileFromGraphArg)(nxArgs);
+                        return yield (0, graph_1.generateGraph)({
                             watch: false,
                             open: true,
                             view: 'tasks',
                             targets: nxArgs.targets,
                             projects: projectNames,
+                            file,
                         }, projectNames);
                     }
                     else {
@@ -75,7 +78,7 @@ function projectsToRun(nxArgs, projectGraph) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let affectedGraph = nxArgs.all
             ? projectGraph
-            : yield (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0, command_line_utils_1.parseFiles)(nxArgs).files, projectGraph.allWorkspaceFiles, nxArgs));
+            : yield (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0, command_line_utils_2.parseFiles)(nxArgs).files, projectGraph.allWorkspaceFiles, nxArgs));
         if (nxArgs.exclude) {
             const excludedProjects = new Set((0, find_matching_projects_1.findMatchingProjects)(nxArgs.exclude, affectedGraph.nodes));
             return Object.entries(affectedGraph.nodes)

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

@@ -0,0 +1 @@
+{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/affected.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,8 @@
+import { CommandModule } from 'yargs';
+export declare const yargsAffectedCommand: CommandModule;
+export declare const yargsAffectedTestCommand: CommandModule;
+export declare const yargsAffectedBuildCommand: CommandModule;
+export declare const yargsAffectedLintCommand: CommandModule;
+export declare const yargsAffectedE2ECommand: CommandModule;
+export declare const yargsAffectedGraphCommand: CommandModule;
+export declare const yargsPrintAffectedCommand: CommandModule;

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

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.yargsPrintAffectedCommand = exports.yargsAffectedGraphCommand = exports.yargsAffectedE2ECommand = exports.yargsAffectedLintCommand = exports.yargsAffectedBuildCommand = exports.yargsAffectedTestCommand = exports.yargsAffectedCommand = void 0;
+const tslib_1 = require("tslib");
+const documentation_1 = require("../yargs-utils/documentation");
+const shared_options_1 = require("../yargs-utils/shared-options");
+exports.yargsAffectedCommand = {
+    command: 'affected',
+    describe: 'Run target for affected projects',
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withTargetAndConfigurationOption)(yargs))))
+        .option('all', {
+        type: 'boolean',
+        deprecated: 'Use `nx run-many` instead',
+    })
+        .middleware((args) => {
+        if (args.all !== undefined) {
+            throw new Error("The '--all' option has been removed for `nx affected`. Use 'nx run-many' instead.");
+        }
+    }), 'affected'),
+    handler: (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () { return (yield Promise.resolve().then(() => require('./affected'))).affected('affected', (0, shared_options_1.withOverrides)(args)); }),
+};
+exports.yargsAffectedTestCommand = {
+    command: 'affected:test',
+    describe: false,
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs)))), 'affected'),
+    handler: (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        return (yield Promise.resolve().then(() => require('./affected'))).affected('affected', Object.assign(Object.assign({}, (0, shared_options_1.withOverrides)(args)), { target: 'test' }));
+    }),
+};
+exports.yargsAffectedBuildCommand = {
+    command: 'affected:build',
+    describe: false,
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs)))), 'affected'),
+    handler: (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        return (yield Promise.resolve().then(() => require('./affected'))).affected('affected', Object.assign(Object.assign({}, (0, shared_options_1.withOverrides)(args)), { target: 'build' }));
+    }),
+};
+exports.yargsAffectedLintCommand = {
+    command: 'affected:lint',
+    describe: false,
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs)))), 'affected'),
+    handler: (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        return (yield Promise.resolve().then(() => require('./affected'))).affected('affected', Object.assign(Object.assign({}, (0, shared_options_1.withOverrides)(args)), { target: 'lint' }));
+    }),
+};
+exports.yargsAffectedE2ECommand = {
+    command: 'affected:e2e',
+    describe: false,
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withRunOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withConfiguration)(yargs)))), 'affected'),
+    handler: (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        return (yield Promise.resolve().then(() => require('./affected'))).affected('affected', Object.assign(Object.assign({}, (0, shared_options_1.withOverrides)(args)), { target: 'e2e' }));
+    }),
+};
+exports.yargsAffectedGraphCommand = {
+    command: 'affected:graph',
+    describe: 'Graph dependencies affected by changes',
+    aliases: ['affected:dep-graph'],
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withDepGraphOptions)(yargs)), 'affected:graph'),
+    handler: (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        return yield (yield Promise.resolve().then(() => require('./affected'))).affected('graph', Object.assign({}, args));
+    }),
+};
+exports.yargsPrintAffectedCommand = {
+    command: 'print-affected',
+    describe: 'Prints information about the projects and targets affected by changes',
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withAffectedOptions)((0, shared_options_1.withTargetAndConfigurationOption)(yargs, false)), 'print-affected')
+        .option('select', {
+        type: 'string',
+        describe: 'Select the subset of the returned json document (e.g., --select=projects)',
+    })
+        .option('type', {
+        type: 'string',
+        choices: ['app', 'lib'],
+        describe: 'Select the type of projects to be returned (e.g., --type=app)',
+    }),
+    handler: (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        yield (yield Promise.resolve().then(() => require('./affected'))).affected('print-affected', (0, shared_options_1.withOverrides)(args));
+        process.exit(0);
+    }),
+};
+//# sourceMappingURL=command-object.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"command-object.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/command-object.ts"],"names":[],"mappings":"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"}

package/src/command-line/{print-affected.d.ts → affected/print-affected.d.ts}

@@ -1,7 +1,7 @@
 import * as yargs from 'yargs';
-import type { NxArgs } from '../utils/command-line-utils';
-import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
-import { NxJsonConfiguration } from '../config/nx-json';
+import type { NxArgs } from '../../utils/command-line-utils';
+import { ProjectGraph, ProjectGraphProjectNode } from '../../config/project-graph';
+import { NxJsonConfiguration } from '../../config/nx-json';
 export declare function printAffected(affectedProjects: ProjectGraphProjectNode[], projectGraph: ProjectGraph, { nxJson }: {
     nxJson: NxJsonConfiguration;
 }, nxArgs: NxArgs, overrides: yargs.Arguments): Promise<void>;

package/src/command-line/{print-affected.js → affected/print-affected.js}

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selectPrintAffected = exports.printAffected = void 0;
 const tslib_1 = require("tslib");
-const utils_1 = require("../tasks-runner/utils");
-const create_task_graph_1 = require("../tasks-runner/create-task-graph");
-const workspaces_1 = require("../config/workspaces");
-const hasher_1 = require("../hasher/hasher");
-const hash_task_1 = require("../hasher/hash-task");
-const workspace_root_1 = require("../utils/workspace-root");
-const package_manager_1 = require("../utils/package-manager");
+const utils_1 = require("../../tasks-runner/utils");
+const create_task_graph_1 = require("../../tasks-runner/create-task-graph");
+const workspaces_1 = require("../../config/workspaces");
+const hasher_1 = require("../../hasher/hasher");
+const hash_task_1 = require("../../hasher/hash-task");
+const workspace_root_1 = require("../../utils/workspace-root");
+const package_manager_1 = require("../../utils/package-manager");
 function printAffected(affectedProjects, projectGraph, { nxJson }, nxArgs, overrides) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const projectsForType = affectedProjects.filter((p) => nxArgs.type ? p.type === nxArgs.type : true);

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

@@ -0,0 +1 @@
+{"version":3,"file":"print-affected.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/print-affected.ts"],"names":[],"mappings":"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"}