@nrwl/workspace 13.2.2 → 13.3.0-beta.12
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/format.js +12 -7
- package/src/command-line/format.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/core/dep-graph/index.html +41 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/styles.css +1 -1
- package/src/core/file-utils.js +6 -3
- package/src/core/file-utils.js.map +1 -1
- package/src/core/nx-deps/nx-deps-cache.js +1 -1
- package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +0 -1
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/server/logger.d.ts +0 -1
- package/src/core/project-graph/daemon/server/logger.js +0 -3
- package/src/core/project-graph/daemon/server/logger.js.map +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.d.ts +3 -0
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +28 -21
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +65 -34
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.js +10 -6
- package/src/core/project-graph/daemon/server/shutdown-utils.js.map +1 -1
- package/src/core/project-graph/project-graph.js +21 -7
- package/src/core/project-graph/project-graph.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/generators/npm-package/npm-package.js +6 -3
- package/src/generators/npm-package/npm-package.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 +15 -42
- 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 +32 -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/tslint/nxEnforceModuleBoundariesRule.d.ts +3 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.js +8 -4
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +1 -1
- package/src/utils/ast-utils.d.ts +1 -1
- package/src/utils/graph-utils.js +1 -1
- package/src/utils/graph-utils.js.map +1 -1
- package/src/utils/rules/format-files.js +7 -11
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/runtime-lint-utils.d.ts +6 -2
- package/src/utils/runtime-lint-utils.js +30 -9
- package/src/utils/runtime-lint-utils.js.map +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
|
@@ -41,18 +41,32 @@ function readCachedProjectGraph(projectGraphVersion = '5.0') {
|
|
|
41
41
|
}
|
|
42
42
|
exports.readCachedProjectGraph = readCachedProjectGraph;
|
|
43
43
|
function createProjectGraphAsync(projectGraphVersion = '5.0') {
|
|
44
|
-
var _a, _b;
|
|
44
|
+
var _a, _b, _c;
|
|
45
45
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
46
46
|
const nxJson = (0, file_utils_1.readNxJson)();
|
|
47
|
-
const useDaemonProcessOption = (_b = (_a = nxJson.tasksRunnerOptions['default']) === null ||
|
|
48
|
-
|
|
47
|
+
const useDaemonProcessOption = (_c = (_b = (_a = nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.useDaemonProcess;
|
|
48
|
+
const env = process.env.NX_DAEMON;
|
|
49
|
+
// env takes precendence
|
|
50
|
+
// option=undefined,env=undefined => no daemon
|
|
51
|
+
// option=true,env=false => no daemon
|
|
52
|
+
// option=false,env=undefined => no daemon
|
|
53
|
+
// option=false,env=false => no daemon
|
|
54
|
+
// option=true,env=undefined => daemon
|
|
55
|
+
// option=true,env=true => daemon
|
|
56
|
+
// option=false,env=true => daemon
|
|
57
|
+
if ((useDaemonProcessOption === undefined && env === undefined) ||
|
|
58
|
+
(useDaemonProcessOption === true && env === 'false') ||
|
|
59
|
+
(useDaemonProcessOption === false && env === undefined) ||
|
|
60
|
+
(useDaemonProcessOption === false && env === 'false')) {
|
|
49
61
|
return projectGraphAdapter('5.0', projectGraphVersion, yield (0, build_project_graph_1.buildProjectGraph)());
|
|
50
62
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
yield daemonClient.
|
|
63
|
+
else {
|
|
64
|
+
const daemonClient = require('./daemon/client/client');
|
|
65
|
+
if (!(yield daemonClient.isServerAvailable())) {
|
|
66
|
+
yield daemonClient.startInBackground();
|
|
67
|
+
}
|
|
68
|
+
return projectGraphAdapter('5.0', projectGraphVersion, daemonClient.getProjectGraphFromServer());
|
|
54
69
|
}
|
|
55
|
-
return projectGraphAdapter('5.0', projectGraphVersion, daemonClient.getProjectGraphFromServer());
|
|
56
70
|
});
|
|
57
71
|
}
|
|
58
72
|
exports.createProjectGraphAsync = createProjectGraphAsync;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":";;;;AAAA,yCAA0D;AAC1D,4DAAwE;AACxE,+DAA0D;AAC1D,8CAA8D;AAE9D;;;GAGG;AACH,SAAgB,sBAAsB,CACpC,mBAAmB,GAAG,KAAK;IAE3B,MAAM,iBAAiB,GAA8B,IAAA,yBAAS,GAAE,CAAC;IACjE,MAAM,oBAAoB,GACxB,IAAA,8BAAiB,GAAE,KAAK,cAAc;QACpC,CAAC,CAAC,IAAA,qBAAY,EAAA;;;;OAIb;QACD,CAAC,CAAC,EAAE,CAAC;IACT,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA;;;;;;;;QAQxB,oBAAoB;KACvB,CAAC,CAAC;KACJ;IACD,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE,iBAAiB,CAAC,OAAO;QAClC,KAAK,EAAE,iBAAiB,CAAC,KAAK;QAC9B,aAAa,EAAE,iBAAiB,CAAC,aAAa;QAC9C,YAAY,EAAE,iBAAiB,CAAC,YAAY;KAC7C,CAAC;IAEF,OAAO,mBAAmB,CACxB,YAAY,CAAC,OAAO,EACpB,mBAAmB,EACnB,YAAY,CACb,CAAC;AACJ,CAAC;AApCD,wDAoCC;AAED,SAAsB,uBAAuB,CAC3C,mBAAmB,GAAG,KAAK;;;QAE3B,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,sBAAsB,GAC1B,MAAA,MAAA,MAAM,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
import { WorkspaceResults } from '../command-line/workspace-results';
|
|
2
1
|
import type { NxJsonConfiguration } from '@nrwl/devkit';
|
|
3
2
|
export interface Environment {
|
|
4
3
|
nxJson: NxJsonConfiguration;
|
|
5
4
|
workspaceJson: any;
|
|
6
|
-
|
|
5
|
+
/**
|
|
6
|
+
* @deprecated the field will be removed after Nx 14 is released. It's left here
|
|
7
|
+
* not to break the type checker in case someone extends
|
|
8
|
+
* the tasks runner
|
|
9
|
+
*/
|
|
10
|
+
workspaceResults: any;
|
|
7
11
|
}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const run_tasks_in_serial_1 = require("../../utilities/run-tasks-in-serial");
|
|
8
|
+
const versions_1 = require("../../utils/versions");
|
|
8
9
|
// nx-ignore-next-line
|
|
9
10
|
const { jestProjectGenerator } = require('@nrwl/jest');
|
|
10
11
|
// nx-ignore-next-line
|
|
@@ -19,8 +20,9 @@ function addProject(tree, options) {
|
|
|
19
20
|
};
|
|
20
21
|
if (options.buildable) {
|
|
21
22
|
const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
23
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/js': versions_1.nxVersion });
|
|
22
24
|
projectConfiguration.targets.build = {
|
|
23
|
-
executor: '@nrwl/
|
|
25
|
+
executor: '@nrwl/js:tsc',
|
|
24
26
|
outputs: ['{options.outputPath}'],
|
|
25
27
|
options: {
|
|
26
28
|
outputPath: `dist/${libsDir}/${options.projectDirectory}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,10 +22,13 @@ function npmPackageGenerator(tree, options) {
|
|
|
22
22
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
23
23
|
options = normalizeOptions(options);
|
|
24
24
|
const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
25
|
+
const workspaceFile = (0, devkit_1.getWorkspacePath)(tree);
|
|
25
26
|
const projectRoot = (0, path_1.join)(libsDir, options.name);
|
|
26
|
-
(
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
if (!!workspaceFile) {
|
|
28
|
+
(0, devkit_1.addProjectConfiguration)(tree, options.name, {
|
|
29
|
+
root: projectRoot,
|
|
30
|
+
});
|
|
31
|
+
}
|
|
29
32
|
const fileCount = tree.children(projectRoot).length;
|
|
30
33
|
const projectJsonExists = tree.exists((0, path_1.join)(projectRoot, 'project.json'));
|
|
31
34
|
const isEmpty = fileCount === 0 || (fileCount === 1 && projectJsonExists);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,yCAWsB;AACtB,+BAA4B;AAM5B,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,QAAQ,CACf,WAAmB,EACnB,IAAU,EACV,QAAgB,EAChB,OAAuB;IAEvB,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE;QAC/B,IAAI,EAAE,IAAA,WAAI,EAAC,IAAI,QAAQ,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC;QACxC,OAAO,EAAE;YACP,IAAI,EAAE,eAAe;SACtB;KACF,CAAC,CAAC;IAEH,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAuB;;QAC3E,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAI,CAAC,CAAC,aAAa,EAAE;YACnB,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;gBAC1C,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;SACJ;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,SAAS,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAE1E,IAAI,OAAO,EAAE;YACX,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAtBD,kDAsBC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateTscExecutorLocation = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const versions_1 = require("../../utils/versions");
|
|
7
|
+
function updateTscExecutorLocation(host) {
|
|
8
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
|
+
const projects = (0, devkit_1.getProjects)(host);
|
|
10
|
+
let used = false;
|
|
11
|
+
for (const [project, projectConfig] of projects.entries()) {
|
|
12
|
+
for (const [target, targetConfig] of Object.entries(projectConfig.targets || {})) {
|
|
13
|
+
if (targetConfig.executor === '@nrwl/workspace:tsc') {
|
|
14
|
+
projectConfig.targets[target].executor = '@nrwl/js:tsc';
|
|
15
|
+
(0, devkit_1.updateProjectConfiguration)(host, project, projectConfig);
|
|
16
|
+
used = true;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
if (used) {
|
|
21
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
22
|
+
'@nrwl/js': versions_1.nxVersion,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
26
|
+
return () => (0, devkit_1.installPackagesTask)(host);
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
exports.updateTscExecutorLocation = updateTscExecutorLocation;
|
|
30
|
+
exports.default = updateTscExecutorLocation;
|
|
31
|
+
//# sourceMappingURL=update-tsc-executor-location.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-tsc-executor-location.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-3-0/update-tsc-executor-location.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,mDAAiD;AAEjD,SAAsB,yBAAyB,CAC7C,IAAU;;QAEV,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YACzD,KAAK,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CACjD,aAAa,CAAC,OAAO,IAAI,EAAE,CAC5B,EAAE;gBACD,IAAI,YAAY,CAAC,QAAQ,KAAK,qBAAqB,EAAE;oBACnD,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,GAAG,cAAc,CAAC;oBACxD,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;oBACzD,IAAI,GAAG,IAAI,CAAC;iBACb;aACF;SACF;QACD,IAAI,IAAI,EAAE;YACR,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,UAAU,EAAE,oBAAS;aACtB,CACF,CAAC;SACH;QACD,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE,CAAC,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IACzC,CAAC;CAAA;AA3BD,8DA2BC;AAED,kBAAe,yBAAyB,CAAC"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import type { 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 DefaultReporter implements Reporter {
|
|
4
8
|
private projectNames;
|
|
5
9
|
beforeRun(projectNames: string[], tasks: Task[], args: ReporterArgs, taskOverrides: any): void;
|
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DefaultReporter = void 0;
|
|
4
4
|
const output_1 = require("../utilities/output");
|
|
5
|
+
/**
|
|
6
|
+
* @deprecated the reporter API is no longer supported
|
|
7
|
+
* The class will be removed after Nx 14 is released.
|
|
8
|
+
*/
|
|
5
9
|
class DefaultReporter {
|
|
6
10
|
beforeRun(projectNames, tasks, args, taskOverrides) {
|
|
7
11
|
this.projectNames = projectNames;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-reporter.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/default-reporter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"default-reporter.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/default-reporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,9 @@
|
|
|
1
1
|
import { TasksRunner } from './tasks-runner';
|
|
2
|
-
import
|
|
2
|
+
import { LifeCycle } from './life-cycle';
|
|
3
3
|
export interface RemoteCache {
|
|
4
4
|
retrieve: (hash: string, cacheDirectory: string) => Promise<boolean>;
|
|
5
5
|
store: (hash: string, cacheDirectory: string) => Promise<boolean>;
|
|
6
6
|
}
|
|
7
|
-
export interface LifeCycle {
|
|
8
|
-
scheduleTask?(task: Task): void;
|
|
9
|
-
startTask(task: Task): void;
|
|
10
|
-
endTask(task: Task, code: number): void;
|
|
11
|
-
startTasks?(task: Task[]): void;
|
|
12
|
-
endTasks?(taskResults: Array<{
|
|
13
|
-
task: Task;
|
|
14
|
-
code: number;
|
|
15
|
-
}>): void;
|
|
16
|
-
}
|
|
17
7
|
export interface DefaultTasksRunnerOptions {
|
|
18
8
|
parallel?: number;
|
|
19
9
|
cacheableOperations?: string[];
|
|
@@ -21,7 +11,7 @@ export interface DefaultTasksRunnerOptions {
|
|
|
21
11
|
runtimeCacheInputs?: string[];
|
|
22
12
|
cacheDirectory?: string;
|
|
23
13
|
remoteCache?: RemoteCache;
|
|
24
|
-
lifeCycle
|
|
14
|
+
lifeCycle: LifeCycle;
|
|
25
15
|
captureStderr?: boolean;
|
|
26
16
|
skipNxCache?: boolean;
|
|
27
17
|
}
|
|
@@ -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;
|
|
@@ -26,37 +18,20 @@ const defaultTasksRunner = (tasks, options, context) => {
|
|
|
26
18
|
else if (options.parallel === undefined) {
|
|
27
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"}
|