@nrwl/workspace 13.2.0-rc.3 → 13.3.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/executors.json +0 -10
- package/migrations.json +6 -0
- package/package.json +5 -5
- package/src/command-line/affected.js +1 -3
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/examples.js +0 -20
- package/src/command-line/examples.js.map +1 -1
- package/src/command-line/run-many.js +1 -3
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +1 -3
- package/src/command-line/run-one.js.map +1 -1
- package/src/command-line/workspace-generators.js +6 -1
- package/src/command-line/workspace-generators.js.map +1 -1
- package/src/core/file-utils.js +1 -3
- package/src/core/file-utils.js.map +1 -1
- package/src/core/shared-interfaces.d.ts +6 -2
- package/src/generators/library/library.js +3 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/migrations/update-13-3-0/update-tsc-executor-location.d.ts +3 -0
- package/src/migrations/update-13-3-0/update-tsc-executor-location.js +31 -0
- package/src/migrations/update-13-3-0/update-tsc-executor-location.js.map +1 -0
- package/src/tasks-runner/default-reporter.d.ts +4 -0
- package/src/tasks-runner/default-reporter.js +4 -0
- package/src/tasks-runner/default-reporter.js.map +1 -1
- package/src/tasks-runner/default-tasks-runner.d.ts +2 -12
- package/src/tasks-runner/default-tasks-runner.js +16 -43
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/empty-reporter.d.ts +4 -0
- package/src/tasks-runner/empty-reporter.js +4 -0
- package/src/tasks-runner/empty-reporter.js.map +1 -1
- package/src/tasks-runner/empty-terminal-output-life-cycle.d.ts +6 -0
- package/src/tasks-runner/empty-terminal-output-life-cycle.js +16 -0
- package/src/tasks-runner/empty-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/forked-process-task-runner.js +3 -9
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycle.d.ts +43 -0
- package/src/tasks-runner/life-cycle.js +72 -0
- package/src/tasks-runner/life-cycle.js.map +1 -0
- package/src/tasks-runner/reporter.d.ts +4 -0
- package/src/tasks-runner/reporter.js +4 -0
- package/src/tasks-runner/reporter.js.map +1 -1
- package/src/tasks-runner/run-command.d.ts +4 -4
- package/src/tasks-runner/run-command.js +66 -54
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/run-many-terminal-output-life-cycle.d.ts +25 -0
- package/src/tasks-runner/run-many-terminal-output-life-cycle.js +91 -0
- package/src/tasks-runner/run-many-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/run-one-reporter.d.ts +4 -0
- package/src/tasks-runner/run-one-reporter.js +4 -0
- package/src/tasks-runner/run-one-reporter.js.map +1 -1
- package/src/tasks-runner/run-one-terminal-output-life-cycle.d.ts +25 -0
- package/src/tasks-runner/run-one-terminal-output-life-cycle.js +84 -0
- package/src/tasks-runner/run-one-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/task-orchestrator.d.ts +5 -15
- package/src/tasks-runner/task-orchestrator.js +18 -111
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/task-timings-life-cycle.d.ts +13 -0
- package/src/tasks-runner/task-timings-life-cycle.js +33 -0
- package/src/tasks-runner/task-timings-life-cycle.js.map +1 -0
- package/src/tasks-runner/tasks-runner-v2.d.ts +17 -3
- package/src/tasks-runner/tasks-runner-v2.js +29 -3
- package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +23 -2
- package/src/tasks-runner/tasks-runner.js +5 -0
- package/src/tasks-runner/tasks-runner.js.map +1 -1
- package/src/tasks-runner/tasks-schedule.d.ts +5 -2
- package/src/tasks-runner/tasks-schedule.js +32 -15
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/utils/ast-utils.d.ts +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +4 -4
- package/src/utils/versions.js.map +1 -1
- package/src/command-line/workspace-results.d.ts +0 -13
- package/src/command-line/workspace-results.js +0 -66
- package/src/command-line/workspace-results.js.map +0 -1
- package/src/executors/tsc/compat.d.ts +0 -2
- package/src/executors/tsc/compat.js +0 -6
- package/src/executors/tsc/compat.js.map +0 -1
- package/src/executors/tsc/schema.d.ts +0 -6
- package/src/executors/tsc/schema.json +0 -65
- package/src/executors/tsc/tsc.impl.d.ts +0 -6
- package/src/executors/tsc/tsc.impl.js +0 -64
- package/src/executors/tsc/tsc.impl.js.map +0 -1
- package/src/generators/init/files/prettier/.prettierignore +0 -1
|
@@ -2,19 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.defaultTasksRunner = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const Observable_1 = require("rxjs/internal/Observable");
|
|
6
5
|
const task_orchestrator_1 = require("./task-orchestrator");
|
|
7
6
|
const perf_hooks_1 = require("perf_hooks");
|
|
8
7
|
const task_graph_creator_1 = require("./task-graph-creator");
|
|
9
8
|
const hasher_1 = require("../core/hasher/hasher");
|
|
10
|
-
|
|
11
|
-
scheduleTask(task) { }
|
|
12
|
-
startTask(task) { }
|
|
13
|
-
endTask(task, code) { }
|
|
14
|
-
startTasks(task) { }
|
|
15
|
-
endTasks(taskResults) { }
|
|
16
|
-
}
|
|
17
|
-
const defaultTasksRunner = (tasks, options, context) => {
|
|
9
|
+
const defaultTasksRunner = (tasks, options, context) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
18
10
|
if (options['parallel'] === 'false' ||
|
|
19
11
|
options['parallel'] === false) {
|
|
20
12
|
options['parallel'] = 1;
|
|
@@ -24,39 +16,22 @@ const defaultTasksRunner = (tasks, options, context) => {
|
|
|
24
16
|
options['parallel'] = Number(options['maxParallel'] || 3);
|
|
25
17
|
}
|
|
26
18
|
else if (options.parallel === undefined) {
|
|
27
|
-
options.parallel = 3;
|
|
19
|
+
options.parallel = Number(options['maxParallel'] || 3);
|
|
28
20
|
}
|
|
29
|
-
|
|
30
|
-
|
|
21
|
+
options.lifeCycle.startCommand();
|
|
22
|
+
try {
|
|
23
|
+
return yield runAllTasks(tasks, options, context);
|
|
31
24
|
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
console.error('Unexpected error:');
|
|
37
|
-
console.error(e);
|
|
38
|
-
process.exit(1);
|
|
39
|
-
})
|
|
40
|
-
.finally(() => {
|
|
41
|
-
subscriber.complete();
|
|
42
|
-
// fix for https://github.com/nrwl/nx/issues/1666
|
|
43
|
-
if (process.stdin['unref'])
|
|
44
|
-
process.stdin.unref();
|
|
45
|
-
});
|
|
46
|
-
});
|
|
47
|
-
};
|
|
48
|
-
exports.defaultTasksRunner = defaultTasksRunner;
|
|
49
|
-
function printTaskExecution(orchestrator) {
|
|
50
|
-
if (process.env.NX_PERF_LOGGING) {
|
|
51
|
-
console.log('Task Execution Timings:');
|
|
52
|
-
const timings = {};
|
|
53
|
-
Object.keys(orchestrator.timings).forEach((p) => {
|
|
54
|
-
const t = orchestrator.timings[p];
|
|
55
|
-
timings[p] = t.end ? t.end - t.start : null;
|
|
56
|
-
});
|
|
57
|
-
console.log(JSON.stringify(timings, null, 2));
|
|
25
|
+
catch (e) {
|
|
26
|
+
console.error('Unexpected error:');
|
|
27
|
+
console.error(e);
|
|
28
|
+
process.exit(1);
|
|
58
29
|
}
|
|
59
|
-
|
|
30
|
+
finally {
|
|
31
|
+
options.lifeCycle.endCommand();
|
|
32
|
+
}
|
|
33
|
+
});
|
|
34
|
+
exports.defaultTasksRunner = defaultTasksRunner;
|
|
60
35
|
function runAllTasks(tasks, options, context) {
|
|
61
36
|
var _a;
|
|
62
37
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
@@ -67,10 +42,8 @@ function runAllTasks(tasks, options, context) {
|
|
|
67
42
|
perf_hooks_1.performance.measure('nx-prep-work', 'init-local', 'task-graph-created');
|
|
68
43
|
perf_hooks_1.performance.measure('graph-creation', 'command-execution-begins', 'task-graph-created');
|
|
69
44
|
const hasher = new hasher_1.Hasher(context.projectGraph, context.nxJson, options);
|
|
70
|
-
const orchestrator = new task_orchestrator_1.TaskOrchestrator(hasher, context.initiatingProject, context.projectGraph, taskGraph, options
|
|
71
|
-
|
|
72
|
-
printTaskExecution(orchestrator);
|
|
73
|
-
return res;
|
|
45
|
+
const orchestrator = new task_orchestrator_1.TaskOrchestrator(hasher, context.initiatingProject, context.projectGraph, taskGraph, options);
|
|
46
|
+
return orchestrator.run();
|
|
74
47
|
});
|
|
75
48
|
}
|
|
76
49
|
exports.default = exports.defaultTasksRunner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/default-tasks-runner.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"default-tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/default-tasks-runner.ts"],"names":[],"mappings":";;;;AAEA,2DAAuD;AACvD,2CAAyC;AACzC,6DAAwD;AACxD,kDAA+C;AAoBxC,MAAM,kBAAkB,GAC7B,CACE,KAAa,EACb,OAAkC,EAClC,OAKC,EACsC,EAAE;IACzC,IACG,OAAe,CAAC,UAAU,CAAC,KAAK,OAAO;QACvC,OAAe,CAAC,UAAU,CAAC,KAAK,KAAK,EACtC;QACC,OAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAClC;SAAM,IACJ,OAAe,CAAC,UAAU,CAAC,KAAK,MAAM;QACtC,OAAe,CAAC,UAAU,CAAC,KAAK,IAAI,EACrC;QACC,OAAe,CAAC,UAAU,CAAC,GAAG,MAAM,CAClC,OAAe,CAAC,aAAa,CAAC,IAAI,CAAC,CACrC,CAAC;KACH;SAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE;QACzC,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAE,OAAe,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;KACjE;IAED,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;IACjC,IAAI;QACF,OAAO,MAAM,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;KACnD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;YAAS;QACR,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;KAChC;AACH,CAAC,CAAA,CAAC;AArCS,QAAA,kBAAkB,sBAqC3B;AAEJ,SAAe,WAAW,CACxB,KAAa,EACb,OAAkC,EAClC,OAIC;;;QAED,MAAM,yBAAyB,GAAG,MAAA,OAAO,CAAC,MAAM,CAAC,kBAAkB,mCAAI,EAAE,CAAC;QAE1E,MAAM,gBAAgB,GAAG,IAAI,qCAAgB,CAC3C,OAAO,CAAC,YAAY,EACpB,yBAAyB,CAC1B,CAAC;QAEF,MAAM,SAAS,GAAG,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE1D,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAEvC,wBAAW,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,oBAAoB,CAAC,CAAC;QACxE,wBAAW,CAAC,OAAO,CACjB,gBAAgB,EAChB,0BAA0B,EAC1B,oBAAoB,CACrB,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEzE,MAAM,YAAY,GAAG,IAAI,oCAAgB,CACvC,MAAM,EACN,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,YAAY,EACpB,SAAS,EACT,OAAO,CACR,CAAC;QAEF,OAAO,YAAY,CAAC,GAAG,EAAE,CAAC;;CAC3B;AAED,kBAAe,0BAAkB,CAAC"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { Task } from '@nrwl/devkit';
|
|
2
2
|
import { Reporter, ReporterArgs } from './reporter';
|
|
3
|
+
/**
|
|
4
|
+
* @deprecated the reporter API is no longer supported
|
|
5
|
+
* The class will be removed after Nx 14 is released.
|
|
6
|
+
*/
|
|
3
7
|
export declare class EmptyReporter implements Reporter {
|
|
4
8
|
beforeRun(projectNames: string[], tasks: Task[], args: ReporterArgs, taskOverrides: any): void;
|
|
5
9
|
printResults(args: ReporterArgs, startedWithFailedProjects: boolean, tasks: Task[], failedTasks: Task[], tasksWithFailedDependencies: Task[], cachedTasks: Task[]): void;
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EmptyReporter = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* @deprecated the reporter API is no longer supported
|
|
6
|
+
* The class will be removed after Nx 14 is released.
|
|
7
|
+
*/
|
|
4
8
|
class EmptyReporter {
|
|
5
9
|
beforeRun(projectNames, tasks, args, taskOverrides) { }
|
|
6
10
|
printResults(args, startedWithFailedProjects, tasks, failedTasks, tasksWithFailedDependencies, cachedTasks) { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"empty-reporter.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/empty-reporter.ts"],"names":[],"mappings":";;;AAGA,MAAa,aAAa;IACxB,SAAS,CACP,YAAsB,EACtB,KAAa,EACb,IAAkB,EAClB,aAAkB,IACjB,CAAC;IAEJ,YAAY,CACV,IAAkB,EAClB,yBAAkC,EAClC,KAAa,EACb,WAAmB,EACnB,2BAAmC,EACnC,WAAmB,IAClB,CAAC;CACL;AAhBD,sCAgBC"}
|
|
1
|
+
{"version":3,"file":"empty-reporter.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/empty-reporter.ts"],"names":[],"mappings":";;;AAGA;;;GAGG;AACH,MAAa,aAAa;IACxB,SAAS,CACP,YAAsB,EACtB,KAAa,EACb,IAAkB,EAClB,aAAkB,IACjB,CAAC;IAEJ,YAAY,CACV,IAAkB,EAClB,yBAAkC,EAClC,KAAa,EACb,WAAmB,EACnB,2BAAmC,EACnC,WAAmB,IAClB,CAAC;CACL;AAhBD,sCAgBC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { Task } from '@nrwl/devkit';
|
|
2
|
+
import { TaskCacheStatus } from '../utilities/output';
|
|
3
|
+
import { LifeCycle } from './life-cycle';
|
|
4
|
+
export declare class EmptyTerminalOutputLifeCycle implements LifeCycle {
|
|
5
|
+
printTaskTerminalOutput(task: Task, cacheStatus: TaskCacheStatus, terminalOutput: string): void;
|
|
6
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EmptyTerminalOutputLifeCycle = void 0;
|
|
4
|
+
const output_1 = require("../utilities/output");
|
|
5
|
+
const utils_1 = require("./utils");
|
|
6
|
+
class EmptyTerminalOutputLifeCycle {
|
|
7
|
+
printTaskTerminalOutput(task, cacheStatus, terminalOutput) {
|
|
8
|
+
if (cacheStatus === output_1.TaskCacheStatus.NoCache) {
|
|
9
|
+
const args = (0, utils_1.getCommandArgsForTask)(task);
|
|
10
|
+
output_1.output.logCommand(`nx ${args.join(' ')}`, cacheStatus);
|
|
11
|
+
process.stdout.write(terminalOutput);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.EmptyTerminalOutputLifeCycle = EmptyTerminalOutputLifeCycle;
|
|
16
|
+
//# sourceMappingURL=empty-terminal-output-life-cycle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"empty-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/empty-terminal-output-life-cycle.ts"],"names":[],"mappings":";;;AACA,gDAA8D;AAE9D,mCAAgD;AAEhD,MAAa,4BAA4B;IACvC,uBAAuB,CACrB,IAAU,EACV,WAA4B,EAC5B,cAAsB;QAEtB,IAAI,WAAW,KAAK,wBAAe,CAAC,OAAO,EAAE;YAC3C,MAAM,IAAI,GAAG,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC;YACzC,eAAM,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;YACvD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;SACtC;IACH,CAAC;CACF;AAZD,oEAYC"}
|
|
@@ -18,6 +18,7 @@ class ForkedProcessTaskRunner {
|
|
|
18
18
|
this.processes = new Set();
|
|
19
19
|
this.setupOnProcessExitListener();
|
|
20
20
|
}
|
|
21
|
+
// TODO: vsavkin delegate terminal output printing
|
|
21
22
|
forkProcessForBatch({ executorName, taskGraph }) {
|
|
22
23
|
return new Promise((res, rej) => {
|
|
23
24
|
try {
|
|
@@ -104,8 +105,7 @@ class ForkedProcessTaskRunner {
|
|
|
104
105
|
// print all the collected output|
|
|
105
106
|
const terminalOutput = outWithErr.join('');
|
|
106
107
|
if (!forwardOutput) {
|
|
107
|
-
output_1.
|
|
108
|
-
process.stdout.write(terminalOutput);
|
|
108
|
+
this.options.lifeCycle.printTaskTerminalOutput(task, output_1.TaskCacheStatus.NoCache, terminalOutput);
|
|
109
109
|
}
|
|
110
110
|
res({ code, terminalOutput });
|
|
111
111
|
});
|
|
@@ -136,13 +136,7 @@ class ForkedProcessTaskRunner {
|
|
|
136
136
|
// print all the collected output
|
|
137
137
|
const terminalOutput = this.readTerminalOutput(temporaryOutputPath);
|
|
138
138
|
if (!forwardOutput) {
|
|
139
|
-
output_1.
|
|
140
|
-
if (terminalOutput) {
|
|
141
|
-
process.stdout.write(terminalOutput);
|
|
142
|
-
}
|
|
143
|
-
else {
|
|
144
|
-
console.error(`Nx could not find process's output. Run the command without --parallel.`);
|
|
145
|
-
}
|
|
139
|
+
this.options.lifeCycle.printTaskTerminalOutput(task, output_1.TaskCacheStatus.NoCache, terminalOutput);
|
|
146
140
|
}
|
|
147
141
|
res({
|
|
148
142
|
code,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forked-process-task-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/forked-process-task-runner.ts"],"names":[],"mappings":";;;AAAA,2BAAkC;AAClC,iCAAiC;AACjC,iDAAmD;AACnD,2DAA2D;AAG3D,
|
|
1
|
+
{"version":3,"file":"forked-process-task-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/forked-process-task-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type { Task } from '@nrwl/devkit';
|
|
2
|
+
import { TaskStatus } from './tasks-runner';
|
|
3
|
+
import { TaskCacheStatus } from '../utilities/output';
|
|
4
|
+
export interface LifeCycle {
|
|
5
|
+
startCommand?(): void;
|
|
6
|
+
endCommand?(): void;
|
|
7
|
+
scheduleTask?(task: Task): void;
|
|
8
|
+
/**
|
|
9
|
+
* @deprecated use startTasks
|
|
10
|
+
*
|
|
11
|
+
* startTask won't be supported after Nx 14 is released.
|
|
12
|
+
*/
|
|
13
|
+
startTask?(task: Task): void;
|
|
14
|
+
/**
|
|
15
|
+
* @deprecated use endTasks
|
|
16
|
+
*
|
|
17
|
+
* endTask won't be supported after Nx 14 is released.
|
|
18
|
+
*/
|
|
19
|
+
endTask?(task: Task, code: number): void;
|
|
20
|
+
startTasks?(task: Task[]): void;
|
|
21
|
+
endTasks?(taskResults: Array<{
|
|
22
|
+
task: Task;
|
|
23
|
+
status: TaskStatus;
|
|
24
|
+
code: number;
|
|
25
|
+
}>): void;
|
|
26
|
+
printTaskTerminalOutput?(task: Task, cacheStatus: TaskCacheStatus, output: string): void;
|
|
27
|
+
}
|
|
28
|
+
export declare class CompositeLifeCycle implements LifeCycle {
|
|
29
|
+
private readonly lifeCycles;
|
|
30
|
+
constructor(lifeCycles: LifeCycle[]);
|
|
31
|
+
startCommand(): void;
|
|
32
|
+
endCommand(): void;
|
|
33
|
+
scheduleTask(task: Task): void;
|
|
34
|
+
startTask(task: Task): void;
|
|
35
|
+
endTask(task: Task, code: number): void;
|
|
36
|
+
startTasks(tasks: Task[]): void;
|
|
37
|
+
endTasks(taskResults: Array<{
|
|
38
|
+
task: Task;
|
|
39
|
+
status: TaskStatus;
|
|
40
|
+
code: number;
|
|
41
|
+
}>): void;
|
|
42
|
+
printTaskTerminalOutput(task: Task, cacheStatus: TaskCacheStatus, output: string): void;
|
|
43
|
+
}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CompositeLifeCycle = void 0;
|
|
4
|
+
class CompositeLifeCycle {
|
|
5
|
+
constructor(lifeCycles) {
|
|
6
|
+
this.lifeCycles = lifeCycles;
|
|
7
|
+
}
|
|
8
|
+
startCommand() {
|
|
9
|
+
for (let l of this.lifeCycles) {
|
|
10
|
+
if (l.startCommand) {
|
|
11
|
+
l.startCommand();
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
endCommand() {
|
|
16
|
+
for (let l of this.lifeCycles) {
|
|
17
|
+
if (l.endCommand) {
|
|
18
|
+
l.endCommand();
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
scheduleTask(task) {
|
|
23
|
+
for (let l of this.lifeCycles) {
|
|
24
|
+
if (l.scheduleTask) {
|
|
25
|
+
l.scheduleTask(task);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
startTask(task) {
|
|
30
|
+
for (let l of this.lifeCycles) {
|
|
31
|
+
if (l.startTask) {
|
|
32
|
+
l.startTask(task);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
endTask(task, code) {
|
|
37
|
+
for (let l of this.lifeCycles) {
|
|
38
|
+
if (l.endTask) {
|
|
39
|
+
l.endTask(task, code);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
startTasks(tasks) {
|
|
44
|
+
for (let l of this.lifeCycles) {
|
|
45
|
+
if (l.startTasks) {
|
|
46
|
+
l.startTasks(tasks);
|
|
47
|
+
}
|
|
48
|
+
else if (l.startTask) {
|
|
49
|
+
tasks.forEach((t) => l.startTask(t));
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
endTasks(taskResults) {
|
|
54
|
+
for (let l of this.lifeCycles) {
|
|
55
|
+
if (l.endTasks) {
|
|
56
|
+
l.endTasks(taskResults);
|
|
57
|
+
}
|
|
58
|
+
else if (l.endTask) {
|
|
59
|
+
taskResults.forEach((t) => l.endTask(t.task, t.code));
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
printTaskTerminalOutput(task, cacheStatus, output) {
|
|
64
|
+
for (let l of this.lifeCycles) {
|
|
65
|
+
if (l.printTaskTerminalOutput) {
|
|
66
|
+
l.printTaskTerminalOutput(task, cacheStatus, output);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
exports.CompositeLifeCycle = CompositeLifeCycle;
|
|
72
|
+
//# sourceMappingURL=life-cycle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/life-cycle.ts"],"names":[],"mappings":";;;AAsCA,MAAa,kBAAkB;IAC7B,YAA6B,UAAuB;QAAvB,eAAU,GAAV,UAAU,CAAa;IAAG,CAAC;IAExD,YAAY;QACV,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,EAAE,CAAC;aAClB;SACF;IACH,CAAC;IAED,UAAU;QACR,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,EAAE,CAAC;aAChB;SACF;IACH,CAAC;IAED,YAAY,CAAC,IAAU;QACrB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aACtB;SACF;IACH,CAAC;IAED,SAAS,CAAC,IAAU;QAClB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,SAAS,EAAE;gBACf,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aACnB;SACF;IACH,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,IAAY;QAC9B,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,OAAO,EAAE;gBACb,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACvB;SACF;IACH,CAAC;IAED,UAAU,CAAC,KAAa;QACtB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aACrB;iBAAM,IAAI,CAAC,CAAC,SAAS,EAAE;gBACtB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC;SACF;IACH,CAAC;IAED,QAAQ,CACN,WAAoE;QAEpE,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,QAAQ,EAAE;gBACd,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;aACzB;iBAAM,IAAI,CAAC,CAAC,OAAO,EAAE;gBACpB,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aACvD;SACF;IACH,CAAC;IAED,uBAAuB,CACrB,IAAU,EACV,WAA4B,EAC5B,MAAc;QAEd,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,uBAAuB,EAAE;gBAC7B,CAAC,CAAC,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;aACtD;SACF;IACH,CAAC;CACF;AA5ED,gDA4EC"}
|
|
@@ -4,6 +4,10 @@ export interface ReporterArgs {
|
|
|
4
4
|
configuration?: string;
|
|
5
5
|
onlyFailed?: boolean;
|
|
6
6
|
}
|
|
7
|
+
/**
|
|
8
|
+
* @deprecated the reporter API is no longer supported.
|
|
9
|
+
* The class will be removed after Nx 14 is released.
|
|
10
|
+
*/
|
|
7
11
|
export declare abstract class Reporter {
|
|
8
12
|
abstract beforeRun(projectNames: string[], tasks: Task[], args: ReporterArgs, taskOverrides: any): void;
|
|
9
13
|
abstract printResults(nxArgs: ReporterArgs, startedWithFailedProjects: boolean, tasks: Task[], failedTasks: Task[], tasksWithFailedDependencies: Task[], cachedTasks: Task[]): void;
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Reporter = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* @deprecated the reporter API is no longer supported.
|
|
6
|
+
* The class will be removed after Nx 14 is released.
|
|
7
|
+
*/
|
|
4
8
|
class Reporter {
|
|
5
9
|
}
|
|
6
10
|
exports.Reporter = Reporter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/reporter.ts"],"names":[],"mappings":";;;AAQA,MAAsB,QAAQ;CAgB7B;AAhBD,4BAgBC"}
|
|
1
|
+
{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/reporter.ts"],"names":[],"mappings":";;;AAQA;;;GAGG;AACH,MAAsB,QAAQ;CAgB7B;AAhBD,4BAgBC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { TasksRunner } from './tasks-runner';
|
|
2
|
-
import {
|
|
2
|
+
import { ReporterArgs } from './reporter';
|
|
3
3
|
import * as yargs from 'yargs';
|
|
4
|
-
import type { ProjectGraph, ProjectGraphNode, TargetDependencyConfig,
|
|
4
|
+
import type { NxJsonConfiguration, ProjectGraph, ProjectGraphNode, TargetDependencyConfig, Task } from '@nrwl/devkit';
|
|
5
5
|
import { Environment } from '../core/shared-interfaces';
|
|
6
6
|
import { NxArgs } from '../command-line/utils';
|
|
7
7
|
declare type RunArgs = yargs.Arguments & ReporterArgs;
|
|
8
|
-
export declare function runCommand<T extends RunArgs>(projectsToRun: ProjectGraphNode[], projectGraph: ProjectGraph, { nxJson, workspaceResults }: Environment, nxArgs: NxArgs, overrides: any,
|
|
8
|
+
export declare function runCommand<T extends RunArgs>(projectsToRun: ProjectGraphNode[], projectGraph: ProjectGraph, { nxJson, workspaceResults }: Environment, nxArgs: NxArgs, overrides: any, terminalOutputStrategy: 'default' | 'hide-cached-output' | 'run-one', initiatingProject: string | null): Promise<void>;
|
|
9
9
|
interface TaskParams {
|
|
10
10
|
project: ProjectGraphNode;
|
|
11
11
|
target: string;
|
|
@@ -17,6 +17,6 @@ export declare function createTasksForProjectToRun(projectsToRun: ProjectGraphNo
|
|
|
17
17
|
export declare function createTask({ project, target, configuration, overrides, errorIfCannotFindConfiguration, }: TaskParams): Task;
|
|
18
18
|
export declare function getRunner(nxArgs: NxArgs, nxJson: NxJsonConfiguration): {
|
|
19
19
|
tasksRunner: TasksRunner;
|
|
20
|
-
runnerOptions:
|
|
20
|
+
runnerOptions: any;
|
|
21
21
|
};
|
|
22
22
|
export {};
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getRunner = exports.createTask = exports.createTasksForProjectToRun = exports.runCommand = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const tasks_runner_1 = require("./tasks-runner");
|
|
6
5
|
const path_1 = require("path");
|
|
7
6
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
8
7
|
const devkit_1 = require("@nrwl/devkit");
|
|
@@ -11,9 +10,29 @@ const fileutils_1 = require("../utilities/fileutils");
|
|
|
11
10
|
const project_graph_utils_1 = require("../utilities/project-graph-utils");
|
|
12
11
|
const output_1 = require("../utilities/output");
|
|
13
12
|
const utils_1 = require("./utils");
|
|
14
|
-
const
|
|
15
|
-
|
|
13
|
+
const life_cycle_1 = require("./life-cycle");
|
|
14
|
+
const run_many_terminal_output_life_cycle_1 = require("./run-many-terminal-output-life-cycle");
|
|
15
|
+
const empty_terminal_output_life_cycle_1 = require("./empty-terminal-output-life-cycle");
|
|
16
|
+
const run_one_terminal_output_life_cycle_1 = require("./run-one-terminal-output-life-cycle");
|
|
17
|
+
const task_timings_life_cycle_1 = require("./task-timings-life-cycle");
|
|
18
|
+
function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, projectsToRun, tasks, nxArgs, overrides) {
|
|
19
|
+
if (terminalOutputStrategy === 'run-one') {
|
|
20
|
+
return new run_one_terminal_output_life_cycle_1.RunOneTerminalOutputLifeCycle(initiatingProject, projectsToRun.map((t) => t.name), tasks, nxArgs);
|
|
21
|
+
}
|
|
22
|
+
else if (terminalOutputStrategy === 'hide-cached-output') {
|
|
23
|
+
return new empty_terminal_output_life_cycle_1.EmptyTerminalOutputLifeCycle();
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
return new run_many_terminal_output_life_cycle_1.RunManyTerminalOutputLifeCycle(projectsToRun.map((t) => t.name), tasks, nxArgs, overrides);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
function runCommand(projectsToRun, projectGraph, { nxJson, workspaceResults }, nxArgs, overrides, terminalOutputStrategy, initiatingProject) {
|
|
16
30
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
31
|
+
if (nxArgs.onlyFailed || nxArgs['only-failed']) {
|
|
32
|
+
output_1.output.warn({
|
|
33
|
+
title: '--only-failed has been removed. Nx is executing all the tasks.',
|
|
34
|
+
});
|
|
35
|
+
}
|
|
17
36
|
const { tasksRunner, runnerOptions } = getRunner(nxArgs, nxJson);
|
|
18
37
|
// Doing this for backwards compatibility, should be removed in v14
|
|
19
38
|
ensureTargetDependenciesBackwardCompatibility(nxJson, nxArgs);
|
|
@@ -23,66 +42,59 @@ function runCommand(projectsToRun, projectGraph, { nxJson, workspaceResults }, n
|
|
|
23
42
|
configuration: nxArgs.configuration,
|
|
24
43
|
overrides,
|
|
25
44
|
}, projectGraph, initiatingProject, defaultDependencyConfigs);
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
tasks[i].hash = res[i].value;
|
|
32
|
-
tasks[i].hashDetails = res[i].details;
|
|
45
|
+
const lifeCycles = [
|
|
46
|
+
getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, projectsToRun, tasks, nxArgs, overrides),
|
|
47
|
+
];
|
|
48
|
+
if (process.env.NX_PERF_LOGGING) {
|
|
49
|
+
lifeCycles.push(new task_timings_life_cycle_1.TaskTimingsLifeCycle());
|
|
33
50
|
}
|
|
34
|
-
const
|
|
35
|
-
const
|
|
36
|
-
const tasksWithFailedDependencies = [];
|
|
37
|
-
tasksRunner(tasks, runnerOptions, {
|
|
51
|
+
const lifeCycle = new life_cycle_1.CompositeLifeCycle(lifeCycles);
|
|
52
|
+
const promiseOrObservable = tasksRunner(tasks, Object.assign(Object.assign({}, runnerOptions), { lifeCycle }), {
|
|
38
53
|
initiatingProject,
|
|
39
54
|
target: nxArgs.target,
|
|
40
55
|
projectGraph,
|
|
41
56
|
nxJson,
|
|
42
|
-
hideCachedOutput: nxArgs.hideCachedOutput,
|
|
43
|
-
}).subscribe({
|
|
44
|
-
next: (event) => {
|
|
45
|
-
if (projectsToRun
|
|
46
|
-
.map((project) => project.name)
|
|
47
|
-
.includes(event.task.target.project) &&
|
|
48
|
-
event.task.target.target === nxArgs.target) {
|
|
49
|
-
workspaceResults.setResult(event.task.target.project, event.success);
|
|
50
|
-
}
|
|
51
|
-
switch (event.type) {
|
|
52
|
-
case tasks_runner_1.AffectedEventType.TaskComplete: {
|
|
53
|
-
if (!event.success) {
|
|
54
|
-
failedTasks.push(event.task);
|
|
55
|
-
}
|
|
56
|
-
break;
|
|
57
|
-
}
|
|
58
|
-
case tasks_runner_1.AffectedEventType.TaskDependencyFailed: {
|
|
59
|
-
tasksWithFailedDependencies.push(event.task);
|
|
60
|
-
break;
|
|
61
|
-
}
|
|
62
|
-
case tasks_runner_1.AffectedEventType.TaskCacheRead: {
|
|
63
|
-
cachedTasks.push(event.task);
|
|
64
|
-
if (!event.success) {
|
|
65
|
-
failedTasks.push(event.task);
|
|
66
|
-
}
|
|
67
|
-
break;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
},
|
|
71
|
-
error: console.error,
|
|
72
|
-
complete: () => {
|
|
73
|
-
// fix for https://github.com/nrwl/nx/issues/1666
|
|
74
|
-
if (process.stdin['unref'])
|
|
75
|
-
process.stdin.unref();
|
|
76
|
-
workspaceResults.saveResults();
|
|
77
|
-
reporter.printResults(nxArgs, workspaceResults.startedWithFailedProjects, tasks, failedTasks, tasksWithFailedDependencies, cachedTasks);
|
|
78
|
-
if (workspaceResults.hasFailure) {
|
|
79
|
-
process.exit(1);
|
|
80
|
-
}
|
|
81
|
-
},
|
|
82
57
|
});
|
|
58
|
+
let anyFailures;
|
|
59
|
+
if (promiseOrObservable.subscribe) {
|
|
60
|
+
anyFailures = yield anyFailuresInObservable(promiseOrObservable);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
// simply await the promise
|
|
64
|
+
anyFailures = yield anyFailuresInPromise(promiseOrObservable);
|
|
65
|
+
}
|
|
66
|
+
// fix for https://github.com/nrwl/nx/issues/1666
|
|
67
|
+
if (process.stdin['unref'])
|
|
68
|
+
process.stdin.unref();
|
|
69
|
+
process.exit(anyFailures ? 1 : 0);
|
|
83
70
|
});
|
|
84
71
|
}
|
|
85
72
|
exports.runCommand = runCommand;
|
|
73
|
+
function anyFailuresInPromise(promise) {
|
|
74
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
75
|
+
return Object.values(yield promise).some((v) => v === 'failure' || v === 'skipped');
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
function anyFailuresInObservable(obs) {
|
|
79
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
80
|
+
return yield new Promise((res) => {
|
|
81
|
+
let anyFailures = false;
|
|
82
|
+
obs.subscribe((t) => {
|
|
83
|
+
if (!t.success) {
|
|
84
|
+
anyFailures = true;
|
|
85
|
+
}
|
|
86
|
+
}, (error) => {
|
|
87
|
+
output_1.output.error({
|
|
88
|
+
title: 'Unhandled error in task executor',
|
|
89
|
+
});
|
|
90
|
+
console.error(error);
|
|
91
|
+
res(true);
|
|
92
|
+
}, () => {
|
|
93
|
+
res(anyFailures);
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
}
|
|
86
98
|
function createTasksForProjectToRun(projectsToRun, params, projectGraph, initiatingProject, defaultDependencyConfigs = {}) {
|
|
87
99
|
const tasksMap = new Map();
|
|
88
100
|
const seenSet = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|