nx 14.4.0-beta.7 → 14.4.0-beta.8
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/presets/core.json +0 -5
- package/src/command-line/init.js +2 -2
- package/src/command-line/init.js.map +1 -1
- package/src/project-graph/affected/affected-project-graph-models.d.ts +2 -2
- package/src/project-graph/affected/affected-project-graph.js +2 -4
- package/src/project-graph/affected/affected-project-graph.js.map +1 -1
- package/src/project-graph/affected/locators/implicit-json-changes.js +9 -4
- package/src/project-graph/affected/locators/implicit-json-changes.js.map +1 -1
- package/src/project-graph/affected/locators/workspace-projects.js +4 -1
- package/src/project-graph/affected/locators/workspace-projects.js.map +1 -1
- package/src/project-graph/build-project-graph.js +15 -9
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/normalize-nx-json.d.ts +0 -8
- package/src/project-graph/normalize-nx-json.js +0 -32
- package/src/project-graph/normalize-nx-json.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [14.4.0-beta.
|
|
6
|
+
# [14.4.0-beta.8](https://github.com/nrwl/nx/compare/14.3.6...14.4.0-beta.8) (2022-07-01)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.4.0-beta.
|
|
3
|
+
"version": "14.4.0-beta.8",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://nx.dev",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/cli": "14.4.0-beta.
|
|
35
|
-
"@nrwl/tao": "14.4.0-beta.
|
|
34
|
+
"@nrwl/cli": "14.4.0-beta.8",
|
|
35
|
+
"@nrwl/tao": "14.4.0-beta.8",
|
|
36
36
|
"@parcel/watcher": "2.0.4",
|
|
37
37
|
"chalk": "4.1.0",
|
|
38
38
|
"chokidar": "^3.5.1",
|
|
@@ -106,5 +106,5 @@
|
|
|
106
106
|
"executors": "./executors.json",
|
|
107
107
|
"main": "./bin/nx.js",
|
|
108
108
|
"typings": "./bin/nx.d.ts",
|
|
109
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "35bb15908ed7029ce6a33917465114d6513fd999"
|
|
110
110
|
}
|
package/presets/core.json
CHANGED
package/src/command-line/init.js
CHANGED
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.initHandler = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
+
const fileutils_1 = require("../utils/fileutils");
|
|
6
7
|
const output_1 = require("../utils/output");
|
|
7
8
|
const package_manager_1 = require("../utils/package-manager");
|
|
8
|
-
const fileutils_1 = require("../utils/fileutils");
|
|
9
9
|
function initHandler() {
|
|
10
10
|
const nxIsInstalled = !!(0, child_process_1.execSync)((0, package_manager_1.getPackageManagerCommand)().list)
|
|
11
11
|
.toString()
|
|
12
12
|
.split('\n')
|
|
13
|
-
.find((line) => line.
|
|
13
|
+
.find((line) => line.search(/\s?nx(\s|@)\d+.\d+.\d+(-\w+.\d+)?/) > -1);
|
|
14
14
|
if (nxIsInstalled) {
|
|
15
15
|
output_1.output.log({
|
|
16
16
|
title: 'Nx is already installed',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,+BAA4B;AAC5B,4CAAyC;AACzC,8DAAoE;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,+BAA4B;AAC5B,kDAA6E;AAC7E,4CAAyC;AACzC,8DAAoE;AAEpE,SAAgB,WAAW;IACzB,MAAM,aAAa,GAAG,CAAC,CAAC,IAAA,wBAAQ,EAAC,IAAA,0CAAwB,GAAE,CAAC,IAAI,CAAC;SAC9D,QAAQ,EAAE;SACV,KAAK,CAAC,IAAI,CAAC;SACX,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,mCAAmC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEzE,IAAI,aAAa,EAAE;QACjB,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,yBAAyB;SACjC,CAAC,CAAC;KACJ;SAAM;QACL,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,kBAAkB;SAC1B,CAAC,CAAC;QACH,IAAA,wBAAQ,EAAC,GAAG,IAAA,0CAAwB,GAAE,CAAC,MAAM,YAAY,EAAE;YACzD,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QACH,eAAM,CAAC,OAAO,CAAC;YACb,KAAK,EAAE,uBAAuB;SAC/B,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,IAAA,sBAAU,EAAC,SAAS,CAAC,EAAE;QAC1B,IAAA,yBAAa,EACX,SAAS,EACT,IAAA,wBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAClE,CAAC;QAEF,eAAM,CAAC,OAAO,CAAC;YACb,KAAK,EAAE,0BAA0B;SAClC,CAAC,CAAC;KACJ;AACH,CAAC;AAhCD,kCAgCC"}
|
|
@@ -4,9 +4,9 @@ import { ProjectGraph, ProjectGraphProjectNode } from '../../config/project-grap
|
|
|
4
4
|
import { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
|
|
5
5
|
export interface AffectedProjectGraphContext {
|
|
6
6
|
projectGraphNodes: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>;
|
|
7
|
-
nxJson: NxJsonConfiguration<
|
|
7
|
+
nxJson: NxJsonConfiguration<any>;
|
|
8
8
|
touchedProjects: string[];
|
|
9
9
|
}
|
|
10
10
|
export interface TouchedProjectLocator<T extends Change = Change> {
|
|
11
|
-
(fileChanges: FileChange<T>[], projectGraphNodes?: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>, nxJson?: NxJsonConfiguration<
|
|
11
|
+
(fileChanges: FileChange<T>[], projectGraphNodes?: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>, nxJson?: NxJsonConfiguration<any>, packageJson?: any, projectGraph?: ProjectGraph): string[];
|
|
12
12
|
}
|
|
@@ -5,13 +5,11 @@ const file_utils_1 = require("../file-utils");
|
|
|
5
5
|
const workspace_projects_1 = require("./locators/workspace-projects");
|
|
6
6
|
const npm_packages_1 = require("./locators/npm-packages");
|
|
7
7
|
const implicit_json_changes_1 = require("./locators/implicit-json-changes");
|
|
8
|
-
const normalize_nx_json_1 = require("../normalize-nx-json");
|
|
9
8
|
const workspace_json_changes_1 = require("./locators/workspace-json-changes");
|
|
10
9
|
const tsconfig_json_changes_1 = require("./locators/tsconfig-json-changes");
|
|
11
10
|
const operators_1 = require("../operators");
|
|
12
11
|
const configuration_1 = require("../../config/configuration");
|
|
13
12
|
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
13
|
// Additional affected logic should be in this array.
|
|
16
14
|
const touchedProjectLocators = [
|
|
17
15
|
workspace_projects_1.getTouchedProjects,
|
|
@@ -22,11 +20,11 @@ function filterAffected(graph, touchedFiles, nxJson = (0, configuration_1.readNx
|
|
|
22
20
|
tsconfig_json_changes_1.getTouchedProjectsFromTsConfig,
|
|
23
21
|
];
|
|
24
22
|
const touchedProjects = touchedProjectLocators.reduce((acc, f) => {
|
|
25
|
-
return acc.concat(f(touchedFiles, graph.nodes,
|
|
23
|
+
return acc.concat(f(touchedFiles, graph.nodes, nxJson, packageJson, graph));
|
|
26
24
|
}, []);
|
|
27
25
|
return filterAffectedProjects(graph, {
|
|
28
26
|
projectGraphNodes: graph.nodes,
|
|
29
|
-
nxJson
|
|
27
|
+
nxJson,
|
|
30
28
|
touchedProjects,
|
|
31
29
|
});
|
|
32
30
|
}
|
|
@@ -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,
|
|
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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"}
|
|
@@ -4,18 +4,19 @@ exports.getImplicitlyTouchedProjectsByJsonChanges = void 0;
|
|
|
4
4
|
const flat_1 = require("flat");
|
|
5
5
|
const minimatch = require("minimatch");
|
|
6
6
|
const json_diff_1 = require("../../../utils/json-diff");
|
|
7
|
-
const getImplicitlyTouchedProjectsByJsonChanges = (touchedFiles,
|
|
7
|
+
const getImplicitlyTouchedProjectsByJsonChanges = (touchedFiles, projects, nxJson) => {
|
|
8
8
|
const { implicitDependencies } = nxJson;
|
|
9
9
|
if (!implicitDependencies) {
|
|
10
10
|
return [];
|
|
11
11
|
}
|
|
12
12
|
const touched = new Set();
|
|
13
|
+
const allProjectNames = Object.keys(projects);
|
|
13
14
|
for (const f of touchedFiles) {
|
|
14
15
|
if (f.file.endsWith('.json') && implicitDependencies[f.file]) {
|
|
15
16
|
const changes = f.getChanges();
|
|
16
17
|
for (const c of changes) {
|
|
17
18
|
if ((0, json_diff_1.isJsonChange)(c)) {
|
|
18
|
-
const projects = getTouchedProjects(c.path, implicitDependencies[f.file]) || [];
|
|
19
|
+
const projects = getTouchedProjects(c.path, implicitDependencies[f.file], allProjectNames) || [];
|
|
19
20
|
projects.forEach((p) => touched.add(p));
|
|
20
21
|
}
|
|
21
22
|
else {
|
|
@@ -38,7 +39,7 @@ function getTouchedProjectsByJsonFile(implicitDependencies, file) {
|
|
|
38
39
|
});
|
|
39
40
|
return projects;
|
|
40
41
|
}
|
|
41
|
-
function getTouchedProjects(path, implicitDependencyConfig) {
|
|
42
|
+
function getTouchedProjects(path, implicitDependencyConfig, allProjects) {
|
|
42
43
|
const flatConfig = (0, flat_1.flatten)(implicitDependencyConfig, {
|
|
43
44
|
safe: true,
|
|
44
45
|
});
|
|
@@ -46,7 +47,11 @@ function getTouchedProjects(path, implicitDependencyConfig) {
|
|
|
46
47
|
for (const key in flatConfig) {
|
|
47
48
|
if (minimatch(flatPath, key)) {
|
|
48
49
|
const value = flatConfig[key];
|
|
49
|
-
|
|
50
|
+
if (value === '*')
|
|
51
|
+
return allProjects;
|
|
52
|
+
if (Array.isArray(value))
|
|
53
|
+
return value;
|
|
54
|
+
return [];
|
|
50
55
|
}
|
|
51
56
|
}
|
|
52
57
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"implicit-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/implicit-json-changes.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,uCAAuC;AAEvC,wDAIkC;AAI3B,MAAM,yCAAyC,GAElD,CAAC,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"implicit-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/implicit-json-changes.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,uCAAuC;AAEvC,wDAIkC;AAI3B,MAAM,yCAAyC,GAElD,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAY,EAAE;IAC/C,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC;IAExC,IAAI,CAAC,oBAAoB,EAAE;QACzB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9C,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE;QAC5B,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;YAC5D,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;YAC/B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;gBACvB,IAAI,IAAA,wBAAY,EAAC,CAAC,CAAC,EAAE;oBACnB,MAAM,QAAQ,GACZ,kBAAkB,CAChB,CAAC,CAAC,IAAI,EACN,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,EAC5B,eAAe,CAChB,IAAI,EAAE,CAAC;oBACV,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzC;qBAAM;oBACL,MAAM,QAAQ,GAAG,4BAA4B,CAC3C,oBAAoB,EACpB,CAAC,CAAC,IAAI,CACP,CAAC;oBACF,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzC;aACF;SACF;KACF;IAED,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;AACtB,CAAC,CAAC;AApCW,QAAA,yCAAyC,6CAoCpD;AAEF,SAAS,4BAA4B,CACnC,oBAAuD,EACvD,IAAY;IAEZ,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAA,wBAAY,EAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACxD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;SACzB;QACD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CACzB,IAAc,EACd,wBAA6B,EAC7B,WAAqB;IAErB,MAAM,UAAU,GAAG,IAAA,cAAO,EAAW,wBAAwB,EAAE;QAC7D,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEhC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;QAC5B,IAAI,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE;YAC5B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,KAAK,KAAK,GAAG;gBAAE,OAAO,WAAW,CAAC;YACtC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YACvC,OAAO,EAAE,CAAC;SACX;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -36,7 +36,10 @@ const getImplicitlyTouchedProjects = (fileChanges, projectGraphNodes, nxJson) =>
|
|
|
36
36
|
continue;
|
|
37
37
|
}
|
|
38
38
|
// File change affects all projects, just return all projects.
|
|
39
|
-
if (
|
|
39
|
+
if (projects === '*') {
|
|
40
|
+
return Object.keys(projectGraphNodes);
|
|
41
|
+
}
|
|
42
|
+
else if (Array.isArray(projects)) {
|
|
40
43
|
projects.forEach((project) => touched.add(project));
|
|
41
44
|
}
|
|
42
45
|
}
|
|
@@ -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;AAKhC,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,iBAAiB,EACjB,MAAM,EACI,EAAE;IACZ,MAAM,SAAS,qBAAQ,MAAM,CAAC,oBAAoB,CAAE,CAAC;IACrD,MAAM,WAAW,GAAG;QAClB,GAAG,4BAA4B,CAAC,MAAM,EAAE,iBAAiB,CAAC;QAC1D,SAAS;QACT,cAAc;KACf,CAAC;IACF,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,SAAS,CAAC,IAAI,CAAC,GAAG,GAAU,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC3D,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;
|
|
1
|
+
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/workspace-projects.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ const workspace_root_1 = require("../utils/workspace-root");
|
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const perf_hooks_1 = require("perf_hooks");
|
|
8
8
|
const assert_workspace_validity_1 = require("../utils/assert-workspace-validity");
|
|
9
|
-
const normalize_nx_json_1 = require("./normalize-nx-json");
|
|
10
9
|
const nx_deps_cache_1 = require("./nx-deps-cache");
|
|
11
10
|
const build_dependencies_1 = require("./build-dependencies");
|
|
12
11
|
const build_nodes_1 = require("./build-nodes");
|
|
@@ -35,13 +34,12 @@ function buildProjectGraphUsingProjectFileMap(projectsConfigurations, projectFil
|
|
|
35
34
|
const nxJson = (0, configuration_1.readNxJson)();
|
|
36
35
|
const projectGraphVersion = '5.0';
|
|
37
36
|
(0, assert_workspace_validity_1.assertWorkspaceValidity)(projectsConfigurations, nxJson);
|
|
38
|
-
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(projectsConfigurations.projects));
|
|
39
37
|
const packageJsonDeps = readCombinedDeps();
|
|
40
38
|
const rootTsConfig = readRootTsConfig();
|
|
41
39
|
let filesToProcess;
|
|
42
40
|
let cachedFileData;
|
|
43
41
|
if (cache &&
|
|
44
|
-
!(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(cache, packageJsonDeps, projectsConfigurations,
|
|
42
|
+
!(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(cache, packageJsonDeps, projectsConfigurations, nxJson, rootTsConfig)) {
|
|
45
43
|
const fromCache = (0, nx_deps_cache_1.extractCachedFileData)(projectFileMap, cache);
|
|
46
44
|
filesToProcess = fromCache.filesToProcess;
|
|
47
45
|
cachedFileData = fromCache.cachedFileData;
|
|
@@ -50,8 +48,8 @@ function buildProjectGraphUsingProjectFileMap(projectsConfigurations, projectFil
|
|
|
50
48
|
filesToProcess = projectFileMap;
|
|
51
49
|
cachedFileData = {};
|
|
52
50
|
}
|
|
53
|
-
const context = createContext(projectsConfigurations,
|
|
54
|
-
let projectGraph = yield buildProjectGraphUsingContext(nxJson, context, cachedFileData, projectGraphVersion);
|
|
51
|
+
const context = createContext(projectsConfigurations, nxJson, projectFileMap, filesToProcess);
|
|
52
|
+
let projectGraph = yield buildProjectGraphUsingContext(nxJson, context, cachedFileData, projectGraphVersion, packageJsonDeps);
|
|
55
53
|
const projectGraphCache = (0, nx_deps_cache_1.createCache)(nxJson, packageJsonDeps, projectGraph, rootTsConfig);
|
|
56
54
|
if (shouldWriteCache) {
|
|
57
55
|
(0, nx_deps_cache_1.writeCache)(projectGraphCache);
|
|
@@ -68,7 +66,7 @@ function readCombinedDeps() {
|
|
|
68
66
|
const json = (0, fileutils_1.readJsonFile)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'));
|
|
69
67
|
return Object.assign(Object.assign({}, json.dependencies), json.devDependencies);
|
|
70
68
|
}
|
|
71
|
-
function buildProjectGraphUsingContext(nxJson, ctx, cachedFileData, projectGraphVersion) {
|
|
69
|
+
function buildProjectGraphUsingContext(nxJson, ctx, cachedFileData, projectGraphVersion, packageJsonDeps) {
|
|
72
70
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
73
71
|
perf_hooks_1.performance.mark('build project graph:start');
|
|
74
72
|
const builder = new project_graph_builder_1.ProjectGraphBuilder();
|
|
@@ -82,7 +80,7 @@ function buildProjectGraphUsingContext(nxJson, ctx, cachedFileData, projectGraph
|
|
|
82
80
|
}
|
|
83
81
|
}
|
|
84
82
|
}
|
|
85
|
-
yield buildExplicitDependencies(jsPluginConfig(nxJson), ctx, builder);
|
|
83
|
+
yield buildExplicitDependencies(jsPluginConfig(nxJson, packageJsonDeps), ctx, builder);
|
|
86
84
|
(0, build_dependencies_1.buildImplicitProjectDependencies)(ctx, builder);
|
|
87
85
|
builder.setVersion(projectGraphVersion);
|
|
88
86
|
const initProjectGraph = builder.getUpdatedProjectGraph();
|
|
@@ -92,9 +90,17 @@ function buildProjectGraphUsingContext(nxJson, ctx, cachedFileData, projectGraph
|
|
|
92
90
|
return r;
|
|
93
91
|
});
|
|
94
92
|
}
|
|
95
|
-
function jsPluginConfig(nxJson) {
|
|
93
|
+
function jsPluginConfig(nxJson, packageJsonDeps) {
|
|
96
94
|
var _a, _b;
|
|
97
|
-
|
|
95
|
+
if ((_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.pluginsConfig) === null || _a === void 0 ? void 0 : _a['@nrwl/js']) {
|
|
96
|
+
return (_b = nxJson === null || nxJson === void 0 ? void 0 : nxJson.pluginsConfig) === null || _b === void 0 ? void 0 : _b['@nrwl/js'];
|
|
97
|
+
}
|
|
98
|
+
if (packageJsonDeps['@nrwl/workspace'] || packageJsonDeps['@nrwl/js']) {
|
|
99
|
+
return { analyzePackageJson: true, analyzeSourceFiles: true };
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
return { analyzePackageJson: true, analyzeSourceFiles: false };
|
|
103
|
+
}
|
|
98
104
|
}
|
|
99
105
|
function buildExplicitDependencies(jsPluginConfig, ctx, builder) {
|
|
100
106
|
let totalNumOfFilesToProcess = totalNumberOfFilesToProcess(ctx);
|
|
@@ -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,
|
|
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,8 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Normalize nx json by replacing wildcard `*` implicit dependencies
|
|
3
|
-
* to an array of all project names
|
|
4
|
-
* @param {NxJsonConfiguration} nxJson
|
|
5
|
-
* @returns {NxJsonConfiguration<string[]>}
|
|
6
|
-
*/
|
|
7
|
-
import { NxJsonConfiguration } from '../config/nx-json';
|
|
8
|
-
export declare function normalizeNxJson(nxJson: NxJsonConfiguration, projects: string[]): NxJsonConfiguration<string[]>;
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizeNxJson = void 0;
|
|
4
|
-
function normalizeNxJson(nxJson, projects) {
|
|
5
|
-
return nxJson.implicitDependencies
|
|
6
|
-
? Object.assign(Object.assign({}, nxJson), { implicitDependencies: Object.entries(nxJson.implicitDependencies).reduce((acc, [key, val]) => {
|
|
7
|
-
acc[key] = recur(projects, val);
|
|
8
|
-
return acc;
|
|
9
|
-
}, {}) }) : nxJson;
|
|
10
|
-
}
|
|
11
|
-
exports.normalizeNxJson = normalizeNxJson;
|
|
12
|
-
/**
|
|
13
|
-
* Map recursively wildcard `*` to project names
|
|
14
|
-
* @param {NxJsonConfiguration} nxJson
|
|
15
|
-
* @param {'*' | string[] | {}} v
|
|
16
|
-
* @returns {string[] | {}}
|
|
17
|
-
*/
|
|
18
|
-
function recur(projects, v) {
|
|
19
|
-
if (v === '*') {
|
|
20
|
-
return projects;
|
|
21
|
-
}
|
|
22
|
-
else if (Array.isArray(v)) {
|
|
23
|
-
return v;
|
|
24
|
-
}
|
|
25
|
-
else {
|
|
26
|
-
return Object.keys(v).reduce((acc, key) => {
|
|
27
|
-
acc[key] = recur(projects, v[key]);
|
|
28
|
-
return acc;
|
|
29
|
-
}, {});
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
//# sourceMappingURL=normalize-nx-json.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-nx-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/normalize-nx-json.ts"],"names":[],"mappings":";;;AAQA,SAAgB,eAAe,CAC7B,MAA2B,EAC3B,QAAkB;IAElB,OAAO,MAAM,CAAC,oBAAoB;QAChC,CAAC,iCACM,MAAM,KACT,oBAAoB,EAAE,MAAM,CAAC,OAAO,CAClC,MAAM,CAAC,oBAAoB,CAC5B,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;gBAC3B,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAChC,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,IAEV,CAAC,CAAE,MAAwC,CAAC;AAChD,CAAC;AAfD,0CAeC;AAED;;;;;GAKG;AACH,SAAS,KAAK,CAAC,QAAkB,EAAE,CAAsB;IACvD,IAAI,CAAC,KAAK,GAAG,EAAE;QACb,OAAO,QAAQ,CAAC;KACjB;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC3B,OAAO,CAAC,CAAC;KACV;SAAM;QACL,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACxC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;KACR;AACH,CAAC"}
|