nx 16.2.1 → 16.3.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +12 -12
- package/src/command-line/affected/affected.js +4 -4
- package/src/command-line/affected/affected.js.map +1 -1
- package/src/command-line/affected/print-affected.js +3 -2
- package/src/command-line/affected/print-affected.js.map +1 -1
- package/src/command-line/format/format.js +2 -1
- package/src/command-line/format/format.js.map +1 -1
- package/src/command-line/graph/graph.d.ts +2 -1
- package/src/command-line/graph/graph.js +8 -13
- package/src/command-line/graph/graph.js.map +1 -1
- package/src/command-line/report/report.d.ts +1 -1
- package/src/command-line/report/report.js +2 -2
- package/src/command-line/report/report.js.map +1 -1
- package/src/command-line/run/run.js +1 -1
- package/src/command-line/run/run.js.map +1 -1
- package/src/command-line/run-many/run-many.js +5 -8
- package/src/command-line/run-many/run-many.js.map +1 -1
- package/src/command-line/show/show.js +2 -1
- package/src/command-line/show/show.js.map +1 -1
- package/src/config/misc-interfaces.d.ts +8 -8
- package/src/config/project-graph.d.ts +3 -8
- package/src/config/project-graph.js +9 -1
- package/src/config/project-graph.js.map +1 -1
- package/src/core/graph/main.js +1 -1
- package/src/daemon/client/client.d.ts +3 -0
- package/src/daemon/client/client.js +7 -0
- package/src/daemon/client/client.js.map +1 -1
- package/src/daemon/server/file-watching/file-watcher-sockets.js +2 -2
- package/src/daemon/server/file-watching/file-watcher-sockets.js.map +1 -1
- package/src/daemon/server/handle-hash-tasks.d.ts +8 -0
- package/src/daemon/server/handle-hash-tasks.js +31 -0
- package/src/daemon/server/handle-hash-tasks.js.map +1 -0
- package/src/daemon/server/project-graph-incremental-recomputation.d.ts +10 -3
- package/src/daemon/server/project-graph-incremental-recomputation.js +38 -15
- package/src/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/daemon/server/server.js +8 -6
- package/src/daemon/server/server.js.map +1 -1
- package/src/devkit-exports.d.ts +2 -1
- package/src/devkit-exports.js +3 -6
- package/src/devkit-exports.js.map +1 -1
- package/src/executors/utils/convert-nx-executor.js +1 -1
- package/src/executors/utils/convert-nx-executor.js.map +1 -1
- package/src/hasher/hash-task.d.ts +3 -3
- package/src/hasher/hash-task.js +14 -10
- package/src/hasher/hash-task.js.map +1 -1
- package/src/hasher/impl/file-hasher-base.d.ts +21 -0
- package/src/hasher/{file-hasher-base.js → impl/file-hasher-base.js} +9 -18
- package/src/hasher/impl/file-hasher-base.js.map +1 -0
- package/src/{utils/get-hashing-implementation.d.ts → hasher/impl/index.d.ts} +3 -0
- package/src/hasher/impl/index.js +43 -0
- package/src/hasher/impl/index.js.map +1 -0
- package/src/hasher/impl/native-file-hasher.d.ts +7 -0
- package/src/hasher/{native-file-hasher.js → impl/native-file-hasher.js} +12 -15
- package/src/hasher/impl/native-file-hasher.js.map +1 -0
- package/src/hasher/impl/node-file-hasher.d.ts +10 -0
- package/src/hasher/{node-based-file-hasher.js → impl/node-file-hasher.js} +41 -17
- package/src/hasher/impl/node-file-hasher.js.map +1 -0
- package/src/hasher/{hasher.d.ts → task-hasher.d.ts} +22 -24
- package/src/hasher/{hasher.js → task-hasher.js} +51 -81
- package/src/hasher/task-hasher.js.map +1 -0
- package/src/native/index.d.ts +1 -0
- package/src/native/index.js +2 -1
- package/src/plugins/js/index.js +1 -3
- package/src/plugins/js/index.js.map +1 -1
- package/src/plugins/js/lock-file/lock-file.js +2 -2
- package/src/plugins/js/lock-file/lock-file.js.map +1 -1
- package/src/plugins/js/lock-file/npm-parser.js +2 -2
- package/src/plugins/js/lock-file/npm-parser.js.map +1 -1
- package/src/plugins/js/lock-file/pnpm-parser.js +2 -2
- package/src/plugins/js/lock-file/pnpm-parser.js.map +1 -1
- package/src/plugins/js/lock-file/project-graph-pruning.js +1 -1
- package/src/plugins/js/lock-file/project-graph-pruning.js.map +1 -1
- package/src/plugins/js/lock-file/yarn-parser.js +2 -2
- package/src/plugins/js/lock-file/yarn-parser.js.map +1 -1
- package/src/plugins/js/package-json/create-package-json.d.ts +2 -2
- package/src/plugins/js/package-json/create-package-json.js +18 -10
- package/src/plugins/js/package-json/create-package-json.js.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/build-dependencies.js +3 -1
- package/src/plugins/js/project-graph/build-dependencies/build-dependencies.js.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +11 -10
- package/src/plugins/js/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js +5 -5
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/plugins/js/project-graph/build-nodes/build-npm-package-nodes.js +2 -2
- package/src/plugins/js/project-graph/build-nodes/build-npm-package-nodes.js.map +1 -1
- package/src/project-graph/build-nodes/workspace-projects.js +2 -2
- package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/project-graph/build-project-graph.d.ts +10 -4
- package/src/project-graph/build-project-graph.js +32 -34
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/nx-deps-cache.d.ts +12 -12
- package/src/project-graph/nx-deps-cache.js +53 -35
- package/src/project-graph/nx-deps-cache.js.map +1 -1
- package/src/project-graph/project-graph-builder.d.ts +3 -2
- package/src/project-graph/project-graph-builder.js +23 -18
- package/src/project-graph/project-graph-builder.js.map +1 -1
- package/src/project-graph/project-graph.d.ts +0 -9
- package/src/project-graph/project-graph.js +16 -47
- package/src/project-graph/project-graph.js.map +1 -1
- package/src/tasks-runner/run-command.js +12 -14
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.d.ts +2 -2
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +2 -2
- package/src/tasks-runner/tasks-schedule.d.ts +2 -2
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/utils/assert-workspace-validity.js +1 -1
- package/src/utils/assert-workspace-validity.js.map +1 -1
- package/src/utils/find-matching-projects.d.ts +1 -3
- package/src/utils/find-matching-projects.js +5 -14
- package/src/utils/find-matching-projects.js.map +1 -1
- package/src/utils/split-target.d.ts +1 -1
- package/src/utils/split-target.js +3 -2
- package/src/utils/split-target.js.map +1 -1
- package/src/hasher/file-hasher-base.d.ts +0 -12
- package/src/hasher/file-hasher-base.js.map +0 -1
- package/src/hasher/file-hasher.d.ts +0 -2
- package/src/hasher/file-hasher.js +0 -16
- package/src/hasher/file-hasher.js.map +0 -1
- package/src/hasher/hasher.js.map +0 -1
- package/src/hasher/hashing-impl.d.ts +0 -5
- package/src/hasher/hashing-impl.js +0 -26
- package/src/hasher/hashing-impl.js.map +0 -1
- package/src/hasher/native-file-hasher.d.ts +0 -7
- package/src/hasher/native-file-hasher.js.map +0 -1
- package/src/hasher/node-based-file-hasher.d.ts +0 -8
- package/src/hasher/node-based-file-hasher.js.map +0 -1
- package/src/utils/get-hashing-implementation.js +0 -24
- package/src/utils/get-hashing-implementation.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "16.
|
|
3
|
+
"version": "16.3.0-beta.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
|
6
6
|
"repository": {
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
},
|
|
33
33
|
"homepage": "https://nx.dev",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nrwl/tao": "16.
|
|
35
|
+
"@nrwl/tao": "16.3.0-beta.0",
|
|
36
36
|
"@parcel/watcher": "2.0.4",
|
|
37
37
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
38
38
|
"@yarnpkg/parsers": "^3.0.0-rc.18",
|
|
@@ -80,15 +80,15 @@
|
|
|
80
80
|
}
|
|
81
81
|
},
|
|
82
82
|
"optionalDependencies": {
|
|
83
|
-
"@nx/nx-darwin-arm64": "16.
|
|
84
|
-
"@nx/nx-darwin-x64": "16.
|
|
85
|
-
"@nx/nx-linux-arm-gnueabihf": "16.
|
|
86
|
-
"@nx/nx-linux-arm64-gnu": "16.
|
|
87
|
-
"@nx/nx-linux-arm64-musl": "16.
|
|
88
|
-
"@nx/nx-linux-x64-gnu": "16.
|
|
89
|
-
"@nx/nx-linux-x64-musl": "16.
|
|
90
|
-
"@nx/nx-win32-arm64-msvc": "16.
|
|
91
|
-
"@nx/nx-win32-x64-msvc": "16.
|
|
83
|
+
"@nx/nx-darwin-arm64": "16.3.0-beta.0",
|
|
84
|
+
"@nx/nx-darwin-x64": "16.3.0-beta.0",
|
|
85
|
+
"@nx/nx-linux-arm-gnueabihf": "16.3.0-beta.0",
|
|
86
|
+
"@nx/nx-linux-arm64-gnu": "16.3.0-beta.0",
|
|
87
|
+
"@nx/nx-linux-arm64-musl": "16.3.0-beta.0",
|
|
88
|
+
"@nx/nx-linux-x64-gnu": "16.3.0-beta.0",
|
|
89
|
+
"@nx/nx-linux-x64-musl": "16.3.0-beta.0",
|
|
90
|
+
"@nx/nx-win32-arm64-msvc": "16.3.0-beta.0",
|
|
91
|
+
"@nx/nx-win32-x64-msvc": "16.3.0-beta.0"
|
|
92
92
|
},
|
|
93
93
|
"nx-migrations": {
|
|
94
94
|
"migrations": "./migrations.json",
|
|
@@ -173,5 +173,5 @@
|
|
|
173
173
|
},
|
|
174
174
|
"main": "./bin/nx.js",
|
|
175
175
|
"types": "./bin/nx.d.ts",
|
|
176
|
-
"gitHead": "
|
|
176
|
+
"gitHead": "74c5ad330622238c7f80df55454e9dbdc792cb22"
|
|
177
177
|
}
|
|
@@ -5,11 +5,9 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const file_utils_1 = require("../../project-graph/file-utils");
|
|
6
6
|
const run_command_1 = require("../../tasks-runner/run-command");
|
|
7
7
|
const output_1 = require("../../utils/output");
|
|
8
|
-
const graph_1 = require("../graph/graph");
|
|
9
8
|
const print_affected_1 = require("./print-affected");
|
|
10
9
|
const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
|
|
11
10
|
const command_line_utils_1 = require("../../utils/command-line-utils");
|
|
12
|
-
const command_line_utils_2 = require("../../utils/command-line-utils");
|
|
13
11
|
const perf_hooks_1 = require("perf_hooks");
|
|
14
12
|
const project_graph_1 = require("../../project-graph/project-graph");
|
|
15
13
|
const project_graph_utils_1 = require("../../utils/project-graph-utils");
|
|
@@ -17,12 +15,14 @@ const affected_project_graph_1 = require("../../project-graph/affected/affected-
|
|
|
17
15
|
const configuration_1 = require("../../config/configuration");
|
|
18
16
|
const workspace_configuration_check_1 = require("../../utils/workspace-configuration-check");
|
|
19
17
|
const find_matching_projects_1 = require("../../utils/find-matching-projects");
|
|
18
|
+
const impl_1 = require("../../hasher/impl");
|
|
19
|
+
const graph_1 = require("../graph/graph");
|
|
20
20
|
function affected(command, args, extraTargetDependencies = {}) {
|
|
21
21
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
perf_hooks_1.performance.mark('command-execution-begins');
|
|
23
23
|
(0, workspace_configuration_check_1.workspaceConfigurationCheck)();
|
|
24
24
|
const nxJson = (0, configuration_1.readNxJson)();
|
|
25
|
-
const { nxArgs, overrides } = (0,
|
|
25
|
+
const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', {
|
|
26
26
|
printWarnings: command !== 'print-affected' && !args.plain && args.graph !== 'stdout',
|
|
27
27
|
}, nxJson);
|
|
28
28
|
if (nxArgs.verbose) {
|
|
@@ -78,7 +78,7 @@ function projectsToRun(nxArgs, projectGraph) {
|
|
|
78
78
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
79
79
|
let affectedGraph = nxArgs.all
|
|
80
80
|
? projectGraph
|
|
81
|
-
: yield (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0,
|
|
81
|
+
: yield (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0, command_line_utils_1.parseFiles)(nxArgs).files, impl_1.fileHasher.allFileData(), nxArgs));
|
|
82
82
|
if (nxArgs.exclude) {
|
|
83
83
|
const excludedProjects = new Set((0, find_matching_projects_1.findMatchingProjects)(nxArgs.exclude, affectedGraph.nodes));
|
|
84
84
|
return Object.entries(affectedGraph.nodes)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/affected.ts"],"names":[],"mappings":";;;;AAAA,+DAAsE;AACtE,gEAA4D;AAC5D,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/affected.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,11 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const utils_1 = require("../../tasks-runner/utils");
|
|
6
6
|
const create_task_graph_1 = require("../../tasks-runner/create-task-graph");
|
|
7
7
|
const workspaces_1 = require("../../config/workspaces");
|
|
8
|
-
const
|
|
8
|
+
const task_hasher_1 = require("../../hasher/task-hasher");
|
|
9
9
|
const hash_task_1 = require("../../hasher/hash-task");
|
|
10
10
|
const workspace_root_1 = require("../../utils/workspace-root");
|
|
11
11
|
const package_manager_1 = require("../../utils/package-manager");
|
|
12
|
+
const impl_1 = require("../../hasher/impl");
|
|
12
13
|
function printAffected(affectedProjects, projectGraph, { nxJson }, nxArgs, overrides) {
|
|
13
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
15
|
const projectsForType = affectedProjects.filter((p) => nxArgs.type ? p.type === nxArgs.type : true);
|
|
@@ -33,7 +34,7 @@ exports.printAffected = printAffected;
|
|
|
33
34
|
function createTasks(affectedProjectsWithTargetAndConfig, projectGraph, nxArgs, nxJson, overrides) {
|
|
34
35
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
36
|
const workspaces = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
|
|
36
|
-
const hasher = new
|
|
37
|
+
const hasher = new task_hasher_1.InProcessTaskHasher({}, [], projectGraph, nxJson, {}, impl_1.fileHasher);
|
|
37
38
|
const execCommand = (0, package_manager_1.getPackageManagerCommand)().exec;
|
|
38
39
|
const p = new create_task_graph_1.ProcessTasks({}, projectGraph);
|
|
39
40
|
const tasks = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print-affected.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/print-affected.ts"],"names":[],"mappings":";;;;AAAA,oDAA0E;AAO1E,4EAAoE;AAEpE,wDAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"print-affected.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/print-affected.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const project_graph_1 = require("../../project-graph/project-graph");
|
|
|
14
14
|
const affected_project_graph_1 = require("../../project-graph/affected/affected-project-graph");
|
|
15
15
|
const configuration_1 = require("../../config/configuration");
|
|
16
16
|
const chunkify_1 = require("../../utils/chunkify");
|
|
17
|
+
const impl_1 = require("../../hasher/impl");
|
|
17
18
|
const PRETTIER_PATH = require.resolve('prettier/bin-prettier');
|
|
18
19
|
function format(command, args) {
|
|
19
20
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -62,7 +63,7 @@ function getPatterns(args) {
|
|
|
62
63
|
.concat('.swcrc');
|
|
63
64
|
const patterns = p.files.filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.includes(path.extname(f)));
|
|
64
65
|
return args.libsAndApps
|
|
65
|
-
? yield getPatternsFromApps(patterns,
|
|
66
|
+
? yield getPatternsFromApps(patterns, impl_1.fileHasher.allFileData(), graph)
|
|
66
67
|
: patterns;
|
|
67
68
|
}
|
|
68
69
|
catch (_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/format/format.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uEAKwC;AACxC,qDAAgF;AAChF,+DAAgF;AAGhF,qCAAqC;AACrC,yDAA2D;AAC3D,kEAG2C;AAC3C,qEAA4E;AAC5E,gGAAqF;AACrF,8DAAwD;AAExD,mDAAgD;
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/format/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { ProjectGraphDependency, ProjectGraphProjectNode } from '../../config/project-graph';
|
|
1
|
+
import { ProjectFileMap, ProjectGraphDependency, ProjectGraphProjectNode } from '../../config/project-graph';
|
|
2
2
|
import { TaskGraph } from '../../config/task-graph';
|
|
3
3
|
export interface ProjectGraphClientResponse {
|
|
4
4
|
hash: string;
|
|
5
5
|
projects: ProjectGraphProjectNode[];
|
|
6
6
|
dependencies: Record<string, ProjectGraphDependency[]>;
|
|
7
|
+
fileMap: ProjectFileMap;
|
|
7
8
|
layout: {
|
|
8
9
|
appsDir: string;
|
|
9
10
|
libsDir: string;
|
|
@@ -12,13 +12,14 @@ const path_1 = require("path");
|
|
|
12
12
|
const perf_hooks_1 = require("perf_hooks");
|
|
13
13
|
const url_1 = require("url");
|
|
14
14
|
const configuration_1 = require("../../config/configuration");
|
|
15
|
-
const
|
|
15
|
+
const impl_1 = require("../../hasher/impl");
|
|
16
16
|
const output_1 = require("../../utils/output");
|
|
17
17
|
const fileutils_1 = require("../../utils/fileutils");
|
|
18
18
|
const operators_1 = require("../../project-graph/operators");
|
|
19
19
|
const project_graph_1 = require("../../project-graph/project-graph");
|
|
20
20
|
const create_task_graph_1 = require("../../tasks-runner/create-task-graph");
|
|
21
21
|
const client_1 = require("../../daemon/client/client");
|
|
22
|
+
const nx_deps_cache_1 = require("../../project-graph/nx-deps-cache");
|
|
22
23
|
// maps file extention to MIME types
|
|
23
24
|
const mimeType = {
|
|
24
25
|
'.ico': 'image/x-icon',
|
|
@@ -335,6 +336,7 @@ let currentDepGraphClientResponse = {
|
|
|
335
336
|
hash: null,
|
|
336
337
|
projects: [],
|
|
337
338
|
dependencies: {},
|
|
339
|
+
fileMap: {},
|
|
338
340
|
layout: {
|
|
339
341
|
appsDir: '',
|
|
340
342
|
libsDir: '',
|
|
@@ -379,21 +381,13 @@ function createFileWatcher() {
|
|
|
379
381
|
function createDepGraphClientResponse(affected = []) {
|
|
380
382
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
381
383
|
perf_hooks_1.performance.mark('project graph watch calculation:start');
|
|
382
|
-
yield
|
|
384
|
+
yield impl_1.fileHasher.init();
|
|
383
385
|
let graph = (0, operators_1.pruneExternalNodes)(yield (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true }));
|
|
386
|
+
let fileMap = (0, nx_deps_cache_1.readProjectFileMapCache)().projectFileMap;
|
|
384
387
|
perf_hooks_1.performance.mark('project graph watch calculation:end');
|
|
385
388
|
perf_hooks_1.performance.mark('project graph response generation:start');
|
|
386
389
|
const layout = (0, configuration_1.workspaceLayout)();
|
|
387
|
-
const projects = Object.values(graph.nodes)
|
|
388
|
-
name: project.name,
|
|
389
|
-
type: project.type,
|
|
390
|
-
data: {
|
|
391
|
-
tags: project.data.tags,
|
|
392
|
-
root: project.data.root,
|
|
393
|
-
files: project.data.files,
|
|
394
|
-
targets: project.data.targets,
|
|
395
|
-
},
|
|
396
|
-
}));
|
|
390
|
+
const projects = Object.values(graph.nodes);
|
|
397
391
|
const dependencies = graph.dependencies;
|
|
398
392
|
const hasher = (0, crypto_1.createHash)('sha256');
|
|
399
393
|
hasher.update(JSON.stringify({ layout, projects, dependencies }));
|
|
@@ -405,7 +399,8 @@ function createDepGraphClientResponse(affected = []) {
|
|
|
405
399
|
layout,
|
|
406
400
|
projects,
|
|
407
401
|
dependencies,
|
|
408
|
-
affected
|
|
402
|
+
affected,
|
|
403
|
+
fileMap });
|
|
409
404
|
});
|
|
410
405
|
}
|
|
411
406
|
function createTaskGraphClientResponse() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/graph/graph.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/graph/graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PackageManager } from '../../utils/package-manager';
|
|
2
2
|
import { PackageJson } from '../../utils/package-json';
|
|
3
|
-
import { HasherImplementation } from '../../
|
|
3
|
+
import { HasherImplementation } from '../../hasher/impl';
|
|
4
4
|
export declare const packagesWeCareAbout: string[];
|
|
5
5
|
export declare const patternsWeIgnoreInCommunityReport: Array<string | RegExp>;
|
|
6
6
|
/**
|
|
@@ -13,7 +13,7 @@ const project_graph_1 = require("../../project-graph/project-graph");
|
|
|
13
13
|
const semver_1 = require("semver");
|
|
14
14
|
const installed_plugins_1 = require("../../utils/plugins/installed-plugins");
|
|
15
15
|
const installation_directory_1 = require("../../utils/installation-directory");
|
|
16
|
-
const
|
|
16
|
+
const impl_1 = require("../../hasher/impl");
|
|
17
17
|
const nxPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '../../../package.json'));
|
|
18
18
|
exports.packagesWeCareAbout = [
|
|
19
19
|
'lerna',
|
|
@@ -112,7 +112,7 @@ function getReportData() {
|
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
114
|
const outOfSyncPackageGroup = findMisalignedPackagesForPackage(nxPackageJson);
|
|
115
|
-
const currentHasherImplementation = (0,
|
|
115
|
+
const currentHasherImplementation = (0, impl_1.getHashingImplementation)();
|
|
116
116
|
return {
|
|
117
117
|
pm,
|
|
118
118
|
pmVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/report/report.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,+CAA4C;AAC5C,+BAA4B;AAC5B,iEAIqC;AACrC,qDAAqD;AACrD,2DAIkC;AAClC,qEAA6E;AAC7E,qEAG2C;AAC3C,mCAAmC;AACnC,6EAA6E;AAC7E,+EAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/report/report.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,+CAA4C;AAC5C,+BAA4B;AAC5B,iEAIqC;AACrC,qDAAqD;AACrD,2DAIkC;AAClC,qEAA6E;AAC7E,qEAG2C;AAC3C,mCAAmC;AACnC,6EAA6E;AAC7E,+EAAuE;AACvE,4CAG2B;AAE3B,MAAM,aAAa,GAAG,IAAA,wBAAY,EAChC,IAAA,WAAI,EAAC,SAAS,EAAE,uBAAuB,CAAC,CACzC,CAAC;AAEW,QAAA,mBAAmB,GAAG;IACjC,OAAO;IACP,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACvD,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CACtC;IACD,kBAAkB;IAClB,YAAY;CACb,CAAC;AAEW,QAAA,iCAAiC,GAA2B;IACvE,GAAG,2BAAmB;IACtB,qBAAqB;IACrB,IAAI,MAAM,CAAC,YAAY,CAAC;IACxB,oBAAoB;CACrB,CAAC;AAEF,MAAM,cAAc,GAAG,yCAAyC,CAAC;AACjE;;;;;;;GAOG;AACH,SAAsB,aAAa;;QACjC,MAAM,EACJ,EAAE,EACF,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,0BAA0B,EAC1B,qBAAqB,EACrB,iBAAiB,EACjB,2BAA2B,GAC5B,GAAG,MAAM,aAAa,EAAE,CAAC;QAE1B,MAAM,SAAS,GAAG;YAChB,YAAY,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;YACnC,YAAY,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;YAC9C,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;YAC/B,YAAY,2BAA2B,EAAE;YACzC,EAAE;SACH,CAAC;QAEF,IAAI,OAAO,GACT,IAAI,CAAC,GAAG,CAAC,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;QAC3E,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACvC,SAAS,CAAC,IAAI,CACZ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CACvE,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,gBAAgB,CAAC,MAAM,EAAE;YAC3B,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC/B,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;YACtE,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACrC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC7B,SAAS,CAAC,IAAI,CACZ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CACnE,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,YAAY,CAAC,MAAM,EAAE;YACvB,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAE/B,SAAS,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YAE3C,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE;gBACjC,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;aAC7C;SACF;QAED,IAAI,qBAAqB,EAAE;YACzB,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC/B,SAAS,CAAC,IAAI,CACZ,gEAAgE,qBAAqB,CAAC,WAAW,EAAE,CACpG,CAAC;YACF,KAAK,MAAM,GAAG,IAAI,qBAAqB,CAAC,kBAAkB,EAAE;gBAC1D,SAAS,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;aAClD;YACD,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnB,SAAS,CAAC,IAAI,CACZ,iCAAiC,qBAAqB,CAAC,aAAa,IAAI,CACzE,CAAC;SACH;QAED,IAAI,iBAAiB,EAAE;YACrB,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YACxD,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC1C,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;SACzC;QAED,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,qDAAqD;YAC5D,SAAS;SACV,CAAC,CAAC;IACL,CAAC;CAAA;AA1ED,sCA0EC;AAuBD,SAAsB,aAAa;;QACjC,MAAM,EAAE,GAAG,IAAA,sCAAoB,GAAE,CAAC;QAClC,MAAM,SAAS,GAAG,IAAA,0CAAwB,EAAC,EAAE,CAAC,CAAC;QAE/C,MAAM,YAAY,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC9C,MAAM,gBAAgB,GAAG,6BAA6B,EAAE,CAAC;QAEzD,IAAI,iBAAiB,GAAiB,IAAI,CAAC;QAC3C,IAAI;YACF,MAAM,IAAA,uCAAuB,GAAE,CAAC;SACjC;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB,GAAG,CAAC,CAAC;SACvB;QAED,MAAM,0BAA0B,GAAG,gCAAgC,EAAE,CAAC;QACtE,0BAA0B,CAAC,OAAO,CAAC;YACjC,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,aAAa,CAAC,OAAO;SAC/B,CAAC,CAAC;QACH,IAAI,UAAU,CAAC,iBAAiB,EAAE;YAChC,0BAA0B,CAAC,OAAO,CAAC;gBACjC,OAAO,EAAE,aAAa;gBACtB,OAAO,EAAE,UAAU,CAAC,iBAAiB;aACtC,CAAC,CAAC;SACJ;QAED,MAAM,qBAAqB,GAAG,gCAAgC,CAAC,aAAa,CAAC,CAAC;QAE9E,MAAM,2BAA2B,GAAG,IAAA,+BAAwB,GAAE,CAAC;QAE/D,OAAO;YACL,EAAE;YACF,SAAS;YACT,YAAY;YACZ,gBAAgB;YAChB,0BAA0B;YAC1B,qBAAqB;YACrB,iBAAiB;YACjB,2BAA2B;SAC5B,CAAC;IACJ,CAAC;CAAA;AAxCD,sCAwCC;AAED,SAAe,gBAAgB;;QAC7B,IAAI;YACF,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1E,MAAM,YAAY,GAAG,MAAM,IAAA,wCAAwB,EACjD,IAAA,yDAAyC,EAAC,YAAY,CAAC,CACxD,CAAC;YACF,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;SACxC;QAAC,WAAM;YACN,OAAO,EAAE,CAAC;SACX;IACH,CAAC;CAAA;AAED,SAAS,eAAe,CAAC,CAAS;IAChC,IAAI;QACF,OAAO,IAAA,oCAAqB,EAAC,CAAC,EAAE,IAAA,0CAAiB,GAAE,CAAC,CAAC,WAAW,CAAC;KAClE;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,CAAS;;IACnC,OAAO,MAAA,eAAe,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC;AACrC,CAAC;AAWD,SAAgB,gCAAgC,CAC9C,IAAiB;IAEjB,MAAM,kBAAkB,GAAwC,EAAE,CAAC;IAEnE,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC;IAEjC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,kCAAmB,EAAC,IAAI,CAAC,CAAC;IAEnD,KAAK,MAAM,KAAK,IAAI,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,EAAE;QACtC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QAChD,oBAAoB;QACpB,IAAI,OAAO,KAAK,GAAG,EAAE;YACnB,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAEzD,IAAI,gBAAgB,IAAI,gBAAgB,KAAK,IAAI,CAAC,OAAO,EAAE;gBACzD,IAAI,IAAA,cAAK,EAAC,gBAAgB,CAAC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,aAAa,CAAC,EAAE;oBAClE,aAAa,GAAG,gBAAgB,CAAC;iBAClC;gBACD,kBAAkB,CAAC,IAAI,CAAC;oBACtB,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,gBAAgB;iBAC1B,CAAC,CAAC;aACJ;SACF;KACF;IAED,OAAO,kBAAkB,CAAC,MAAM;QAC9B,CAAC,CAAC;YACE,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,kBAAkB;YAClB,aAAa,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,aAAa,EAAE;SAC/C;QACH,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAlCD,4EAkCC;AAED,SAAgB,6BAA6B;IAC3C,MAAM,gBAAgB,GAAG,IAAA,wCAAoB,GAAE,CAAC;IAChD,OAAO,gBAAgB,CAAC,MAAM,CAC5B,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,IAAI,KAAK,IAAI;QACjB,CAAC,yCAAiC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAClD,OAAO,OAAO,KAAK,QAAQ;YACzB,CAAC,CAAC,OAAO,KAAK,GAAG,CAAC,IAAI;YACtB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAC3B,CACJ,CAAC;AACJ,CAAC;AAXD,sEAWC;AACD,SAAgB,gCAAgC;;IAC9C,MAAM,sBAAsB,GAA2B,EAAE,CAAC;IAC1D,8FAA8F;IAC9F,MAAM,gBAAgB,GAA2B;QAC/C,iBAAiB,EAAE,YAAY;QAC/B,YAAY,EAAE,iBAAiB;QAC/B,wBAAwB,EAAE,mBAAmB;QAC7C,mBAAmB,EAAE,wBAAwB;QAC7C,gBAAgB,EAAE,UAAU;KAC7B,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,2BAAmB,EAAE;QACrC,MAAM,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,EAAE;YACL,iEAAiE;YACjE,mEAAmE;YACnE,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;gBAC5B,MAAM,YAAY,GAChB,MAAA,gBAAgB,CAAC,GAAG,CAAC,mCAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBACzD,MAAM,YAAY,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;gBAC1D,IAAI,CAAC,YAAY,IAAI,CAAC,KAAK,YAAY,EAAE;oBACvC,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBACjC;gBACD,4DAA4D;gBAC5D,8DAA8D;aAC/D;iBAAM,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACjC,MAAM,YAAY,GAChB,MAAA,gBAAgB,CAAC,GAAG,CAAC,mCAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBACzD,MAAM,YAAY,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;gBAC1D,IAAI,YAAY,IAAI,CAAC,KAAK,YAAY,EAAE;oBACtC,OAAO,sBAAsB,CAAC,YAAY,CAAC,CAAC;iBAC7C;gBACD,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACjC;iBAAM;gBACL,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACjC;SACF;KACF;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACrE,OAAO,EAAE,GAAG;QACZ,OAAO;KACR,CAAC,CAAC,CAAC;AACN,CAAC;AA3CD,4EA2CC"}
|
|
@@ -103,9 +103,9 @@ function runExecutorInternal({ project, target, configuration, }, overrides, roo
|
|
|
103
103
|
const r = implementation(combinedOptions, {
|
|
104
104
|
root,
|
|
105
105
|
target: targetConfig,
|
|
106
|
-
workspace: Object.assign(Object.assign({}, projectsConfigurations), nxJsonConfiguration),
|
|
107
106
|
projectsConfigurations,
|
|
108
107
|
nxJsonConfiguration,
|
|
108
|
+
workspace: Object.assign(Object.assign({}, projectsConfigurations), nxJsonConfiguration),
|
|
109
109
|
projectName: project,
|
|
110
110
|
targetName: target,
|
|
111
111
|
configurationName: configuration,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/run/run.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/run/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,13 +46,13 @@ function runMany(args, extraTargetDependencies = {}, extraOptions = { excludeTas
|
|
|
46
46
|
}
|
|
47
47
|
exports.runMany = runMany;
|
|
48
48
|
function projectsToRun(nxArgs, projectGraph) {
|
|
49
|
-
const selectedProjects =
|
|
49
|
+
const selectedProjects = {};
|
|
50
50
|
const validProjects = runnableForTarget(projectGraph.nodes, nxArgs.targets);
|
|
51
51
|
const invalidProjects = [];
|
|
52
52
|
// --all is default now, if --projects is provided, it'll override the --all
|
|
53
53
|
if (nxArgs.all && nxArgs.projects.length === 0) {
|
|
54
54
|
for (const projectName of validProjects) {
|
|
55
|
-
selectedProjects
|
|
55
|
+
selectedProjects[projectName] = projectGraph.nodes[projectName];
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
else {
|
|
@@ -62,7 +62,7 @@ function projectsToRun(nxArgs, projectGraph) {
|
|
|
62
62
|
invalidProjects.push(project);
|
|
63
63
|
}
|
|
64
64
|
else {
|
|
65
|
-
selectedProjects
|
|
65
|
+
selectedProjects[project] = projectGraph.nodes[project];
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
if (invalidProjects.length > 0) {
|
|
@@ -74,12 +74,9 @@ function projectsToRun(nxArgs, projectGraph) {
|
|
|
74
74
|
}
|
|
75
75
|
const excludedProjects = (0, find_matching_projects_1.findMatchingProjects)(nxArgs.exclude, selectedProjects);
|
|
76
76
|
for (const excludedProject of excludedProjects) {
|
|
77
|
-
|
|
78
|
-
if (project) {
|
|
79
|
-
selectedProjects.delete(excludedProject);
|
|
80
|
-
}
|
|
77
|
+
delete selectedProjects[excludedProject];
|
|
81
78
|
}
|
|
82
|
-
return
|
|
79
|
+
return Object.values(selectedProjects);
|
|
83
80
|
}
|
|
84
81
|
exports.projectsToRun = projectsToRun;
|
|
85
82
|
function runnableForTarget(projects, targets) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/run-many/run-many.ts"],"names":[],"mappings":";;;;AAAA,gEAA4D;AAC5D,uEAGwC;AACxC,uEAAiF;AACjF,yEAAmE;AACnE,wEAAmF;AACnF,2CAAyC;AAKzC,qEAA4E;AAE5E,8DAAwD;AACxD,+CAA4C;AAC5C,+EAA0E;AAC1E,6FAAwF;AACxF,0CAA+C;AAE/C,SAAsB,OAAO,CAC3B,IAA0B,EAC1B,0BAGI,EAAE,EACN,eAAe,EAAE,uBAAuB,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAGrE;;QAED,wBAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7C,IAAA,2DAA2B,GAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oDAA+B,EAC3D,IAAI,EACJ,UAAU,EACV,EAAE,aAAa,EAAE,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,EAC1C,MAAM,CACP,CAAC;QACF,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,MAAM,CAAC;SACzC;QAED,MAAM,IAAA,uDAAiC,EAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAErD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,MAAM,IAAI,GAAG,IAAA,8CAAyB,EAAC,MAAM,CAAC,CAAC;YAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,MAAM,IAAA,qBAAa,EACxB;gBACE,KAAK,EAAE,KAAK;gBACZ,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,QAAQ,EAAE,YAAY;gBACtB,IAAI;aACL,EACD,YAAY,CACb,CAAC;SACH;aAAM;YACL,MAAM,IAAA,wBAAU,EACd,QAAQ,EACR,YAAY,EACZ,EAAE,MAAM,EAAE,EACV,MAAM,EACN,SAAS,EACT,IAAI,EACJ,uBAAuB,EACvB,YAAY,CACb,CAAC;SACH;IACH,CAAC;CAAA;AAxDD,0BAwDC;AAED,SAAgB,aAAa,CAC3B,MAAc,EACd,YAA0B;IAE1B,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/run-many/run-many.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const file_utils_1 = require("../../project-graph/file-utils");
|
|
|
7
7
|
const command_line_utils_1 = require("../../utils/command-line-utils");
|
|
8
8
|
const project_graph_1 = require("../../project-graph/project-graph");
|
|
9
9
|
const find_matching_projects_1 = require("../../utils/find-matching-projects");
|
|
10
|
+
const impl_1 = require("../../hasher/impl");
|
|
10
11
|
function showProjectsHandler(args) {
|
|
11
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
13
|
let graph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
@@ -33,6 +34,6 @@ function showProjectsHandler(args) {
|
|
|
33
34
|
}
|
|
34
35
|
exports.showProjectsHandler = showProjectsHandler;
|
|
35
36
|
function getAffectedGraph(nxArgs, nxJson, graph) {
|
|
36
|
-
return (0, affected_project_graph_1.filterAffected)(graph, (0, file_utils_1.calculateFileChanges)((0, command_line_utils_1.parseFiles)(nxArgs).files,
|
|
37
|
+
return (0, affected_project_graph_1.filterAffected)(graph, (0, file_utils_1.calculateFileChanges)((0, command_line_utils_1.parseFiles)(nxArgs).files, impl_1.fileHasher.allFileData(), nxArgs), nxJson);
|
|
37
38
|
}
|
|
38
39
|
//# sourceMappingURL=show.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/show/show.ts"],"names":[],"mappings":";;;;AAAA,gGAAqF;AACrF,+DAGwC;AACxC,uEAIwC;AACxC,qEAA4E;AAG5E,+EAA0E;
|
|
1
|
+
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/show/show.ts"],"names":[],"mappings":";;;;AAAA,gGAAqF;AACrF,+DAGwC;AACxC,uEAIwC;AACxC,qEAA4E;AAG5E,+EAA0E;AAC1E,4CAA+C;AAY/C,SAAsB,mBAAmB,CACvC,IAAwB;;QAExB,IAAI,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,oDAA+B,EAChD,IAAI,EACJ,UAAU,EACV;YACE,aAAa,EAAE,KAAK;SACrB,EACD,MAAM,CACP,CAAC;QAEF,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,KAAK,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;SACvD;QAED,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAE3D,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,MAAM,gBAAgB,GAAG,IAAA,6CAAoB,EAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3E,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;gBAC9C,gBAAgB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;aAC1C;SACF;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SACvB;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;CAAA;AAhCD,kDAgCC;AAED,SAAS,gBAAgB,CACvB,MAAc,EACd,MAA2C,EAC3C,KAAmB;IAEnB,OAAO,IAAA,uCAAc,EACnB,KAAK,EACL,IAAA,iCAAoB,EAClB,IAAA,+BAAU,EAAC,MAAM,CAAC,CAAC,KAAK,EACxB,iBAAU,CAAC,WAAW,EAAE,EACxB,MAAM,CACP,EACD,MAAM,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Hash,
|
|
1
|
+
import { Hash, TaskHasher } from '../hasher/task-hasher';
|
|
2
2
|
import { ProjectGraph } from './project-graph';
|
|
3
3
|
import { Task, TaskGraph } from './task-graph';
|
|
4
4
|
import { TargetConfiguration, ProjectsConfigurations } from './workspace-json-project-json';
|
|
@@ -100,7 +100,7 @@ options: T, context: ExecutorContext) => Promise<{
|
|
|
100
100
|
success: boolean;
|
|
101
101
|
}>;
|
|
102
102
|
export interface HasherContext {
|
|
103
|
-
hasher:
|
|
103
|
+
hasher: TaskHasher;
|
|
104
104
|
projectGraph: ProjectGraph;
|
|
105
105
|
taskGraph: TaskGraph;
|
|
106
106
|
projectsConfigurations: ProjectsConfigurations;
|
|
@@ -150,12 +150,6 @@ export interface ExecutorContext {
|
|
|
150
150
|
* The configuration of the target being executed
|
|
151
151
|
*/
|
|
152
152
|
target?: TargetConfiguration;
|
|
153
|
-
/**
|
|
154
|
-
* Deprecated. Use projectsConfigurations or nxJsonConfiguration
|
|
155
|
-
* The full workspace configuration
|
|
156
|
-
* @todo(vsavkin): remove after v17
|
|
157
|
-
*/
|
|
158
|
-
workspace?: ProjectsConfigurations & NxJsonConfiguration;
|
|
159
153
|
/**
|
|
160
154
|
* Projects config
|
|
161
155
|
*
|
|
@@ -183,4 +177,10 @@ export interface ExecutorContext {
|
|
|
183
177
|
* @todo(vsavkin) mark this required for v17
|
|
184
178
|
*/
|
|
185
179
|
projectGraph?: ProjectGraph;
|
|
180
|
+
/**
|
|
181
|
+
* Deprecated. Use projectsConfigurations or nxJsonConfiguration
|
|
182
|
+
* The full workspace configuration
|
|
183
|
+
* @todo(vsavkin): remove after v17
|
|
184
|
+
*/
|
|
185
|
+
workspace?: ProjectsConfigurations & NxJsonConfiguration;
|
|
186
186
|
}
|
|
@@ -6,10 +6,10 @@ import { NxJsonConfiguration } from './nx-json';
|
|
|
6
6
|
export interface FileData {
|
|
7
7
|
file: string;
|
|
8
8
|
hash: string;
|
|
9
|
-
|
|
10
|
-
deps?: string[];
|
|
11
|
-
dependencies?: ProjectGraphDependency[];
|
|
9
|
+
deps?: (string | [string, string])[];
|
|
12
10
|
}
|
|
11
|
+
export declare function fileDataDepTarget(dep: string | [string, string]): string;
|
|
12
|
+
export declare function fileDataDepType(dep: string | [string, string]): string;
|
|
13
13
|
/**
|
|
14
14
|
* A list of files separated by the project they belong to
|
|
15
15
|
*/
|
|
@@ -23,7 +23,6 @@ export interface ProjectGraph {
|
|
|
23
23
|
nodes: Record<string, ProjectGraphProjectNode>;
|
|
24
24
|
externalNodes?: Record<string, ProjectGraphExternalNode>;
|
|
25
25
|
dependencies: Record<string, ProjectGraphDependency[]>;
|
|
26
|
-
allWorkspaceFiles?: FileData[];
|
|
27
26
|
version?: string;
|
|
28
27
|
}
|
|
29
28
|
/**
|
|
@@ -55,10 +54,6 @@ export interface ProjectGraphProjectNode {
|
|
|
55
54
|
* Additional metadata about a project
|
|
56
55
|
*/
|
|
57
56
|
data: ProjectConfiguration & {
|
|
58
|
-
/**
|
|
59
|
-
* Files associated to the project
|
|
60
|
-
*/
|
|
61
|
-
files: FileData[];
|
|
62
57
|
description?: string;
|
|
63
58
|
};
|
|
64
59
|
}
|