nx 22.3.0-canary.20251209-6092031 → 22.3.0-canary.20251215-e864b6a
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/executors.json +16 -16
- package/generators.json +13 -13
- package/migrations.json +138 -138
- package/package.json +11 -14
- package/presets/npm.json +4 -4
- package/schemas/nx-schema.json +1286 -1286
- package/schemas/project-schema.json +359 -359
- package/schemas/workspace-schema.json +165 -165
- package/src/adapter/ngcli-adapter.d.ts.map +1 -1
- package/src/adapter/ngcli-adapter.js +28 -3
- package/src/ai/set-up-ai-agents/schema.json +31 -31
- package/src/command-line/format/format.d.ts.map +1 -1
- package/src/command-line/format/format.js +20 -2
- package/src/command-line/init/implementation/angular/legacy-angular-versions.d.ts.map +1 -1
- package/src/command-line/init/implementation/angular/legacy-angular-versions.js +1 -0
- package/src/command-line/release/changelog.js +2 -0
- package/src/command-line/release/utils/shared.d.ts +3 -1
- package/src/command-line/release/utils/shared.d.ts.map +1 -1
- package/src/command-line/release/utils/shared.js +9 -0
- package/src/command-line/yargs-utils/shared-options.d.ts.map +1 -1
- package/src/command-line/yargs-utils/shared-options.js +7 -0
- package/src/core/graph/main.js +1 -1
- package/src/executors/noop/schema.json +8 -8
- package/src/executors/run-commands/schema.json +187 -187
- package/src/executors/run-script/schema.json +25 -25
- package/src/native/index.d.ts +1 -1
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/nx-cloud/generators/connect-to-nx-cloud/schema.json +38 -38
- package/src/plugins/js/lock-file/pnpm-parser.d.ts.map +1 -1
- package/src/plugins/js/lock-file/pnpm-parser.js +38 -14
- package/src/plugins/js/lock-file/project-graph-pruning.js +3 -3
- package/src/plugins/js/lock-file/utils/package-json.d.ts +1 -0
- package/src/plugins/js/lock-file/utils/package-json.d.ts.map +1 -1
- package/src/plugins/js/lock-file/utils/package-json.js +8 -0
- package/src/plugins/js/project-graph/build-dependencies/build-dependencies.d.ts.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/build-dependencies.js +6 -6
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js +24 -16
- package/src/plugins/js/utils/register.d.ts.map +1 -1
- package/src/plugins/js/utils/register.js +4 -1
- package/src/project-graph/affected/affected-project-graph.js +11 -6
- package/src/tasks-runner/cache.d.ts.map +1 -1
- package/src/tasks-runner/cache.js +1 -1
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.js +4 -2
- package/src/tasks-runner/run-command.js +1 -1
- package/src/tasks-runner/task-orchestrator.d.ts.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +3 -1
- package/src/utils/params.js +1 -1
|
@@ -97,9 +97,9 @@ function addNodesAndDependencies(graph, packageJsonDeps, workspacePackages, buil
|
|
|
97
97
|
}
|
|
98
98
|
else if (workspacePackages.has(name)) {
|
|
99
99
|
// Workspace Node
|
|
100
|
-
const
|
|
101
|
-
if (
|
|
102
|
-
traverseWorkspaceNode(graph, builder,
|
|
100
|
+
const workspaceNode = workspacePackages.get(name);
|
|
101
|
+
if (workspaceNode) {
|
|
102
|
+
traverseWorkspaceNode(graph, builder, workspaceNode);
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
});
|
|
@@ -8,4 +8,5 @@ export type NormalizedPackageJson = Pick<PackageJson, 'name' | 'version' | 'lice
|
|
|
8
8
|
* Strip off non-pruning related fields from package.json
|
|
9
9
|
*/
|
|
10
10
|
export declare function normalizePackageJson(packageJson: PackageJson): NormalizedPackageJson;
|
|
11
|
+
export declare function invertObject(record: Record<string, string>): Record<string, string>;
|
|
11
12
|
//# sourceMappingURL=package-json.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/lock-file/utils/package-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAI7D;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAQpE;AAED,MAAM,MAAM,qBAAqB,GAAG,IAAI,CACtC,WAAW,EACT,MAAM,GACN,SAAS,GACT,SAAS,GACT,cAAc,GACd,iBAAiB,GACjB,kBAAkB,GAClB,sBAAsB,GACtB,sBAAsB,GACtB,gBAAgB,GAChB,aAAa,CAChB,CAAC;AAEF;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,GACvB,qBAAqB,CA0BvB"}
|
|
1
|
+
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/lock-file/utils/package-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAI7D;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAQpE;AAED,MAAM,MAAM,qBAAqB,GAAG,IAAI,CACtC,WAAW,EACT,MAAM,GACN,SAAS,GACT,SAAS,GACT,cAAc,GACd,iBAAiB,GACjB,kBAAkB,GAClB,sBAAsB,GACtB,sBAAsB,GACtB,gBAAgB,GAChB,aAAa,CAChB,CAAC;AAEF;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,GACvB,qBAAqB,CA0BvB;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMxB"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getHoistedPackageVersion = getHoistedPackageVersion;
|
|
4
4
|
exports.normalizePackageJson = normalizePackageJson;
|
|
5
|
+
exports.invertObject = invertObject;
|
|
5
6
|
const workspace_root_1 = require("../../../../utils/workspace-root");
|
|
6
7
|
const fileutils_1 = require("../../../../utils/fileutils");
|
|
7
8
|
/**
|
|
@@ -34,3 +35,10 @@ function normalizePackageJson(packageJson) {
|
|
|
34
35
|
resolutions,
|
|
35
36
|
};
|
|
36
37
|
}
|
|
38
|
+
function invertObject(record) {
|
|
39
|
+
const result = {};
|
|
40
|
+
Object.keys(record).forEach((key) => {
|
|
41
|
+
result[record[key]] = key;
|
|
42
|
+
});
|
|
43
|
+
return result;
|
|
44
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/build-dependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAK5F,wBAAgB,yBAAyB,CACvC,cAAc,EAAE;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,EACD,GAAG,EAAE,yBAAyB,GAC7B,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"build-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/build-dependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAK5F,wBAAgB,yBAAyB,CACvC,cAAc,EAAE;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,EACD,GAAG,EAAE,yBAAyB,GAC7B,yBAAyB,EAAE,CA8C7B"}
|
|
@@ -11,14 +11,14 @@ function buildExplicitDependencies(jsPluginConfig, ctx) {
|
|
|
11
11
|
// TODO: TargetProjectLocator is a public API, so we can't change the shape of it
|
|
12
12
|
// We should eventually let it accept Record<string, ProjectConfiguration> s.t. we
|
|
13
13
|
// don't have to reshape the CreateDependenciesContext here.
|
|
14
|
-
const nodes =
|
|
15
|
-
|
|
16
|
-
{
|
|
14
|
+
const nodes = {};
|
|
15
|
+
Object.keys(ctx.projects).forEach((key) => {
|
|
16
|
+
nodes[key] = {
|
|
17
17
|
name: key,
|
|
18
18
|
type: null,
|
|
19
|
-
data:
|
|
20
|
-
}
|
|
21
|
-
|
|
19
|
+
data: ctx.projects[key],
|
|
20
|
+
};
|
|
21
|
+
});
|
|
22
22
|
const targetProjectLocator = new target_project_locator_1.TargetProjectLocator(nodes, ctx.externalNodes);
|
|
23
23
|
if (jsPluginConfig.analyzeSourceFiles === undefined ||
|
|
24
24
|
jsPluginConfig.analyzeSourceFiles === true) {
|
package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explicit-package-json-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,iDAAiD,CAAC;
|
|
1
|
+
{"version":3,"file":"explicit-package-json-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,iDAAiD,CAAC;AAGzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,EAAE,oBAAoB,GACzC,yBAAyB,EAAE,CAe7B"}
|
package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js
CHANGED
|
@@ -5,25 +5,33 @@ const project_graph_1 = require("../../../../config/project-graph");
|
|
|
5
5
|
const file_utils_1 = require("../../../../project-graph/file-utils");
|
|
6
6
|
const project_graph_builder_1 = require("../../../../project-graph/project-graph-builder");
|
|
7
7
|
const json_1 = require("../../../../utils/json");
|
|
8
|
-
const path_1 = require("../../../../utils/path");
|
|
9
8
|
function buildExplicitPackageJsonDependencies(ctx, targetProjectLocator) {
|
|
10
9
|
const res = [];
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
const roots = {};
|
|
11
|
+
Object.values(ctx.projects).forEach((project) => {
|
|
12
|
+
roots[project.root] = true;
|
|
13
|
+
});
|
|
14
|
+
Object.keys(ctx.filesToProcess.projectFileMap).forEach((source) => {
|
|
15
|
+
Object.values(ctx.filesToProcess.projectFileMap[source]).forEach((f) => {
|
|
16
|
+
if (isPackageJsonAtProjectRoot(roots, f.file)) {
|
|
17
17
|
processPackageJson(source, f.file, ctx, targetProjectLocator, res);
|
|
18
18
|
}
|
|
19
|
-
}
|
|
20
|
-
}
|
|
19
|
+
});
|
|
20
|
+
});
|
|
21
21
|
return res;
|
|
22
22
|
}
|
|
23
|
+
function isPackageJsonAtProjectRoot(roots, fileName) {
|
|
24
|
+
if (!fileName.endsWith('package.json')) {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
const filePath = fileName.slice(0, -13);
|
|
28
|
+
return !!roots[filePath];
|
|
29
|
+
}
|
|
23
30
|
function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLocator, collectedDeps) {
|
|
24
31
|
try {
|
|
25
32
|
const deps = readDeps((0, json_1.parseJson)((0, file_utils_1.defaultFileRead)(packageJsonPath)));
|
|
26
|
-
|
|
33
|
+
Object.keys(deps).forEach((packageName) => {
|
|
34
|
+
const packageVersion = deps[packageName];
|
|
27
35
|
const localProject = targetProjectLocator.findDependencyInWorkspaceProjects(packageJsonPath, packageName, packageVersion);
|
|
28
36
|
if (localProject) {
|
|
29
37
|
// package.json refers to another project in the monorepo
|
|
@@ -35,11 +43,11 @@ function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLo
|
|
|
35
43
|
};
|
|
36
44
|
(0, project_graph_builder_1.validateDependency)(dependency, ctx);
|
|
37
45
|
collectedDeps.push(dependency);
|
|
38
|
-
|
|
46
|
+
return;
|
|
39
47
|
}
|
|
40
48
|
const externalNodeName = targetProjectLocator.findNpmProjectFromImport(packageName, packageJsonPath);
|
|
41
49
|
if (!externalNodeName) {
|
|
42
|
-
|
|
50
|
+
return;
|
|
43
51
|
}
|
|
44
52
|
const dependency = {
|
|
45
53
|
source: sourceProject,
|
|
@@ -49,7 +57,7 @@ function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLo
|
|
|
49
57
|
};
|
|
50
58
|
(0, project_graph_builder_1.validateDependency)(dependency, ctx);
|
|
51
59
|
collectedDeps.push(dependency);
|
|
52
|
-
}
|
|
60
|
+
});
|
|
53
61
|
}
|
|
54
62
|
catch (e) {
|
|
55
63
|
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
@@ -70,9 +78,9 @@ function readDeps(packageJson) {
|
|
|
70
78
|
'dependencies',
|
|
71
79
|
];
|
|
72
80
|
for (const type of depType) {
|
|
73
|
-
|
|
74
|
-
deps[depName] =
|
|
75
|
-
}
|
|
81
|
+
Object.keys(packageJson[type] || {}).forEach((depName) => {
|
|
82
|
+
deps[depName] = packageJson[type][depName];
|
|
83
|
+
});
|
|
76
84
|
}
|
|
77
85
|
return deps;
|
|
78
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/utils/register.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA+ClD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,IAAI,CAAC;AACpE;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,OAAE;AA6CxE,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,eAAe,GAC/B,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/utils/register.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA+ClD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,IAAI,CAAC;AACpE;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,OAAE;AA6CxE,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,eAAe,GAC/B,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAajC;AAED,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,eAAe,EAChC,aAAa,CAAC,EAAE,eAAe,EAC/B,YAAY,CAAC,EAAE,OAAO,GACrB,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAwBjC;AAiFD,wBAAgB,aAAa,CAC3B,eAAe,EAAE,eAAe,EAChC,WAAW,CAAC,EAAE,OAAO,SALc,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAiFnE;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,eAAe,EAChC,WAAW,CAAC,EAAE,OAAO,GACpB,MAAM,IAAI,CAUZ;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,KAAA,GAAG,MAAM,IAAI,CAuB9D;AA+ED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6CxE"}
|
|
@@ -88,7 +88,10 @@ function getSwcTranspiler(compilerOptions) {
|
|
|
88
88
|
// These are requires to prevent it from registering when it shouldn't
|
|
89
89
|
const register = require('@swc-node/register/register')
|
|
90
90
|
.register;
|
|
91
|
-
const cleanupFn = register(
|
|
91
|
+
const cleanupFn = register({
|
|
92
|
+
...compilerOptions,
|
|
93
|
+
baseUrl: compilerOptions.baseUrl ?? './',
|
|
94
|
+
});
|
|
92
95
|
return typeof cleanupFn === 'function' ? cleanupFn : () => { };
|
|
93
96
|
}
|
|
94
97
|
function getTsNodeTranspiler(compilerOptions, tsNodeOptions, preferTsNode) {
|
|
@@ -37,12 +37,17 @@ function filterAffectedProjects(graph, ctx) {
|
|
|
37
37
|
dependencies: {},
|
|
38
38
|
};
|
|
39
39
|
const reversed = (0, operators_1.reverse)(graph);
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
// Share visited Sets across all touched projects to avoid redundant traversal
|
|
41
|
+
// Previously, each touched project got its own Set, causing shared dependencies
|
|
42
|
+
// to be visited multiple times (O(touchedProjects × sharedDeps) → O(nodes))
|
|
43
|
+
const visitedNodes = new Set();
|
|
44
|
+
const visitedDeps = new Set();
|
|
45
|
+
for (const p of ctx.touchedProjects) {
|
|
46
|
+
addAffectedNodes(p, reversed, result, visitedNodes);
|
|
47
|
+
}
|
|
48
|
+
for (const p of ctx.touchedProjects) {
|
|
49
|
+
addAffectedDependencies(p, reversed, result, visitedDeps);
|
|
50
|
+
}
|
|
46
51
|
return result;
|
|
47
52
|
}
|
|
48
53
|
function addAffectedNodes(startingProject, reversed, result, visited) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,yBAAyB,EACzB,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAW5C,OAAO,EAAE,mBAAmB,EAAc,MAAM,mBAAmB,CAAC;AAUpE,MAAM,MAAM,YAAY,GAAG;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAE,CAAC;AAG9E,wBAAgB,cAAc,YAkB7B;AAGD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,GAAG,KAAK,CAS5E;AAED,qBAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,yBAAyB,EACzB,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAW5C,OAAO,EAAE,mBAAmB,EAAc,MAAM,mBAAmB,CAAC;AAUpE,MAAM,MAAM,YAAY,GAAG;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAE,CAAC;AAG9E,wBAAgB,cAAc,YAkB7B;AAGD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,GAAG,KAAK,CAS5E;AAED,qBAAa,OAAO;IAehB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAd1B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,KAAK,CAKX;IAEF,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,kBAAkB,CAAyB;IAEnD,OAAO,CAAC,SAAS,CAA6C;gBAG3C,OAAO,EAAE;QACxB,kBAAkB,EAAE,WAAW,CAAC;QAChC,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;IAGG,IAAI;IAQJ,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAkCnD,iBAAiB;IAIjB,OAAO,CAAC,uBAAuB;IAQzB,GAAG,CACP,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,EAAE,MAAM;IAgBd,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE;IAM3E,qBAAqB;IAIrB,mBAAmB,CAAC,IAAI,EAAE,IAAI;YAIhB,cAAc;YASd,eAAe;YAiDf,UAAU;YAMV,cAAc;YAMd,WAAW;YAMX,aAAa;IAM3B,OAAO,CAAC,YAAY;YAaN,kBAAkB;IAUhC,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,kBAAkB;CAoB3B;AAED;;GAEG;AACH,qBAAa,KAAK;IAOJ,OAAO,CAAC,QAAQ,CAAC,OAAO;IANpC,IAAI,SAAiB;IACrB,SAAS,SAAyB;IAClC,kBAAkB,SAAmC;IAErD,OAAO,CAAC,iBAAiB,CAAgB;gBAEZ,OAAO,EAAE,yBAAyB;IAW/D,qBAAqB;IAuBf,gBAAgB;IAchB,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAkB7C,GAAG,CACP,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,EAAE,MAAM;IAkDR,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EAAE;IAoBnB,mBAAmB,CAAC,IAAI,EAAE,IAAI;YAIhB,wBAAwB;YAIxB,oBAAoB;YAOpB,cAAc;YAiBd,IAAI;YAiBJ,MAAM;YAYN,eAAe;YAwBf,wBAAwB;IAyBtC,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,wBAAwB;CAKjC;AA0BD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAKvE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,GAAG,MAAM,GAC5B,MAAM,GAAG,SAAS,CAqCpB;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,MAAM,CAS1E"}
|
|
@@ -56,7 +56,7 @@ class DbCache {
|
|
|
56
56
|
constructor(options) {
|
|
57
57
|
this.options = options;
|
|
58
58
|
this.nxJson = (0, nx_json_1.readNxJson)();
|
|
59
|
-
this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(),
|
|
59
|
+
this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(), resolveMaxCacheSize(this.nxJson));
|
|
60
60
|
this.isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
|
|
61
61
|
}
|
|
62
62
|
async init() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tui-summary-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/tui-summary-life-cycle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAa/C,wBAAgB,8BAA8B,CAAC,EAC7C,YAAY,EACZ,KAAK,EACL,SAAS,EACT,IAAI,EACJ,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,0BAA0B,GAC3B,EAAE;IACD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,IAAI,EAAE,CAAC;IACxB,0BAA0B,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;CACnD;
|
|
1
|
+
{"version":3,"file":"tui-summary-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/tui-summary-life-cycle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAa/C,wBAAgB,8BAA8B,CAAC,EAC7C,YAAY,EACZ,KAAK,EACL,SAAS,EACT,IAAI,EACJ,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,0BAA0B,GAC3B,EAAE;IACD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,IAAI,EAAE,CAAC;IACxB,0BAA0B,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;CACnD;eAyekC,SAAS;;EAC3C"}
|
|
@@ -42,8 +42,10 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
|
|
|
42
42
|
lifeCycle.printTaskTerminalOutput = (task, taskStatus, output) => {
|
|
43
43
|
tasksToTaskStatus[task.id] = taskStatus;
|
|
44
44
|
// Store the complete output for display in the summary
|
|
45
|
-
// This is called with the full output for cached
|
|
46
|
-
|
|
45
|
+
// This is called with the full output for cached tasks. For non-cached tasks,
|
|
46
|
+
// the output doesn't include the portion of the output that prints the command that was being ran.
|
|
47
|
+
if (output &&
|
|
48
|
+
!['failure', 'success'].includes(taskStatus)) {
|
|
47
49
|
tasksToTerminalOutputs[task.id] = output;
|
|
48
50
|
}
|
|
49
51
|
};
|
|
@@ -51,7 +51,7 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
|
|
|
51
51
|
delete overridesWithoutHidden['__overrides_unparsed__'];
|
|
52
52
|
const isRunOne = initiatingProject != null;
|
|
53
53
|
if (tasks.length === 1) {
|
|
54
|
-
process.env.NX_TUI
|
|
54
|
+
process.env.NX_TUI ??= 'false';
|
|
55
55
|
}
|
|
56
56
|
if ((0, is_tui_enabled_1.isTuiEnabled)()) {
|
|
57
57
|
const interceptedNxCloudLogs = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-orchestrator.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAQnD,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAMrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAM3D,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAiB,MAAM,kBAAkB,CAAC;AAUxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE,qBAAa,gBAAgB;IA8CzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAvDtC,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,KAAK,CAA2C;IACxD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,uBAAuB,CAG7B;IAEF,OAAO,CAAC,mBAAmB,CAElB;IACT,OAAO,CAAC,aAAa,CAInB;IAGF,OAAO,CAAC,QAAQ,CAGd;IACF,OAAO,CAAC,eAAe,CAAwC;IAE/D,OAAO,CAAC,mBAAmB,CAAkD;IAE7E,OAAO,CAAC,cAAc,CAAiD;IACvE,OAAO,CAAC,gBAAgB,CAAmC;IAE3D,OAAO,CAAC,cAAc,CAEf;IACP,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,MAAM,CAAM;IAEpB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,sBAAsB,CAAkC;IAChE,OAAO,CAAC,uBAAuB,CAAkC;gBAK9C,MAAM,EAAE,UAAU,EAClB,iBAAiB,EAAE,MAAM,GAAG,SAAS,EACrC,eAAe,EAAE,IAAI,EAAE,EACvB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GAAG,yBAAyB,EAC3C,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,MAAM,EACnB,mBAAmB,GAAE,SAAqB;IAGvD,IAAI;IAiBJ,GAAG;;;
|
|
1
|
+
{"version":3,"file":"task-orchestrator.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,6 +80,7 @@ class TaskOrchestrator {
|
|
|
80
80
|
const threads = [];
|
|
81
81
|
process.stdout.setMaxListeners(threadCount + events_1.defaultMaxListeners);
|
|
82
82
|
process.stderr.setMaxListeners(threadCount + events_1.defaultMaxListeners);
|
|
83
|
+
process.setMaxListeners(threadCount + events_1.defaultMaxListeners);
|
|
83
84
|
// initial seeding of the queue
|
|
84
85
|
for (let i = 0; i < threadCount; ++i) {
|
|
85
86
|
threads.push(this.executeNextBatchOfTasksUsingTaskSchedule());
|
|
@@ -258,6 +259,7 @@ class TaskOrchestrator {
|
|
|
258
259
|
task: this.taskGraph.tasks[rootTaskId],
|
|
259
260
|
code: 1,
|
|
260
261
|
status: 'failure',
|
|
262
|
+
terminalOutput: e.stack ?? e.message ?? '',
|
|
261
263
|
}));
|
|
262
264
|
}
|
|
263
265
|
finally {
|
|
@@ -446,7 +448,7 @@ class TaskOrchestrator {
|
|
|
446
448
|
}
|
|
447
449
|
return new noop_child_process_1.NoopChildProcess({
|
|
448
450
|
code: 1,
|
|
449
|
-
terminalOutput:
|
|
451
|
+
terminalOutput: e.stack ?? e.message ?? '',
|
|
450
452
|
});
|
|
451
453
|
}
|
|
452
454
|
}
|
package/src/utils/params.js
CHANGED
|
@@ -623,7 +623,7 @@ async function promptForValues(opts, schema, projectsConfigurations) {
|
|
|
623
623
|
.then((values) => ({ ...opts, ...values }))
|
|
624
624
|
.catch((e) => {
|
|
625
625
|
console.error(e);
|
|
626
|
-
process.exit(
|
|
626
|
+
process.exit(1);
|
|
627
627
|
});
|
|
628
628
|
}
|
|
629
629
|
function findSchemaForProperty(propName, schema) {
|