nx 14.3.6 → 14.4.0-beta.2
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/CHANGELOG.md +1 -1
- package/package.json +4 -4
- package/schemas/nx-schema.json +65 -0
- package/schemas/project-schema.json +67 -0
- package/src/adapter/compat.js +7 -2
- package/src/adapter/compat.js.map +1 -1
- package/src/command-line/affected.js +6 -6
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/format.js +6 -6
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/generate.js +7 -3
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/print-affected.d.ts +4 -2
- package/src/command-line/print-affected.js.map +1 -1
- package/src/command-line/read-environment.d.ts +3 -0
- package/src/command-line/read-environment.js +3 -0
- package/src/command-line/read-environment.js.map +1 -1
- package/src/command-line/run-many.js +4 -4
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +7 -7
- package/src/command-line/run-one.js.map +1 -1
- package/src/command-line/run.d.ts +2 -1
- package/src/command-line/run.js +4 -3
- package/src/command-line/run.js.map +1 -1
- package/src/config/configuration.d.ts +3 -0
- package/src/config/configuration.js +3 -0
- package/src/config/configuration.js.map +1 -1
- package/src/config/nx-json.d.ts +8 -1
- package/src/config/project-graph.d.ts +7 -0
- package/src/config/project-graph.js.map +1 -1
- package/src/config/task-graph.d.ts +3 -3
- package/src/config/workspace-json-project-json.d.ts +14 -0
- package/src/config/workspaces.js +4 -2
- package/src/config/workspaces.js.map +1 -1
- package/src/core/dep-graph/environment.js +1 -0
- package/src/core/dep-graph/favicon.ico +0 -0
- package/src/daemon/client/client.js +1 -1
- package/src/daemon/client/client.js.map +1 -1
- package/src/generators/utils/project-configuration.js +2 -1
- package/src/generators/utils/project-configuration.js.map +1 -1
- package/src/hasher/hasher.d.ts +44 -25
- package/src/hasher/hasher.js +330 -265
- package/src/hasher/hasher.js.map +1 -1
- package/src/project-graph/affected/affected-project-graph-models.d.ts +4 -3
- package/src/project-graph/affected/affected-project-graph.d.ts +2 -2
- package/src/project-graph/affected/affected-project-graph.js +4 -4
- package/src/project-graph/affected/affected-project-graph.js.map +1 -1
- package/src/project-graph/affected/locators/workspace-json-changes.js +3 -3
- package/src/project-graph/affected/locators/workspace-json-changes.js.map +1 -1
- package/src/project-graph/affected/locators/workspace-projects.js +4 -4
- package/src/project-graph/affected/locators/workspace-projects.js.map +1 -1
- package/src/project-graph/build-dependencies/explicit-package-json-dependencies.js +2 -1
- package/src/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/project-graph/build-project-graph.d.ts +1 -1
- package/src/project-graph/build-project-graph.js +12 -12
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/file-utils.d.ts +4 -2
- package/src/project-graph/file-utils.js +14 -5
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/project-graph/project-graph.d.ts +4 -1
- package/src/project-graph/project-graph.js +17 -1
- package/src/project-graph/project-graph.js.map +1 -1
- package/src/tasks-runner/batch/run-batch.js +3 -2
- package/src/tasks-runner/batch/run-batch.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.d.ts +1 -0
- package/src/tasks-runner/task-orchestrator.js +5 -3
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-schedule.d.ts +3 -1
- package/src/tasks-runner/tasks-schedule.js +9 -7
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/tasks-runner/utils.d.ts +4 -3
- package/src/tasks-runner/utils.js +7 -8
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/command-line-utils.d.ts +2 -1
- package/src/utils/command-line-utils.js +2 -4
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/package-json.d.ts +1 -0
- package/src/utils/params.js +6 -1
- package/src/utils/params.js.map +1 -1
- package/src/utils/path.d.ts +10 -0
- package/src/utils/path.js +19 -1
- package/src/utils/path.js.map +1 -1
- package/src/utils/project-graph-utils.d.ts +2 -2
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
package/src/hasher/hasher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import type { Change, FileChange } from '../file-utils';
|
|
2
2
|
import { NxJsonConfiguration } from '../../config/nx-json';
|
|
3
|
-
import { ProjectGraph } from '../../config/project-graph';
|
|
3
|
+
import { ProjectGraph, ProjectGraphProjectNode } from '../../config/project-graph';
|
|
4
|
+
import { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
|
|
4
5
|
export interface AffectedProjectGraphContext {
|
|
5
|
-
|
|
6
|
+
projectGraphNodes: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>;
|
|
6
7
|
nxJson: NxJsonConfiguration<string[]>;
|
|
7
8
|
touchedProjects: string[];
|
|
8
9
|
}
|
|
9
10
|
export interface TouchedProjectLocator<T extends Change = Change> {
|
|
10
|
-
(fileChanges: FileChange<T>[],
|
|
11
|
+
(fileChanges: FileChange<T>[], projectGraphNodes?: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>, nxJson?: NxJsonConfiguration<string[]>, packageJson?: any, projectGraph?: ProjectGraph): string[];
|
|
11
12
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FileChange } from '../file-utils';
|
|
2
2
|
import { NxJsonConfiguration } from '../../config/nx-json';
|
|
3
3
|
import { ProjectGraph } from '../../config/project-graph';
|
|
4
|
-
import {
|
|
5
|
-
export declare function filterAffected(graph: ProjectGraph
|
|
4
|
+
import { ProjectConfiguration } from '../../config/workspace-json-project-json';
|
|
5
|
+
export declare function filterAffected(graph: ProjectGraph<ProjectConfiguration>, touchedFiles: FileChange[], nxJson?: NxJsonConfiguration, packageJson?: any): ProjectGraph;
|
|
@@ -10,8 +10,8 @@ const workspace_json_changes_1 = require("./locators/workspace-json-changes");
|
|
|
10
10
|
const tsconfig_json_changes_1 = require("./locators/tsconfig-json-changes");
|
|
11
11
|
const operators_1 = require("../operators");
|
|
12
12
|
const configuration_1 = require("../../config/configuration");
|
|
13
|
-
function filterAffected(graph, touchedFiles,
|
|
14
|
-
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(
|
|
13
|
+
function filterAffected(graph, touchedFiles, nxJson = (0, configuration_1.readNxJson)(), packageJson = (0, file_utils_1.readPackageJson)()) {
|
|
14
|
+
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(graph.nodes));
|
|
15
15
|
// Additional affected logic should be in this array.
|
|
16
16
|
const touchedProjectLocators = [
|
|
17
17
|
workspace_projects_1.getTouchedProjects,
|
|
@@ -22,10 +22,10 @@ function filterAffected(graph, touchedFiles, workspaceJson = (0, configuration_1
|
|
|
22
22
|
tsconfig_json_changes_1.getTouchedProjectsFromTsConfig,
|
|
23
23
|
];
|
|
24
24
|
const touchedProjects = touchedProjectLocators.reduce((acc, f) => {
|
|
25
|
-
return acc.concat(f(touchedFiles,
|
|
25
|
+
return acc.concat(f(touchedFiles, graph.nodes, normalizedNxJson, packageJson, graph));
|
|
26
26
|
}, []);
|
|
27
27
|
return filterAffectedProjects(graph, {
|
|
28
|
-
|
|
28
|
+
projectGraphNodes: graph.nodes,
|
|
29
29
|
nxJson: normalizedNxJson,
|
|
30
30
|
touchedProjects,
|
|
31
31
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/affected/affected-project-graph.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAC5D,sEAGuC;AACvC,0DAAgE;AAChE,4EAA6F;AAK7F,4DAAuD;AACvD,8EAAsF;AACtF,4EAAkF;AAGlF,4CAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"affected-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/affected/affected-project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTouchedProjectsInWorkspaceJson = void 0;
|
|
4
4
|
const file_utils_1 = require("../../file-utils");
|
|
5
5
|
const json_diff_1 = require("../../../utils/json-diff");
|
|
6
|
-
const getTouchedProjectsInWorkspaceJson = (touchedFiles,
|
|
6
|
+
const getTouchedProjectsInWorkspaceJson = (touchedFiles, projectGraphNodes) => {
|
|
7
7
|
const workspaceChange = touchedFiles.find((change) => change.file === (0, file_utils_1.workspaceFileName)());
|
|
8
8
|
if (!workspaceChange) {
|
|
9
9
|
return [];
|
|
@@ -18,7 +18,7 @@ const getTouchedProjectsInWorkspaceJson = (touchedFiles, workspaceJson) => {
|
|
|
18
18
|
}
|
|
19
19
|
return false;
|
|
20
20
|
})) {
|
|
21
|
-
return Object.keys(
|
|
21
|
+
return Object.keys(projectGraphNodes);
|
|
22
22
|
}
|
|
23
23
|
const touched = [];
|
|
24
24
|
for (let i = 0; i < changes.length; i++) {
|
|
@@ -34,7 +34,7 @@ const getTouchedProjectsInWorkspaceJson = (touchedFiles, workspaceJson) => {
|
|
|
34
34
|
case json_diff_1.DiffType.Deleted: {
|
|
35
35
|
// We are not sure which projects used to depend on a deleted project
|
|
36
36
|
// so return all projects to be safe
|
|
37
|
-
return Object.keys(
|
|
37
|
+
return Object.keys(projectGraphNodes);
|
|
38
38
|
}
|
|
39
39
|
default: {
|
|
40
40
|
// Add the project name
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/workspace-json-changes.ts"],"names":[],"mappings":";;;AAAA,iDAI0B;AAC1B,wDAA8E;AAGvE,MAAM,iCAAiC,GAE1C,CAAC,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"workspace-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/workspace-json-changes.ts"],"names":[],"mappings":";;;AAAA,iDAI0B;AAC1B,wDAA8E;AAGvE,MAAM,iCAAiC,GAE1C,CAAC,YAAY,EAAE,iBAAiB,EAAY,EAAE;IAChD,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CACvC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAA,8BAAiB,GAAE,CAChD,CAAC;IACF,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,EAAE,CAAC;IAE7C,IACE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QACtB,IAAI,IAAA,wBAAY,EAAC,MAAM,CAAC,EAAE;YACxB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC;SACtC;QACD,IAAI,IAAA,8BAAiB,EAAC,MAAM,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,EACF;QACA,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KACvC;IAED,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAA,wBAAY,EAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE;YAC1D,SAAS;SACV;QAED,yEAAyE;QACzE,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,SAAS;SACV;QAED,QAAQ,MAAM,CAAC,IAAI,EAAE;YACnB,KAAK,oBAAQ,CAAC,OAAO,CAAC,CAAC;gBACrB,qEAAqE;gBACrE,oCAAoC;gBACpC,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aACvC;YACD,OAAO,CAAC,CAAC;gBACP,uBAAuB;gBACvB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aAC9B;SACF;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAnDW,QAAA,iCAAiC,qCAmD5C"}
|
|
@@ -2,16 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getImplicitlyTouchedProjects = exports.getTouchedProjects = void 0;
|
|
4
4
|
const minimatch = require("minimatch");
|
|
5
|
-
const getTouchedProjects = (touchedFiles,
|
|
5
|
+
const getTouchedProjects = (touchedFiles, projectGraphNodes) => {
|
|
6
6
|
// sort project names with the most nested first,
|
|
7
7
|
// e.g. ['libs/a/b/c', 'libs/a/b', 'libs/a']
|
|
8
|
-
const projectNames = Object.entries(
|
|
9
|
-
.sort(([name1, p1], [name2, p2]) => p1.root.length > p2.root.length ? -1 : 1)
|
|
8
|
+
const projectNames = Object.entries(projectGraphNodes)
|
|
9
|
+
.sort(([name1, p1], [name2, p2]) => p1.data.root.length > p2.data.root.length ? -1 : 1)
|
|
10
10
|
.map(([name]) => name);
|
|
11
11
|
return touchedFiles
|
|
12
12
|
.map((f) => {
|
|
13
13
|
return projectNames.find((projectName) => {
|
|
14
|
-
const p =
|
|
14
|
+
const p = projectGraphNodes[projectName].data;
|
|
15
15
|
const projectRoot = p.root.endsWith('/') ? p.root : `${p.root}/`;
|
|
16
16
|
return f.file.startsWith(projectRoot);
|
|
17
17
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/workspace-projects.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAGhC,MAAM,kBAAkB,GAA0B,CACvD,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/workspace-projects.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAGhC,MAAM,kBAAkB,GAA0B,CACvD,YAAY,EACZ,iBAAiB,EACP,EAAE;IACZ,iDAAiD;IACjD,4CAA4C;IAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC;SACnD,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CACjC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACnD;SACA,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAEzB,OAAO,YAAY;SAChB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;YACvC,MAAM,CAAC,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;YAC9C,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC;YACjE,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC,CAAC;AArBW,QAAA,kBAAkB,sBAqB7B;AAEK,MAAM,4BAA4B,GAA0B,CACjE,WAAW,EACX,aAAa,EACb,MAAM,EACI,EAAE;IACZ,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE;QAChC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,MAAM,CAAC,oBAAoB,CAC5B,EAAE;QACD,MAAM,4BAA4B,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAC3B,CAAC;QACF,IAAI,CAAC,4BAA4B,EAAE;YACjC,SAAS;SACV;QAED,8DAA8D;QAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC3B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;SACrD;KACF;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC;AA5BW,QAAA,4BAA4B,gCA4BvC"}
|
|
@@ -28,7 +28,8 @@ function createPackageNameMap(w) {
|
|
|
28
28
|
for (let projectName of Object.keys(w.projects)) {
|
|
29
29
|
try {
|
|
30
30
|
const packageJson = (0, json_1.parseJson)((0, file_utils_1.defaultFileRead)((0, path_1.join)(w.projects[projectName].root, 'package.json')));
|
|
31
|
-
res[(_a = packageJson.name) !== null && _a !== void 0 ? _a : (
|
|
31
|
+
res[(_a = packageJson.name) !== null && _a !== void 0 ? _a : (0, path_2.getImportPath)(w.npmScope, projectName)] =
|
|
32
|
+
projectName;
|
|
32
33
|
}
|
|
33
34
|
catch (e) { }
|
|
34
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explicit-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAChD,+BAA4B;AAE5B,2CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"explicit-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { ProjectGraphCache } from './nx-deps-cache';
|
|
|
3
3
|
import { ProjectFileMap, ProjectGraph } from '../config/project-graph';
|
|
4
4
|
import { ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
5
5
|
export declare function buildProjectGraph(): Promise<ProjectGraph<any>>;
|
|
6
|
-
export declare function buildProjectGraphUsingProjectFileMap(
|
|
6
|
+
export declare function buildProjectGraphUsingProjectFileMap(projectsConfigurations: ProjectsConfigurations, projectFileMap: ProjectFileMap, allWorkspaceFiles: FileData[], cache: ProjectGraphCache | null, shouldWriteCache: boolean): Promise<{
|
|
7
7
|
projectGraph: ProjectGraph;
|
|
8
8
|
projectGraphCache: ProjectGraphCache;
|
|
9
9
|
}>;
|
|
@@ -22,26 +22,26 @@ const project_graph_builder_1 = require("./project-graph-builder");
|
|
|
22
22
|
const configuration_1 = require("../config/configuration");
|
|
23
23
|
function buildProjectGraph() {
|
|
24
24
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
const
|
|
26
|
-
const { projectFileMap, allWorkspaceFiles } = (0, file_map_utils_1.createProjectFileMap)(
|
|
25
|
+
const projectConfigurations = (0, configuration_1.readAllWorkspaceConfiguration)();
|
|
26
|
+
const { projectFileMap, allWorkspaceFiles } = (0, file_map_utils_1.createProjectFileMap)(projectConfigurations, file_hasher_1.defaultFileHasher.allFileData());
|
|
27
27
|
const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
|
|
28
28
|
let cache = cacheEnabled ? (0, nx_deps_cache_1.readCache)() : null;
|
|
29
|
-
return (yield buildProjectGraphUsingProjectFileMap(
|
|
29
|
+
return (yield buildProjectGraphUsingProjectFileMap(projectConfigurations, projectFileMap, allWorkspaceFiles, cache, cacheEnabled)).projectGraph;
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
32
|
exports.buildProjectGraph = buildProjectGraph;
|
|
33
|
-
function buildProjectGraphUsingProjectFileMap(
|
|
33
|
+
function buildProjectGraphUsingProjectFileMap(projectsConfigurations, projectFileMap, allWorkspaceFiles, cache, shouldWriteCache) {
|
|
34
34
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
35
|
const nxJson = (0, configuration_1.readNxJson)();
|
|
36
36
|
const projectGraphVersion = '5.0';
|
|
37
|
-
(0, assert_workspace_validity_1.assertWorkspaceValidity)(
|
|
38
|
-
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(
|
|
37
|
+
(0, assert_workspace_validity_1.assertWorkspaceValidity)(projectsConfigurations, nxJson);
|
|
38
|
+
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(projectsConfigurations.projects));
|
|
39
39
|
const packageJsonDeps = readCombinedDeps();
|
|
40
40
|
const rootTsConfig = readRootTsConfig();
|
|
41
41
|
let filesToProcess;
|
|
42
42
|
let cachedFileData;
|
|
43
43
|
if (cache &&
|
|
44
|
-
!(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(cache, packageJsonDeps,
|
|
44
|
+
!(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(cache, packageJsonDeps, projectsConfigurations, normalizedNxJson, rootTsConfig)) {
|
|
45
45
|
const fromCache = (0, nx_deps_cache_1.extractCachedFileData)(projectFileMap, cache);
|
|
46
46
|
filesToProcess = fromCache.filesToProcess;
|
|
47
47
|
cachedFileData = fromCache.cachedFileData;
|
|
@@ -50,7 +50,7 @@ function buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, all
|
|
|
50
50
|
filesToProcess = projectFileMap;
|
|
51
51
|
cachedFileData = {};
|
|
52
52
|
}
|
|
53
|
-
const context = createContext(
|
|
53
|
+
const context = createContext(projectsConfigurations, normalizedNxJson, projectFileMap, filesToProcess);
|
|
54
54
|
let projectGraph = yield buildProjectGraphUsingContext(nxJson, context, cachedFileData, projectGraphVersion);
|
|
55
55
|
const projectGraphCache = (0, nx_deps_cache_1.createCache)(nxJson, packageJsonDeps, projectGraph, rootTsConfig);
|
|
56
56
|
if (shouldWriteCache) {
|
|
@@ -192,13 +192,13 @@ function getNumberOfWorkers() {
|
|
|
192
192
|
? +process.env.NX_PROJECT_GRAPH_MAX_WORKERS
|
|
193
193
|
: os.cpus().length - 1;
|
|
194
194
|
}
|
|
195
|
-
function createContext(
|
|
196
|
-
const projects = Object.keys(
|
|
197
|
-
map[projectName] = Object.assign({},
|
|
195
|
+
function createContext(projectsConfigurations, nxJson, fileMap, filesToProcess) {
|
|
196
|
+
const projects = Object.keys(projectsConfigurations.projects).reduce((map, projectName) => {
|
|
197
|
+
map[projectName] = Object.assign({}, projectsConfigurations.projects[projectName]);
|
|
198
198
|
return map;
|
|
199
199
|
}, {});
|
|
200
200
|
return {
|
|
201
|
-
workspace: Object.assign(Object.assign(Object.assign({},
|
|
201
|
+
workspace: Object.assign(Object.assign(Object.assign({}, projectsConfigurations), nxJson), { projects }),
|
|
202
202
|
fileMap,
|
|
203
203
|
filesToProcess,
|
|
204
204
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":";;;;AAAA,4DAAwD;AACxD,+BAA4B;AAC5B,2CAAyC;AACzC,kFAA6E;AAE7E,2DAAsD;AACtD,mDAOyB;AACzB,6DAAwE;AACxE,+CAGuB;AACvB,yBAAyB;AACzB,0JAAiJ;AACjJ,kDAAmD;AACnD,uDAA0D;AAC1D,qDAAwD;AACxD,oDAA0D;AAM1D,kDAAkD;AAElD,4CAAyC;AACzC,mEAA8D;AAK9D,2DAGiC;AAEjC,SAAsB,iBAAiB;;QACrC,MAAM,
|
|
1
|
+
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { NxJsonConfiguration } from '../config/nx-json';
|
|
2
2
|
import { FileData } from '../config/project-graph';
|
|
3
|
+
import { ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
4
|
+
import type { NxArgs } from '../utils/command-line-utils';
|
|
3
5
|
export interface Change {
|
|
4
6
|
type: string;
|
|
5
7
|
}
|
|
@@ -16,7 +18,7 @@ export declare const TEN_MEGABYTES: number;
|
|
|
16
18
|
export declare function readWorkspaceConfig(opts: {
|
|
17
19
|
format: 'angularCli' | 'nx';
|
|
18
20
|
path?: string;
|
|
19
|
-
}):
|
|
21
|
+
}): ProjectsConfigurations & NxJsonConfiguration;
|
|
20
22
|
export declare function workspaceFileName(): "angular.json" | "workspace.json";
|
|
21
23
|
export declare function defaultFileRead(filePath: string): string | null;
|
|
22
24
|
export declare function readPackageJson(): any;
|
|
@@ -5,11 +5,13 @@ const workspaces_1 = require("../config/workspaces");
|
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
+
const configuration_1 = require("../config/configuration");
|
|
8
9
|
const workspace_root_1 = require("../utils/workspace-root");
|
|
9
10
|
const fileutils_1 = require("../utils/fileutils");
|
|
10
11
|
const json_diff_1 = require("../utils/json-diff");
|
|
11
12
|
const ignore_1 = require("ignore");
|
|
12
13
|
const fileutils_2 = require("../utils/fileutils");
|
|
14
|
+
const project_graph_1 = require("./project-graph");
|
|
13
15
|
class WholeFileChange {
|
|
14
16
|
constructor() {
|
|
15
17
|
this.type = 'WholeFileChange';
|
|
@@ -88,14 +90,21 @@ function defaultReadFileAtRevision(file, revision) {
|
|
|
88
90
|
}
|
|
89
91
|
}
|
|
90
92
|
function readWorkspaceConfig(opts) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
+
let configuration;
|
|
94
|
+
try {
|
|
95
|
+
const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
|
|
96
|
+
configuration = Object.assign(Object.assign({}, (0, configuration_1.readNxJson)()), (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
|
|
97
|
+
}
|
|
98
|
+
catch (_a) {
|
|
99
|
+
const ws = new workspaces_1.Workspaces(opts.path || process.cwd());
|
|
100
|
+
configuration = ws.readWorkspaceConfiguration();
|
|
101
|
+
}
|
|
93
102
|
if (opts.format === 'angularCli') {
|
|
94
|
-
const formatted = (0, workspaces_1.toOldFormatOrNull)(
|
|
95
|
-
return formatted !== null && formatted !== void 0 ? formatted :
|
|
103
|
+
const formatted = (0, workspaces_1.toOldFormatOrNull)(configuration);
|
|
104
|
+
return formatted !== null && formatted !== void 0 ? formatted : configuration;
|
|
96
105
|
}
|
|
97
106
|
else {
|
|
98
|
-
return
|
|
107
|
+
return configuration;
|
|
99
108
|
}
|
|
100
109
|
}
|
|
101
110
|
exports.readWorkspaceConfig = readWorkspaceConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-utils.ts"],"names":[],"mappings":";;;AAAA,qDAAqE;AACrE,iDAAyC;AACzC,2BAA8C;AAC9C,+BAAoD;
|
|
1
|
+
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { ProjectGraph, ProjectGraphV4 } from '../config/project-graph';
|
|
2
|
+
import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
2
3
|
/**
|
|
3
4
|
* Synchronously reads the latest cached copy of the workspace's ProjectGraph.
|
|
4
5
|
* @throws {Error} if there is no cached ProjectGraph to read from
|
|
5
6
|
*/
|
|
6
|
-
export declare function readCachedProjectGraph(): ProjectGraph
|
|
7
|
+
export declare function readCachedProjectGraph(): ProjectGraph<ProjectConfiguration>;
|
|
8
|
+
export declare function readCachedProjectConfiguration(projectName: string): ProjectConfiguration;
|
|
9
|
+
export declare function readProjectsConfigurationFromProjectGraph(projectGraph: ProjectGraph<ProjectConfiguration>): ProjectsConfigurations;
|
|
7
10
|
/**
|
|
8
11
|
* Computes and returns a ProjectGraph.
|
|
9
12
|
*
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.projectGraphAdapter = exports.createProjectGraphAsync = exports.readCachedProjectGraph = void 0;
|
|
3
|
+
exports.projectGraphAdapter = exports.createProjectGraphAsync = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectConfiguration = exports.readCachedProjectGraph = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const nx_deps_cache_1 = require("./nx-deps-cache");
|
|
6
6
|
const build_project_graph_1 = require("./build-project-graph");
|
|
@@ -46,6 +46,22 @@ function readCachedProjectGraph() {
|
|
|
46
46
|
return projectGraphAdapter(projectGraph.version, '5.0', projectGraph);
|
|
47
47
|
}
|
|
48
48
|
exports.readCachedProjectGraph = readCachedProjectGraph;
|
|
49
|
+
function readCachedProjectConfiguration(projectName) {
|
|
50
|
+
const graph = readCachedProjectGraph();
|
|
51
|
+
const node = graph.nodes[projectName];
|
|
52
|
+
return node.data;
|
|
53
|
+
}
|
|
54
|
+
exports.readCachedProjectConfiguration = readCachedProjectConfiguration;
|
|
55
|
+
function readProjectsConfigurationFromProjectGraph(projectGraph) {
|
|
56
|
+
return {
|
|
57
|
+
projects: Object.fromEntries(Object.entries(projectGraph.nodes).map(([project, { data }]) => [
|
|
58
|
+
project,
|
|
59
|
+
data,
|
|
60
|
+
])),
|
|
61
|
+
version: 2,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
exports.readProjectsConfigurationFromProjectGraph = readProjectsConfigurationFromProjectGraph;
|
|
49
65
|
function buildProjectGraphWithoutDaemon() {
|
|
50
66
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
51
67
|
yield file_hasher_1.defaultFileHasher.ensureInitialized();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/project-graph.ts"],"names":[],"mappings":";;;;AAAA,mDAA+D;AAC/D,+DAA0D;AAC1D,6CAAiD;AACjD,4CAAyC;AACzC,0CAAsC;AACtC,uDAA0D;AAC1D,+CAI2B;AAC3B,2BAA8B;AAE9B,0DAAsD;AACtD,2DAAqD;
|
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const batch_messages_1 = require("./batch-messages");
|
|
|
5
5
|
const workspaces_1 = require("../../config/workspaces");
|
|
6
6
|
const workspace_root_1 = require("../../utils/workspace-root");
|
|
7
7
|
const params_1 = require("../../utils/params");
|
|
8
|
-
const
|
|
8
|
+
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
9
9
|
function getBatchExecutor(executorName) {
|
|
10
10
|
const workspace = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
|
|
11
11
|
const [nodeModule, exportName] = executorName.split(':');
|
|
@@ -14,7 +14,8 @@ function getBatchExecutor(executorName) {
|
|
|
14
14
|
function runTasks(executorName, taskGraph) {
|
|
15
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
const input = {};
|
|
17
|
-
const
|
|
17
|
+
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
18
|
+
const workspaceConfig = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
|
|
18
19
|
const batchExecutor = getBatchExecutor(executorName);
|
|
19
20
|
const tasks = Object.values(taskGraph.tasks);
|
|
20
21
|
const context = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-batch.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/batch/run-batch.ts"],"names":[],"mappings":";;;AAAA,qDAI0B;AAC1B,wDAAqD;AACrD,+DAA2D;AAC3D,+CAA+D;AAG/D
|
|
1
|
+
{"version":3,"file":"run-batch.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/batch/run-batch.ts"],"names":[],"mappings":";;;AAAA,qDAI0B;AAC1B,wDAAqD;AACrD,+DAA2D;AAC3D,+CAA+D;AAG/D,sEAG4C;AAE5C,SAAS,gBAAgB,CAAC,YAAoB;IAC5C,MAAM,SAAS,GAAG,IAAI,uBAAU,CAAC,8BAAa,CAAC,CAAC;IAChD,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzD,OAAO,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACxD,CAAC;AAED,SAAe,QAAQ,CAAC,YAAoB,EAAE,SAAoB;;QAChE,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QACrD,MAAM,eAAe,GACnB,IAAA,yDAAyC,EAAC,YAAY,CAAC,CAAC;QAC1D,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAoB;YAC/B,IAAI,EAAE,8BAAa;YACnB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;YAClB,SAAS,EAAE,eAAe;YAC1B,SAAS,EAAE,KAAK;SACjB,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,oBAAoB,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3E,MAAM,mBAAmB,GACvB,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAA,kCAAyB,EACxC,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,MAAM,CAAC,aAAa,EACzB,mBAAmB,EACnB,aAAa,CAAC,MAAM,EACpB,IAAI,EACJ,OAAO,CAAC,GAAG,EAAE,CACd,CAAC;SACH;QAED,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,0BAA0B,EAAE,CAC9D,SAAS,EACT,KAAK,EACL,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAClB,OAAO,CACR,CAAC;YAEF,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,IAAI,YAAY,8BAA8B,OAAO,EAAE,CAAC,CAAC;aAC1E;YAED,OAAO,OAAO,CAAC;SAChB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;YAC7C,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAED,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAO,OAAqB,EAAE,EAAE;IACpD,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,iCAAgB,CAAC,KAAK,CAAC,CAAC;YAC3B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YACxE,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,iCAAgB,CAAC,QAAQ;gBAC/B,OAAO;aACgB,CAAC,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;KACF;AACH,CAAC,CAAA,CAAC,CAAC"}
|
|
@@ -21,7 +21,8 @@ class TaskOrchestrator {
|
|
|
21
21
|
this.cache = new cache_1.Cache(this.options);
|
|
22
22
|
this.workspace = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
|
|
23
23
|
this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
|
|
24
|
-
this.
|
|
24
|
+
this.nxJson = this.workspace.readNxJson();
|
|
25
|
+
this.tasksSchedule = new tasks_schedule_1.TasksSchedule(this.hasher, this.nxJson, this.projectGraph, this.taskGraph, this.workspace, this.options);
|
|
25
26
|
// region internal state
|
|
26
27
|
this.reverseTaskDeps = (0, utils_1.calculateReverseDeps)(this.taskGraph);
|
|
27
28
|
this.completedTasks = {};
|
|
@@ -284,8 +285,9 @@ class TaskOrchestrator {
|
|
|
284
285
|
// region utils
|
|
285
286
|
pipeOutputCapture(task) {
|
|
286
287
|
try {
|
|
287
|
-
return ((0, utils_1.getExecutorForTask)(task, this.workspace
|
|
288
|
-
|
|
288
|
+
return ((0, utils_1.getExecutorForTask)(task, this.workspace, this.projectGraph, this.nxJson)
|
|
289
|
+
.schema.outputCapture === 'pipe' ||
|
|
290
|
+
process.env.NX_STREAM_OUTPUT === 'true');
|
|
289
291
|
}
|
|
290
292
|
catch (e) {
|
|
291
293
|
return false;
|