@nrwl/workspace 13.3.0-beta.3 → 13.3.0
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/package.json +11 -7
- package/src/command-line/format.js +12 -7
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/utils.js +2 -4
- package/src/command-line/utils.js.map +1 -1
- package/src/core/assert-workspace-validity.js +6 -22
- package/src/core/assert-workspace-validity.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/hasher/file-hasher.js +2 -0
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js +27 -4
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-nodes/workspace-projects.d.ts +0 -1
- package/src/core/project-graph/build-nodes/workspace-projects.js +6 -25
- package/src/core/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +8 -4
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.d.ts +1 -1
- package/src/core/project-graph/daemon/client/client.js +40 -17
- package/src/core/project-graph/daemon/client/client.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 +90 -42
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +86 -63
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.d.ts +1 -2
- 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/daemon/server/start.js +2 -0
- package/src/core/project-graph/daemon/server/start.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.js +3 -1
- package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
- package/src/core/project-graph/project-graph.js +31 -6
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/generators/move/lib/update-build-targets.js +7 -4
- package/src/generators/move/lib/update-build-targets.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/tasks-runner/forked-process-task-runner.d.ts +3 -1
- package/src/tasks-runner/forked-process-task-runner.js +8 -1
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycle.d.ts +10 -11
- package/src/tasks-runner/life-cycle.js.map +1 -1
- package/src/tasks-runner/run-command/components/no-targets-run.d.ts +7 -0
- package/src/tasks-runner/run-command/components/no-targets-run.js +20 -0
- package/src/tasks-runner/run-command/components/no-targets-run.js.map +1 -0
- package/src/tasks-runner/run-command/components/nx-output-row-title.d.ts +7 -0
- package/src/tasks-runner/run-command/components/nx-output-row-title.js +17 -0
- package/src/tasks-runner/run-command/components/nx-output-row-title.js.map +1 -0
- package/src/tasks-runner/run-command/components/run-command.d.ts +16 -0
- package/src/tasks-runner/run-command/components/run-command.js +55 -0
- package/src/tasks-runner/run-command/components/run-command.js.map +1 -0
- package/src/tasks-runner/run-command/components/run-many.d.ts +15 -0
- package/src/tasks-runner/run-command/components/run-many.js +123 -0
- package/src/tasks-runner/run-command/components/run-many.js.map +1 -0
- package/src/tasks-runner/run-command/components/task-list.d.ts +7 -0
- package/src/tasks-runner/run-command/components/task-list.js +29 -0
- package/src/tasks-runner/run-command/components/task-list.js.map +1 -0
- package/src/tasks-runner/run-command/components/task-row.d.ts +12 -0
- package/src/tasks-runner/run-command/components/task-row.js +52 -0
- package/src/tasks-runner/run-command/components/task-row.js.map +1 -0
- package/src/tasks-runner/{run-command.d.ts → run-command/index.d.ts} +4 -7
- package/src/tasks-runner/{run-command.js → run-command/index.js} +45 -28
- package/src/tasks-runner/run-command/index.js.map +1 -0
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.d.ts +30 -0
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js +34 -0
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js.map +1 -0
- package/src/tasks-runner/task-orchestrator.js +3 -2
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +1 -1
- package/src/tasks-runner/tasks-runner.js.map +1 -1
- package/src/tasks-runner/utils.js +5 -3
- package/src/tasks-runner/utils.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/utilities/plugins/plugin-capabilities.js +10 -11
- package/src/utilities/plugins/plugin-capabilities.js.map +1 -1
- package/src/utilities/project-graph-utils.d.ts +1 -0
- package/src/utilities/project-graph-utils.js +17 -1
- package/src/utilities/project-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 +28 -7
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/tasks-runner/run-command.js.map +0 -1
|
@@ -6,6 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const nx_deps_cache_1 = require("../nx-deps/nx-deps-cache");
|
|
7
7
|
const build_project_graph_1 = require("./build-project-graph");
|
|
8
8
|
const file_utils_1 = require("../file-utils");
|
|
9
|
+
const output_1 = require("../../utilities/output");
|
|
9
10
|
/**
|
|
10
11
|
* Synchronously reads the latest cached copy of the workspace's ProjectGraph.
|
|
11
12
|
* @throws {Error} if there is no cached ProjectGraph to read from
|
|
@@ -45,14 +46,38 @@ function createProjectGraphAsync(projectGraphVersion = '5.0') {
|
|
|
45
46
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
46
47
|
const nxJson = (0, file_utils_1.readNxJson)();
|
|
47
48
|
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
|
-
|
|
49
|
-
|
|
49
|
+
const env = process.env.NX_DAEMON;
|
|
50
|
+
// env takes precendence
|
|
51
|
+
// option=undefined,env=undefined => no daemon
|
|
52
|
+
// option=true,env=false => no daemon
|
|
53
|
+
// option=false,env=undefined => no daemon
|
|
54
|
+
// option=false,env=false => no daemon
|
|
55
|
+
// option=true,env=undefined => daemon
|
|
56
|
+
// option=true,env=true => daemon
|
|
57
|
+
// option=false,env=true => daemon
|
|
58
|
+
try {
|
|
59
|
+
if ((useDaemonProcessOption === undefined && env === undefined) ||
|
|
60
|
+
(useDaemonProcessOption === true && env === 'false') ||
|
|
61
|
+
(useDaemonProcessOption === false && env === undefined) ||
|
|
62
|
+
(useDaemonProcessOption === false && env === 'false')) {
|
|
63
|
+
return projectGraphAdapter('5.0', projectGraphVersion, yield (0, build_project_graph_1.buildProjectGraph)());
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
const daemonClient = require('./daemon/client/client');
|
|
67
|
+
if (!(yield daemonClient.isServerAvailable())) {
|
|
68
|
+
yield daemonClient.startInBackground();
|
|
69
|
+
}
|
|
70
|
+
return projectGraphAdapter('5.0', projectGraphVersion, yield daemonClient.getProjectGraphFromServer());
|
|
71
|
+
}
|
|
50
72
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
73
|
+
catch (e) {
|
|
74
|
+
const lines = e.message.split('\n');
|
|
75
|
+
output_1.output.error({
|
|
76
|
+
title: lines[0],
|
|
77
|
+
bodyLines: lines.slice(1),
|
|
78
|
+
});
|
|
79
|
+
process.exit(1);
|
|
54
80
|
}
|
|
55
|
-
return projectGraphAdapter('5.0', projectGraphVersion, daemonClient.getProjectGraphFromServer());
|
|
56
81
|
});
|
|
57
82
|
}
|
|
58
83
|
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;
|
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,13 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
* Update other references to the source project's targets
|
|
7
7
|
*/
|
|
8
8
|
function updateBuildTargets(tree, schema) {
|
|
9
|
-
(0, devkit_1.
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
(0, devkit_1.getProjects)(tree).forEach((projectConfig, project) => {
|
|
10
|
+
Object.entries(projectConfig.targets || {}).forEach(([target, targetConfig]) => {
|
|
11
|
+
const configString = JSON.stringify(targetConfig);
|
|
12
|
+
const updated = JSON.parse(configString.replace(new RegExp(`${schema.projectName}:`, 'g'), `${schema.newProjectName}:`));
|
|
13
|
+
projectConfig.targets[target] = updated;
|
|
14
|
+
});
|
|
15
|
+
(0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
|
|
13
16
|
});
|
|
14
17
|
}
|
|
15
18
|
exports.updateBuildTargets = updateBuildTargets;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-build-targets.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-build-targets.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-build-targets.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-build-targets.ts"],"names":[],"mappings":";;;AAAA,yCAA6E;AAG7E;;GAEG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,MAAwB;IACrE,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE;QACnD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CACjD,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE;YACzB,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,YAAY,CAAC,OAAO,CAClB,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,WAAW,GAAG,EAAE,GAAG,CAAC,EACzC,GAAG,MAAM,CAAC,cAAc,GAAG,CAC5B,CACF,CAAC;YACF,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;QAC1C,CAAC,CACF,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC;AAhBD,gDAgBC"}
|
|
@@ -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"}
|
|
@@ -9,8 +9,9 @@ export declare class ForkedProcessTaskRunner {
|
|
|
9
9
|
private processes;
|
|
10
10
|
constructor(options: DefaultTasksRunnerOptions);
|
|
11
11
|
forkProcessForBatch({ executorName, taskGraph }: Batch): Promise<BatchResults>;
|
|
12
|
-
forkProcessPipeOutputCapture(task: Task, { forwardOutput }: {
|
|
12
|
+
forkProcessPipeOutputCapture(task: Task, { forwardOutput, temporaryOutputPath, }: {
|
|
13
13
|
forwardOutput: boolean;
|
|
14
|
+
temporaryOutputPath: string;
|
|
14
15
|
}): Promise<{
|
|
15
16
|
code: number;
|
|
16
17
|
terminalOutput: string;
|
|
@@ -23,6 +24,7 @@ export declare class ForkedProcessTaskRunner {
|
|
|
23
24
|
terminalOutput: string;
|
|
24
25
|
}>;
|
|
25
26
|
private readTerminalOutput;
|
|
27
|
+
private writeTerminalOutput;
|
|
26
28
|
private getEnvVariablesForProcess;
|
|
27
29
|
private getEnvVariablesForTask;
|
|
28
30
|
private getNxEnvVariablesForForkedProcess;
|
|
@@ -68,7 +68,7 @@ class ForkedProcessTaskRunner {
|
|
|
68
68
|
}
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
|
-
forkProcessPipeOutputCapture(task, { forwardOutput }) {
|
|
71
|
+
forkProcessPipeOutputCapture(task, { forwardOutput, temporaryOutputPath, }) {
|
|
72
72
|
return new Promise((res, rej) => {
|
|
73
73
|
try {
|
|
74
74
|
const args = (0, utils_1.getCommandArgsForTask)(task);
|
|
@@ -107,6 +107,7 @@ class ForkedProcessTaskRunner {
|
|
|
107
107
|
if (!forwardOutput) {
|
|
108
108
|
this.options.lifeCycle.printTaskTerminalOutput(task, output_1.TaskCacheStatus.NoCache, terminalOutput);
|
|
109
109
|
}
|
|
110
|
+
this.writeTerminalOutput(temporaryOutputPath, terminalOutput);
|
|
110
111
|
res({ code, terminalOutput });
|
|
111
112
|
});
|
|
112
113
|
}
|
|
@@ -158,6 +159,12 @@ class ForkedProcessTaskRunner {
|
|
|
158
159
|
return null;
|
|
159
160
|
}
|
|
160
161
|
}
|
|
162
|
+
writeTerminalOutput(outputPath, content) {
|
|
163
|
+
try {
|
|
164
|
+
(0, fs_1.writeFileSync)(outputPath, content);
|
|
165
|
+
}
|
|
166
|
+
catch (e) { }
|
|
167
|
+
}
|
|
161
168
|
// region Environment Variables
|
|
162
169
|
getEnvVariablesForProcess() {
|
|
163
170
|
return Object.assign(Object.assign(Object.assign({}, this.getDotenvVariablesForForkedProcess()), process.env), this.getNxEnvVariablesForForkedProcess(process.env.FORCE_COLOR === undefined ? 'true' : process.env.FORCE_COLOR));
|
|
@@ -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,
|
|
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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"}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import type { Task } from '@nrwl/devkit';
|
|
2
2
|
import { TaskStatus } from './tasks-runner';
|
|
3
3
|
import { TaskCacheStatus } from '../utilities/output';
|
|
4
|
+
export declare type ExtendedTaskStatus = TaskStatus | 'pending' | 'loading';
|
|
5
|
+
export interface TaskResult {
|
|
6
|
+
task: Task;
|
|
7
|
+
status: ExtendedTaskStatus;
|
|
8
|
+
code: number;
|
|
9
|
+
terminalOutput?: string;
|
|
10
|
+
}
|
|
4
11
|
export interface LifeCycle {
|
|
5
12
|
startCommand?(): void;
|
|
6
13
|
endCommand?(): void;
|
|
@@ -18,15 +25,11 @@ export interface LifeCycle {
|
|
|
18
25
|
*/
|
|
19
26
|
endTask?(task: Task, code: number): void;
|
|
20
27
|
startTasks?(task: Task[]): void;
|
|
21
|
-
endTasks?(taskResults:
|
|
22
|
-
task: Task;
|
|
23
|
-
status: TaskStatus;
|
|
24
|
-
code: number;
|
|
25
|
-
}>): void;
|
|
28
|
+
endTasks?(taskResults: TaskResult[]): void;
|
|
26
29
|
printTaskTerminalOutput?(task: Task, cacheStatus: TaskCacheStatus, output: string): void;
|
|
27
30
|
}
|
|
28
31
|
export declare class CompositeLifeCycle implements LifeCycle {
|
|
29
|
-
|
|
32
|
+
readonly lifeCycles: LifeCycle[];
|
|
30
33
|
constructor(lifeCycles: LifeCycle[]);
|
|
31
34
|
startCommand(): void;
|
|
32
35
|
endCommand(): void;
|
|
@@ -34,10 +37,6 @@ export declare class CompositeLifeCycle implements LifeCycle {
|
|
|
34
37
|
startTask(task: Task): void;
|
|
35
38
|
endTask(task: Task, code: number): void;
|
|
36
39
|
startTasks(tasks: Task[]): void;
|
|
37
|
-
endTasks(taskResults:
|
|
38
|
-
task: Task;
|
|
39
|
-
status: TaskStatus;
|
|
40
|
-
code: number;
|
|
41
|
-
}>): void;
|
|
40
|
+
endTasks(taskResults: TaskResult[]): void;
|
|
42
41
|
printTaskTerminalOutput(task: Task, cacheStatus: TaskCacheStatus, output: string): void;
|
|
43
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/life-cycle.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/life-cycle.ts"],"names":[],"mappings":";;;AA6CA,MAAa,kBAAkB;IAC7B,YAA4B,UAAuB;QAAvB,eAAU,GAAV,UAAU,CAAa;IAAG,CAAC;IAEvD,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,CAAC,WAAyB;QAChC,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;AA1ED,gDA0EC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
2
|
+
import type { InkRunManyLifeCycleOnStartCommandParams } from '../ink-run-many-life-cycle';
|
|
3
|
+
interface NoTargetsRunProps {
|
|
4
|
+
onStartCommandParams: InkRunManyLifeCycleOnStartCommandParams;
|
|
5
|
+
}
|
|
6
|
+
export declare function NoTargetsRun({ onStartCommandParams }: NoTargetsRunProps): JSX.Element;
|
|
7
|
+
export {};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NoTargetsRun = void 0;
|
|
4
|
+
const ink_1 = require("ink");
|
|
5
|
+
const React = require("react");
|
|
6
|
+
const nx_output_row_title_1 = require("./nx-output-row-title");
|
|
7
|
+
function NoTargetsRun({ onStartCommandParams }) {
|
|
8
|
+
let description = `with "${onStartCommandParams.args.target}"`;
|
|
9
|
+
if (onStartCommandParams.args.configuration) {
|
|
10
|
+
description += ` that are configured for "${onStartCommandParams.args.configuration}"`;
|
|
11
|
+
}
|
|
12
|
+
return (React.createElement(ink_1.Box, { marginY: 1, marginX: 2 },
|
|
13
|
+
React.createElement(nx_output_row_title_1.NxOutputRowTitle, null,
|
|
14
|
+
React.createElement(ink_1.Text, null,
|
|
15
|
+
"No projects ",
|
|
16
|
+
description,
|
|
17
|
+
" were run"))));
|
|
18
|
+
}
|
|
19
|
+
exports.NoTargetsRun = NoTargetsRun;
|
|
20
|
+
//# sourceMappingURL=no-targets-run.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"no-targets-run.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/tasks-runner/run-command/components/no-targets-run.tsx"],"names":[],"mappings":";;;AAAA,6BAAgC;AAChC,+BAA+B;AAE/B,+DAAyD;AAMzD,SAAgB,YAAY,CAAC,EAAE,oBAAoB,EAAqB;IACtE,IAAI,WAAW,GAAG,SAAS,oBAAoB,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;IAC/D,IAAI,oBAAoB,CAAC,IAAI,CAAC,aAAa,EAAE;QAC3C,WAAW,IAAI,6BAA6B,oBAAoB,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC;KACxF;IACD,OAAO,CACL,oBAAC,SAAG,IAAC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC;QACzB,oBAAC,sCAAgB;YACf,oBAAC,UAAI;;gBAAc,WAAW;4BAAiB,CAC9B,CACf,CACP,CAAC;AACJ,CAAC;AAZD,oCAYC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NxOutputRowTitle = void 0;
|
|
4
|
+
const ink_1 = require("ink");
|
|
5
|
+
const React = require("react");
|
|
6
|
+
function NxOutputRowTitle({ children, success }) {
|
|
7
|
+
return (React.createElement(React.Fragment, null,
|
|
8
|
+
React.createElement(ink_1.Text, { color: success ? 'green' : 'cyan' }, "> "),
|
|
9
|
+
React.createElement(ink_1.Text, { color: success ? 'green' : 'cyan', inverse: true, bold: true },
|
|
10
|
+
' ',
|
|
11
|
+
"NX",
|
|
12
|
+
' '),
|
|
13
|
+
React.createElement(ink_1.Text, null, " "),
|
|
14
|
+
children || null));
|
|
15
|
+
}
|
|
16
|
+
exports.NxOutputRowTitle = NxOutputRowTitle;
|
|
17
|
+
//# sourceMappingURL=nx-output-row-title.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nx-output-row-title.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/tasks-runner/run-command/components/nx-output-row-title.tsx"],"names":[],"mappings":";;;AAAA,6BAA2B;AAC3B,+BAA+B;AAO/B,SAAgB,gBAAgB,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAyB;IAC3E,OAAO,CACL;QACE,oBAAC,UAAI,IAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,SAAc;QACrD,oBAAC,UAAI,IAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,QAAC,IAAI;YAClD,GAAG;;YACD,GAAG,CACD;QACP,oBAAC,UAAI,YAAS;QACb,QAAQ,IAAI,IAAI,CAChB,CACJ,CAAC;AACJ,CAAC;AAZD,4CAYC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
2
|
+
import { TaskResult } from '../../life-cycle';
|
|
3
|
+
import { Task } from '../../tasks-runner';
|
|
4
|
+
import { InkRunManyLifeCycle } from '../ink-run-many-life-cycle';
|
|
5
|
+
export interface TasksState {
|
|
6
|
+
target: string;
|
|
7
|
+
projectNames: string[];
|
|
8
|
+
tasks: Task[];
|
|
9
|
+
taskResults: TaskResult[];
|
|
10
|
+
tasksToTerminalOutputs: {
|
|
11
|
+
[taskId: string]: string;
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
export declare function RunCommandComponent({ lifeCycle, }: {
|
|
15
|
+
lifeCycle: InkRunManyLifeCycle;
|
|
16
|
+
}): JSX.Element;
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RunCommandComponent = void 0;
|
|
4
|
+
const ink_1 = require("ink");
|
|
5
|
+
const React = require("react");
|
|
6
|
+
const react_1 = require("react");
|
|
7
|
+
const no_targets_run_1 = require("./no-targets-run");
|
|
8
|
+
const run_many_1 = require("./run-many");
|
|
9
|
+
function RunCommandComponent({ lifeCycle, }) {
|
|
10
|
+
const [runCommandState, setRunCommandState] = (0, react_1.useState)('INIT');
|
|
11
|
+
const [onStartCommandParamsState, setOnStartCommandParamsState] = (0, react_1.useState)(null);
|
|
12
|
+
const [tasksState, setTasksState] = (0, react_1.useState)(null);
|
|
13
|
+
const { exit } = (0, ink_1.useApp)();
|
|
14
|
+
lifeCycle.callbacks.onStartCommand = (params) => {
|
|
15
|
+
setOnStartCommandParamsState(params);
|
|
16
|
+
if (params.projectNames.length <= 0) {
|
|
17
|
+
setRunCommandState('NO_TARGETS_RUN');
|
|
18
|
+
return exit();
|
|
19
|
+
}
|
|
20
|
+
setTasksState({
|
|
21
|
+
target: params.args.target,
|
|
22
|
+
projectNames: params.projectNames,
|
|
23
|
+
tasks: null,
|
|
24
|
+
taskResults: null,
|
|
25
|
+
tasksToTerminalOutputs: {},
|
|
26
|
+
});
|
|
27
|
+
setRunCommandState('RUN_MANY');
|
|
28
|
+
};
|
|
29
|
+
lifeCycle.callbacks.onStartTasks = (tasks) => {
|
|
30
|
+
setTasksState((state) => (Object.assign(Object.assign({}, state), { tasks: [...(state.tasks || []), ...tasks] })));
|
|
31
|
+
};
|
|
32
|
+
lifeCycle.callbacks.onEndTasks = (taskResults) => {
|
|
33
|
+
setTasksState((state) => (Object.assign(Object.assign({}, state), { taskResults: [...(state.taskResults || []), ...taskResults] })));
|
|
34
|
+
};
|
|
35
|
+
lifeCycle.callbacks.onPrintTaskTerminalOutput = (task, _cacheStatus, output) => {
|
|
36
|
+
setTasksState((state) => (Object.assign(Object.assign({}, state), { tasksToTerminalOutputs: Object.assign(Object.assign({}, state.tasksToTerminalOutputs), { [task.id]: output }) })));
|
|
37
|
+
};
|
|
38
|
+
function clearTaskOutputCacheForTaskId(taskId) {
|
|
39
|
+
setTasksState((state) => {
|
|
40
|
+
const updatedTasksToTerminalOutputs = Object.assign({}, state.tasksToTerminalOutputs);
|
|
41
|
+
delete updatedTasksToTerminalOutputs[taskId];
|
|
42
|
+
return Object.assign(Object.assign({}, state), { tasksToTerminalOutputs: updatedTasksToTerminalOutputs });
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
switch (runCommandState) {
|
|
46
|
+
case 'NO_TARGETS_RUN':
|
|
47
|
+
return React.createElement(no_targets_run_1.NoTargetsRun, { onStartCommandParams: onStartCommandParamsState });
|
|
48
|
+
case 'RUN_MANY':
|
|
49
|
+
return (React.createElement(run_many_1.RunMany, { tasksState: tasksState, clearTaskOutputCacheForTaskId: clearTaskOutputCacheForTaskId }));
|
|
50
|
+
default:
|
|
51
|
+
return React.createElement(ink_1.Text, null, '');
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
exports.RunCommandComponent = RunCommandComponent;
|
|
55
|
+
//# sourceMappingURL=run-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/tasks-runner/run-command/components/run-command.tsx"],"names":[],"mappings":";;;AAAA,6BAAmC;AACnC,+BAA+B;AAC/B,iCAAiC;AAIjC,qDAAgD;AAChD,yCAAqC;AAYrC,SAAgB,mBAAmB,CAAC,EAClC,SAAS,GAGV;IACC,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GACzC,IAAA,gBAAQ,EAAkB,MAAM,CAAC,CAAC;IACpC,MAAM,CAAC,yBAAyB,EAAE,4BAA4B,CAAC,GAC7D,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;IACjB,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAA,gBAAQ,EAAoB,IAAI,CAAC,CAAC;IACtE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,YAAM,GAAE,CAAC;IAE1B,SAAS,CAAC,SAAS,CAAC,cAAc,GAAG,CAAC,MAAM,EAAE,EAAE;QAC9C,4BAA4B,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,EAAE;YACnC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YACrC,OAAO,IAAI,EAAE,CAAC;SACf;QACD,aAAa,CAAC;YACZ,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM;YAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,IAAI;YACjB,sBAAsB,EAAE,EAAE;SAC3B,CAAC,CAAC;QACH,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC,CAAC;IAEF,SAAS,CAAC,SAAS,CAAC,YAAY,GAAG,CAAC,KAAK,EAAE,EAAE;QAC3C,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iCACpB,KAAK,KACR,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC,IACzC,CAAC,CAAC;IACN,CAAC,CAAC;IAEF,SAAS,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,WAAW,EAAE,EAAE;QAC/C,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iCACpB,KAAK,KACR,WAAW,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,GAAG,WAAW,CAAC,IAC3D,CAAC,CAAC;IACN,CAAC,CAAC;IAEF,SAAS,CAAC,SAAS,CAAC,yBAAyB,GAAG,CAC9C,IAAI,EACJ,YAAY,EACZ,MAAM,EACN,EAAE;QACF,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iCACpB,KAAK,KACR,sBAAsB,kCACjB,KAAK,CAAC,sBAAsB,KAC/B,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,OAEnB,CAAC,CAAC;IACN,CAAC,CAAC;IAEF,SAAS,6BAA6B,CAAC,MAAc;QACnD,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,MAAM,6BAA6B,qBAC9B,KAAK,CAAC,sBAAsB,CAChC,CAAC;YACF,OAAO,6BAA6B,CAAC,MAAM,CAAC,CAAC;YAC7C,uCACK,KAAK,KACR,sBAAsB,EAAE,6BAA6B,IACrD;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,eAAe,EAAE;QACvB,KAAK,gBAAgB;YACnB,OAAO,oBAAC,6BAAY,IAAC,oBAAoB,EAAE,yBAAyB,GAAI,CAAC;QAC3E,KAAK,UAAU;YACb,OAAO,CACL,oBAAC,kBAAO,IACN,UAAU,EAAE,UAAU,EACtB,6BAA6B,EAAE,6BAA6B,GAC5D,CACH,CAAC;QACJ;YACE,OAAO,oBAAC,UAAI,QAAE,EAAE,CAAQ,CAAC;KAC5B;AACH,CAAC;AAlFD,kDAkFC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
2
|
+
import type { ExtendedTaskStatus } from '../../life-cycle';
|
|
3
|
+
import type { TasksState } from './run-command';
|
|
4
|
+
export interface TaskListItem {
|
|
5
|
+
projectName: string;
|
|
6
|
+
status: ExtendedTaskStatus;
|
|
7
|
+
additionalStatusText: string;
|
|
8
|
+
output: string;
|
|
9
|
+
}
|
|
10
|
+
interface RunManyProps {
|
|
11
|
+
tasksState: TasksState;
|
|
12
|
+
clearTaskOutputCacheForTaskId: (taskId: string) => void;
|
|
13
|
+
}
|
|
14
|
+
export declare function RunMany({ tasksState, clearTaskOutputCacheForTaskId, }: RunManyProps): JSX.Element;
|
|
15
|
+
export {};
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RunMany = void 0;
|
|
4
|
+
const ink_1 = require("ink");
|
|
5
|
+
const React = require("react");
|
|
6
|
+
const react_1 = require("react");
|
|
7
|
+
const nx_output_row_title_1 = require("./nx-output-row-title");
|
|
8
|
+
const task_list_1 = require("./task-list");
|
|
9
|
+
function RunMany({ tasksState, clearTaskOutputCacheForTaskId, }) {
|
|
10
|
+
const [taskList, setTaskList] = (0, react_1.useState)(tasksState.projectNames.map((projectName) => ({
|
|
11
|
+
projectName,
|
|
12
|
+
status: 'pending',
|
|
13
|
+
additionalStatusText: '',
|
|
14
|
+
output: '',
|
|
15
|
+
})));
|
|
16
|
+
(0, react_1.useEffect)(() => {
|
|
17
|
+
if (!tasksState.taskResults) {
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
setTaskList((state) => {
|
|
21
|
+
return state.map((task) => {
|
|
22
|
+
const taskResult = tasksState.taskResults.find((tr) => tr.task.target.project === task.projectName);
|
|
23
|
+
if (!taskResult) {
|
|
24
|
+
return task;
|
|
25
|
+
}
|
|
26
|
+
switch (taskResult.status) {
|
|
27
|
+
case 'cache':
|
|
28
|
+
// Free up the task output from memory given we don't need it when a task didn't fail
|
|
29
|
+
clearTaskOutputCacheForTaskId(taskResult.task.id);
|
|
30
|
+
return Object.assign(Object.assign({}, task), { status: 'success', additionalStatusText: 'from cache' });
|
|
31
|
+
case 'success': {
|
|
32
|
+
// Free up the task output from memory given we don't need it when a task didn't fail
|
|
33
|
+
clearTaskOutputCacheForTaskId(taskResult.task.id);
|
|
34
|
+
return Object.assign(Object.assign({}, task), { status: 'success', additionalStatusText: '' });
|
|
35
|
+
}
|
|
36
|
+
case 'failure': {
|
|
37
|
+
const taskTerminalOutput = tasksState.tasksToTerminalOutputs[taskResult.task.id];
|
|
38
|
+
const updated = Object.assign(Object.assign({}, task), { status: 'failure', additionalStatusText: '', output: taskTerminalOutput });
|
|
39
|
+
// Free up the additional copy of the task output from memory
|
|
40
|
+
clearTaskOutputCacheForTaskId(taskResult.task.id);
|
|
41
|
+
return updated;
|
|
42
|
+
}
|
|
43
|
+
default:
|
|
44
|
+
return task;
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
}, [tasksState.taskResults]);
|
|
49
|
+
(0, react_1.useEffect)(() => {
|
|
50
|
+
if (!tasksState.tasks) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
setTaskList((state) => {
|
|
54
|
+
return state.map((task) => {
|
|
55
|
+
const matchedRunningTask = tasksState.tasks.find((t) => t.target.project === task.projectName);
|
|
56
|
+
if (!matchedRunningTask || task.status !== 'pending') {
|
|
57
|
+
return task;
|
|
58
|
+
}
|
|
59
|
+
return Object.assign(Object.assign({}, task), { status: 'loading' });
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
}, [tasksState.tasks]);
|
|
63
|
+
const isEveryTaskSuccessfullyComplete = taskList.every((task) => task.status === 'success');
|
|
64
|
+
const failedTasks = taskList.filter((task) => task.status === 'failure');
|
|
65
|
+
return (React.createElement(React.Fragment, null,
|
|
66
|
+
React.createElement(ink_1.Static, { items: failedTasks }, (task, i) => (React.createElement(ink_1.Box, { key: task.projectName, marginTop: 1, flexDirection: "column", marginX: 2 },
|
|
67
|
+
React.createElement(ink_1.Box, { flexDirection: "column" },
|
|
68
|
+
React.createElement(ink_1.Text, { bold: true, color: "red" }, `> nx run ${task.projectName}:${tasksState.target}`),
|
|
69
|
+
React.createElement(ink_1.Box, { marginLeft: 2 },
|
|
70
|
+
React.createElement(ink_1.Text, null, task.output))),
|
|
71
|
+
i === failedTasks.length - 1 && (React.createElement(ink_1.Box, { marginY: 1 },
|
|
72
|
+
React.createElement(ink_1.Text, { color: "gray", dimColor: true }, '———————————————————————————————————————————————————————————————————————')))))),
|
|
73
|
+
React.createElement(ink_1.Box, { marginTop: 1, marginX: 2 },
|
|
74
|
+
React.createElement(RunManyTitle, { tasksState: tasksState, taskList: taskList })),
|
|
75
|
+
React.createElement(ink_1.Box, { marginBottom: !isEveryTaskSuccessfullyComplete ? 2 : 0 },
|
|
76
|
+
React.createElement(task_list_1.TaskList, { taskList: taskList }))));
|
|
77
|
+
}
|
|
78
|
+
exports.RunMany = RunMany;
|
|
79
|
+
function RunManyTitle({ tasksState, taskList, }) {
|
|
80
|
+
const isEveryTaskComplete = taskList.every((task) => task.status === 'success' || task.status === 'failure');
|
|
81
|
+
if (!isEveryTaskComplete) {
|
|
82
|
+
return (React.createElement(nx_output_row_title_1.NxOutputRowTitle, null,
|
|
83
|
+
React.createElement(ink_1.Text, { dimColor: true, color: "white" },
|
|
84
|
+
"Running target",
|
|
85
|
+
' '),
|
|
86
|
+
React.createElement(ink_1.Text, { bold: true, color: "white" }, tasksState.target),
|
|
87
|
+
React.createElement(ink_1.Text, { dimColor: true, color: "white" },
|
|
88
|
+
' ',
|
|
89
|
+
"for",
|
|
90
|
+
' '),
|
|
91
|
+
React.createElement(ink_1.Text, { bold: true, color: "white" },
|
|
92
|
+
tasksState.projectNames.length,
|
|
93
|
+
" project(s):")));
|
|
94
|
+
}
|
|
95
|
+
const isEveryTaskSuccessfullyComplete = taskList.every((task) => task.status === 'success');
|
|
96
|
+
if (isEveryTaskSuccessfullyComplete) {
|
|
97
|
+
return (React.createElement(nx_output_row_title_1.NxOutputRowTitle, { success: true },
|
|
98
|
+
React.createElement(ink_1.Text, { dimColor: true, color: "green" },
|
|
99
|
+
"Successfully ran",
|
|
100
|
+
' '),
|
|
101
|
+
React.createElement(ink_1.Text, { bold: true, color: "green" }, tasksState.target),
|
|
102
|
+
React.createElement(ink_1.Text, { dimColor: true, color: "green" },
|
|
103
|
+
' ',
|
|
104
|
+
"for",
|
|
105
|
+
' '),
|
|
106
|
+
React.createElement(ink_1.Text, { bold: true, color: "green" },
|
|
107
|
+
tasksState.projectNames.length,
|
|
108
|
+
" project(s)")));
|
|
109
|
+
}
|
|
110
|
+
return (React.createElement(nx_output_row_title_1.NxOutputRowTitle, null,
|
|
111
|
+
React.createElement(ink_1.Text, { dimColor: true, color: "white" },
|
|
112
|
+
"Ran target",
|
|
113
|
+
' '),
|
|
114
|
+
React.createElement(ink_1.Text, { bold: true, color: "white" }, tasksState.target),
|
|
115
|
+
React.createElement(ink_1.Text, { dimColor: true, color: "white" },
|
|
116
|
+
' ',
|
|
117
|
+
"for",
|
|
118
|
+
' '),
|
|
119
|
+
React.createElement(ink_1.Text, { bold: true, color: "white" },
|
|
120
|
+
tasksState.projectNames.length,
|
|
121
|
+
" project(s)")));
|
|
122
|
+
}
|
|
123
|
+
//# sourceMappingURL=run-many.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/tasks-runner/run-command/components/run-many.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TaskList = void 0;
|
|
4
|
+
const ink_1 = require("ink");
|
|
5
|
+
const React = require("react");
|
|
6
|
+
const task_row_1 = require("./task-row");
|
|
7
|
+
function TaskList({ taskList }) {
|
|
8
|
+
const pendingTasks = taskList.filter((task) => task.status === 'pending');
|
|
9
|
+
const runningTasks = taskList.filter((task) => task.status === 'loading');
|
|
10
|
+
const successfulTasks = taskList.filter((task) => task.status === 'success');
|
|
11
|
+
const locallyCachedTasks = successfulTasks.filter((task) => task.additionalStatusText === 'from local cache');
|
|
12
|
+
const cloudCachedTasks = successfulTasks.filter((task) => task.additionalStatusText === 'from cloud cache');
|
|
13
|
+
const failedTasks = taskList.filter((task) => task.status === 'failure');
|
|
14
|
+
const numCompletedTasks = successfulTasks.length + failedTasks.length;
|
|
15
|
+
return (React.createElement(ink_1.Box, { paddingLeft: 5, flexDirection: "column" },
|
|
16
|
+
runningTasks.length > 0 && (React.createElement(ink_1.Box, { marginY: 1 },
|
|
17
|
+
React.createElement(ink_1.Text, { color: "grey", dimColor: false }, `Executing ${runningTasks.length}/${pendingTasks.length + runningTasks.length} remaining tasks in parallel...`))),
|
|
18
|
+
React.createElement(ink_1.Box, { flexDirection: "column", marginBottom: 1 }, runningTasks.map((task) => (React.createElement(task_row_1.TaskRow, { key: task.projectName, label: task.projectName, status: task.status, additionalStatusText: task.additionalStatusText, muted: false, spinnerType: "dots" })))),
|
|
19
|
+
React.createElement(ink_1.Box, { flexDirection: "row" },
|
|
20
|
+
successfulTasks.length !== taskList.length && (React.createElement(ink_1.Box, null, successfulTasks.length > 0 && (React.createElement(task_row_1.TaskRow, { key: "successful", label: `${successfulTasks.length}/${numCompletedTasks} succeeded`, status: "success", additionalStatusText: "", muted: failedTasks.length > 0, spinnerType: "dots" })))),
|
|
21
|
+
failedTasks.length !== taskList.length && (React.createElement(ink_1.Box, { marginLeft: successfulTasks.length > 0 ? 4 : 0 }, failedTasks.length > 0 && (React.createElement(task_row_1.TaskRow, { key: "failed", label: `${failedTasks.length}/${numCompletedTasks} failed (see output above)`, status: "failure", additionalStatusText: "", muted: false, spinnerType: "dots" }))))),
|
|
22
|
+
pendingTasks.length === 0 &&
|
|
23
|
+
successfulTasks.length === taskList.length &&
|
|
24
|
+
(locallyCachedTasks.length > 0 || cloudCachedTasks.length > 0) && (React.createElement(ink_1.Box, { marginTop: 2 },
|
|
25
|
+
locallyCachedTasks.length > 0 && (React.createElement(task_row_1.TaskRow, { key: "local-cache", label: `${locallyCachedTasks.length} results retrieved from local cache`, status: "cache", additionalStatusText: "", muted: false, spinnerType: "dots" })),
|
|
26
|
+
cloudCachedTasks.length > 0 && (React.createElement(task_row_1.TaskRow, { key: "remote-cache", label: `${cloudCachedTasks.length} results retrieved from cloud cache`, status: "remote-cache", additionalStatusText: "", muted: false, spinnerType: "dots" }))))));
|
|
27
|
+
}
|
|
28
|
+
exports.TaskList = TaskList;
|
|
29
|
+
//# sourceMappingURL=task-list.js.map
|