@nrwl/workspace 13.3.0-beta.22 → 13.3.0-beta.23
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 +9 -5
- package/src/core/project-graph/daemon/client/client.js +23 -1
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +21 -11
- package/src/core/project-graph/daemon/server/server.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} +34 -18
- 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/tasks-runner.d.ts +1 -1
- package/src/tasks-runner/tasks-runner.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/utils/versions.js +1 -1
- package/src/tasks-runner/run-command.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "13.3.0-beta.
|
|
3
|
+
"version": "13.3.0-beta.23",
|
|
4
4
|
"description": "Smart, Extensible Build Framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -66,11 +66,15 @@
|
|
|
66
66
|
"cosmiconfig": "^4.0.0",
|
|
67
67
|
"fs-extra": "^9.1.0",
|
|
68
68
|
"dotenv": "~10.0.0",
|
|
69
|
+
"figures": "3.2.0",
|
|
69
70
|
"glob": "7.1.4",
|
|
70
71
|
"ignore": "^5.0.4",
|
|
72
|
+
"ink": "^3.2.0",
|
|
73
|
+
"ink-spinner": "^4.0.3",
|
|
71
74
|
"npm-run-all": "^4.1.5",
|
|
72
75
|
"npm-run-path": "^4.0.1",
|
|
73
76
|
"open": "^7.4.2",
|
|
77
|
+
"react": "17.0.2",
|
|
74
78
|
"rxjs": "^6.5.4",
|
|
75
79
|
"semver": "7.3.4",
|
|
76
80
|
"strip-ansi": "6.0.0",
|
|
@@ -82,10 +86,10 @@
|
|
|
82
86
|
"minimatch": "3.0.4",
|
|
83
87
|
"enquirer": "~2.3.6",
|
|
84
88
|
"tslib": "^2.3.0",
|
|
85
|
-
"@nrwl/cli": "13.3.0-beta.
|
|
86
|
-
"@nrwl/devkit": "13.3.0-beta.
|
|
87
|
-
"@nrwl/jest": "13.3.0-beta.
|
|
88
|
-
"@nrwl/linter": "13.3.0-beta.
|
|
89
|
+
"@nrwl/cli": "13.3.0-beta.23",
|
|
90
|
+
"@nrwl/devkit": "13.3.0-beta.23",
|
|
91
|
+
"@nrwl/jest": "13.3.0-beta.23",
|
|
92
|
+
"@nrwl/linter": "13.3.0-beta.23"
|
|
89
93
|
},
|
|
90
94
|
"nx-migrations": {
|
|
91
95
|
"migrations": "./migrations.json"
|
|
@@ -10,6 +10,7 @@ const perf_hooks_1 = require("perf_hooks");
|
|
|
10
10
|
const cache_1 = require("../cache");
|
|
11
11
|
const socket_utils_1 = require("../socket-utils");
|
|
12
12
|
const tmp_dir_1 = require("../tmp-dir");
|
|
13
|
+
const output_1 = require("../../../../utilities/output");
|
|
13
14
|
function startInBackground() {
|
|
14
15
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
15
16
|
yield (0, cache_1.safelyCleanUpExistingProcess)();
|
|
@@ -31,13 +32,34 @@ function startInBackground() {
|
|
|
31
32
|
/**
|
|
32
33
|
* Ensure the server is actually available to connect to via IPC before resolving
|
|
33
34
|
*/
|
|
35
|
+
let attempts = 0;
|
|
34
36
|
return new Promise((resolve) => {
|
|
35
37
|
const id = setInterval(() => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
36
38
|
if (yield isServerAvailable()) {
|
|
37
39
|
clearInterval(id);
|
|
38
40
|
resolve(backgroundProcess.pid);
|
|
39
41
|
}
|
|
40
|
-
|
|
42
|
+
else if (attempts > 200) {
|
|
43
|
+
// daemon fails to start, the process probably exited
|
|
44
|
+
// we print the logs and exit the client
|
|
45
|
+
let log = (0, fs_1.readFileSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE).toString().split('\n');
|
|
46
|
+
if (log.length > 20) {
|
|
47
|
+
log = log.slice(log.length - 20);
|
|
48
|
+
}
|
|
49
|
+
output_1.output.error({
|
|
50
|
+
title: 'Failed to start the Nx Daemon process.',
|
|
51
|
+
bodyLines: [
|
|
52
|
+
...log,
|
|
53
|
+
'\n',
|
|
54
|
+
`More information: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}`,
|
|
55
|
+
],
|
|
56
|
+
});
|
|
57
|
+
process.exit(1);
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
attempts++;
|
|
61
|
+
}
|
|
62
|
+
}), 10);
|
|
41
63
|
});
|
|
42
64
|
}
|
|
43
65
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":";;;;AAAA,yCAAoD;AACpD,iDAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -179,17 +179,27 @@ function startServer() {
|
|
|
179
179
|
if (!socket_utils_1.isWindows) {
|
|
180
180
|
(0, socket_utils_1.killSocketOrPath)();
|
|
181
181
|
}
|
|
182
|
-
return new Promise((resolve) => {
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
182
|
+
return new Promise((resolve, reject) => {
|
|
183
|
+
try {
|
|
184
|
+
server.listen(socket_utils_1.FULL_OS_SOCKET_PATH, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
185
|
+
try {
|
|
186
|
+
logger_1.serverLogger.log(`Started listening on: ${socket_utils_1.FULL_OS_SOCKET_PATH}`);
|
|
187
|
+
// this triggers the storage of the lock file hash
|
|
188
|
+
lockFileChanged();
|
|
189
|
+
if (!watcherSubscription) {
|
|
190
|
+
watcherSubscription = yield (0, watcher_1.subscribeToWorkspaceChanges)(handleWorkspaceChanges);
|
|
191
|
+
logger_1.serverLogger.watcherLog(`Subscribed to changes within: ${app_root_1.appRootPath}`);
|
|
192
|
+
}
|
|
193
|
+
return resolve(server);
|
|
194
|
+
}
|
|
195
|
+
catch (err) {
|
|
196
|
+
reject(err);
|
|
197
|
+
}
|
|
198
|
+
}));
|
|
199
|
+
}
|
|
200
|
+
catch (err) {
|
|
201
|
+
reject(err);
|
|
202
|
+
}
|
|
193
203
|
});
|
|
194
204
|
});
|
|
195
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":";;;;AACA,2DAA2D;AAC3D,6BAAmD;AACnD,+BAA4B;AAC5B,2CAA8D;AAC9D,kDAKyB;AACzB,qCAAwC;AACxC,qDAI0B;AAC1B,uCAKmB;AACnB,uGAGmD;AACnD,2BAA0C;AAC1C,+DAA2D;AAE3D,SAAS,eAAe,CAAC,MAAc,EAAE,OAAe;IACtD,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACzB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE;YACzB,gGAAgG;YAChG,MAAM,CAAC,GAAG,EAAE,CAAC;YACb,qBAAY,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;YAChD,GAAG,CAAC,IAAI,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,IAAI,mBAAoD,CAAC;AACzD,IAAI,mBAAoD,CAAC;AACzD,IAAI,YAA+B,CAAC;AAEpC,SAAe,uBAAuB,CACpC,MAAc,EACd,WAAmB,EACnB,KAAY;;QAEZ,8CAA8C;QAC9C,qBAAY,CAAC,UAAU,CACrB,yCAAyC,EACzC,WAAW,EACX,KAAK,CAAC,OAAO,CACd,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAErB,KAAK,CAAC,OAAO,GAAG,GAAG,KAAK,CAAC,OAAO,uKAAuK,CAAC;QAExM,MAAM,eAAe,CAAC,MAAM,EAAE,IAAA,8BAAe,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;CAAA;AAED,MAAM,MAAM,GAAG,IAAA,kBAAY,EAAC,CAAO,MAAM,EAAE,EAAE;IAC3C,IAAA,uCAAsB,EAAC,uBAAuB,CAAC,CAAC;IAChD,IAAI,CAAC,mBAAmB,EAAE;QACxB,mBAAmB,GAAG,IAAI,gCAAmB,CAAC,CAAC,IAAI,EAAE,EAAE;YACrD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;YACnC,qBAAY,CAAC,GAAG,CAAC,mBAAmB,KAAK,CAAC,IAAI,GAAG,EAAE,GAAG,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,mBAAmB,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;KAC3E;IAED,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAO,IAAI,EAAE,EAAE;QAC/B,IAAI,YAAY,EAAE;YAChB,MAAM,uBAAuB,CAC3B,MAAM,EACN,wCAAwC,sBAAW,IAAI,EACvD,YAAY,CACb,CAAC;SACH;QAED,IAAA,uCAAsB,EAAC,uBAAuB,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,OAAO,KAAK,+BAA+B,EAAE;YAC/C,MAAM,uBAAuB,CAC3B,MAAM,EACN,iCAAiC,EACjC,IAAI,KAAK,CAAC,8CAA8C,OAAO,EAAE,CAAC,CACnE,CAAC;SACH;QAED,wBAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACtC,qBAAY,CAAC,UAAU,CAAC,2CAA2C,CAAC,CAAC;QAErE,MAAM,MAAM,GAAG,MAAM,IAAA,gFAAsC,GAAE,CAAC;QAC9D,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,MAAM,uBAAuB,CAC3B,MAAM,EACN,gDAAgD,EAChD,MAAM,CAAC,KAAK,CACb,CAAC;SACH;QAED,MAAM,gBAAgB,GAAG,IAAA,8BAAe,EACtC,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,sBAAsB,CAC9B,CAAC;QACF,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,uBAAuB,CAC3B,MAAM,EACN,8CAA8C,EAC9C,IAAI,KAAK,CACP,kEAAkE,CACnE,CACF,CAAC;SACH;QAED,wBAAW,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QACnD,wBAAW,CAAC,OAAO,CACjB,kDAAkD,EAClD,mBAAmB,EACnB,gCAAgC,CACjC,CAAC;QAEF,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,EAAE;YAClC,wBAAW,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;YAC/D,wBAAW,CAAC,OAAO,CACjB,+BAA+B,EAC/B,gCAAgC,EAChC,4CAA4C,CAC7C,CAAC;YACF,gGAAgG;YAChG,MAAM,CAAC,GAAG,EAAE,CAAC;YACb,wBAAW,CAAC,OAAO,CACjB,2BAA2B,EAC3B,mBAAmB,EACnB,4CAA4C,CAC7C,CAAC;YACF,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CACpC,MAAM,CAAC,sBAAsB,EAC7B,OAAO,CACR,CAAC;YACF,qBAAY,CAAC,UAAU,CACrB,gCAAgC,YAAY,qBAAqB,CAClE,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAA,CAAC,CAAC;AAEH,SAAS,uBAAuB;IAC9B,IAAA,+CAA8B,EAAC;QAC7B,MAAM;QACN,mBAAmB;QACnB,MAAM,EAAE,GAAG,6CAA4B,kBAAkB;KAC1D,CAAC,CAAC;AACL,CAAC;AAED,OAAO;KACJ,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CACjB,IAAA,+CAA8B,EAAC;IAC7B,MAAM;IACN,mBAAmB;IACnB,MAAM,EAAE,yBAAyB;CAClC,CAAC,CACH;KACA,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAClB,IAAA,+CAA8B,EAAC;IAC7B,MAAM;IACN,mBAAmB;IACnB,MAAM,EAAE,0BAA0B;CACnC,CAAC,CACH;KACA,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CACjB,IAAA,+CAA8B,EAAC;IAC7B,MAAM;IACN,mBAAmB;IACnB,MAAM,EAAE,yBAAyB;CAClC,CAAC,CACH,CAAC;AAEJ,IAAI,gBAAoC,CAAC;AAEzC,SAAS,eAAe;IACtB,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG;QACjB,IAAA,WAAI,EAAC,sBAAW,EAAE,mBAAmB,CAAC;QACtC,IAAA,WAAI,EAAC,sBAAW,EAAE,WAAW,CAAC;QAC9B,IAAA,WAAI,EAAC,sBAAW,EAAE,gBAAgB,CAAC;KACpC;SACE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC;SAClC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,gBAAgB,IAAI,OAAO,IAAI,gBAAgB,EAAE;QACnD,gBAAgB,GAAG,OAAO,CAAC;QAC3B,OAAO,IAAI,CAAC;KACb;SAAM;QACL,gBAAgB,GAAG,OAAO,CAAC;QAC3B,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,sBAAsB,GAAwC,CAClE,GAAG,EACH,YAAY,EACZ,EAAE;IACF,IAAI,YAAY,EAAE;QAChB,qBAAY,CAAC,UAAU,CACrB,iFAAiF,CAClF,CAAC;QACF,OAAO;KACR;IAED,IAAI;QACF,IAAA,uCAAsB,EAAC,uBAAuB,CAAC,CAAC;QAEhD,IAAI,eAAe,EAAE,EAAE;YACrB,MAAM,IAAA,+CAA8B,EAAC;gBACnC,MAAM;gBACN,mBAAmB;gBACnB,MAAM,EAAE,mBAAmB;aAC5B,CAAC,CAAC;YACH,OAAO;SACR;QAED,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YAChD,qBAAY,CAAC,UAAU,CAAC,0BAA0B,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACjE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,YAAY,GAAG,GAAG,CAAC;YACnB,OAAO;SACR;QAED,qBAAY,CAAC,UAAU,CAAC,IAAA,yCAA+B,EAAC,YAAY,CAAC,CAAC,CAAC;QAEvE,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;YAChC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC3B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC/B;iBAAM;gBACL,IAAI;oBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,IAAA,WAAI,EAAC,sBAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;oBAClD,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;wBACpB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;qBAC9B;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,+DAA+D;iBAChE;aACF;SACF;QACD,IAAA,mEAAyB,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;KACtD;IAAC,OAAO,GAAG,EAAE;QACZ,qBAAY,CAAC,UAAU,CAAC,kBAAkB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACzD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,YAAY,GAAG,GAAG,CAAC;KACpB;AACH,CAAC,CAAA,CAAC;AAEF,SAAsB,WAAW;;QAC/B,8FAA8F;QAC9F,IAAI,CAAC,wBAAS,EAAE;YACd,IAAA,+BAAgB,GAAE,CAAC;SACpB;QACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI;gBACF,MAAM,CAAC,MAAM,CAAC,kCAAmB,EAAE,GAAS,EAAE;oBAC5C,IAAI;wBACF,qBAAY,CAAC,GAAG,CAAC,yBAAyB,kCAAmB,EAAE,CAAC,CAAC;wBACjE,kDAAkD;wBAClD,eAAe,EAAE,CAAC;wBAElB,IAAI,CAAC,mBAAmB,EAAE;4BACxB,mBAAmB,GAAG,MAAM,IAAA,qCAA2B,EACrD,sBAAsB,CACvB,CAAC;4BACF,qBAAY,CAAC,UAAU,CACrB,iCAAiC,sBAAW,EAAE,CAC/C,CAAC;yBACH;wBACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;qBACxB;oBAAC,OAAO,GAAG,EAAE;wBACZ,MAAM,CAAC,GAAG,CAAC,CAAC;qBACb;gBACH,CAAC,CAAA,CAAC,CAAC;aACJ;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AA9BD,kCA8BC;AAED,SAAsB,UAAU;;QAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnB,IAAI,GAAG,EAAE;oBACP;;;;uBAIG;oBACH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE;wBACpD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;qBACpB;iBACF;gBAED,IAAA,+BAAgB,GAAE,CAAC;gBACnB,OAAO,OAAO,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAlBD,gCAkBC"}
|
|
@@ -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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-list.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/tasks-runner/run-command/components/task-list.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
2
|
+
import type { SpinnerName } from 'cli-spinners';
|
|
3
|
+
import type { ExtendedTaskStatus } from '../../life-cycle';
|
|
4
|
+
interface TaskRowProps {
|
|
5
|
+
muted: boolean;
|
|
6
|
+
status: ExtendedTaskStatus;
|
|
7
|
+
additionalStatusText: string;
|
|
8
|
+
label: string;
|
|
9
|
+
spinnerType: SpinnerName;
|
|
10
|
+
}
|
|
11
|
+
export declare function TaskRow({ label, status, muted, additionalStatusText, spinnerType, }: TaskRowProps): JSX.Element;
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TaskRow = void 0;
|
|
4
|
+
const figures = require("figures");
|
|
5
|
+
const ink_1 = require("ink");
|
|
6
|
+
const ink_spinner_1 = require("ink-spinner");
|
|
7
|
+
const React = require("react");
|
|
8
|
+
function TaskRow({ label, status, muted, additionalStatusText, spinnerType, }) {
|
|
9
|
+
let icon = status === 'loading' ? (React.createElement(ink_1.Text, { color: "gray" },
|
|
10
|
+
React.createElement(ink_spinner_1.default, { type: spinnerType }))) : (getSymbol(status, muted));
|
|
11
|
+
const isCacheStatus = status === 'cache' || status === 'remote-cache';
|
|
12
|
+
return (React.createElement(ink_1.Box, { flexDirection: "column" },
|
|
13
|
+
React.createElement(ink_1.Box, null,
|
|
14
|
+
React.createElement(ink_1.Box, { marginRight: isCacheStatus ? 0 : 2 },
|
|
15
|
+
React.createElement(ink_1.Text, null, icon)),
|
|
16
|
+
React.createElement(ink_1.Text, { color: status === 'success'
|
|
17
|
+
? muted === true
|
|
18
|
+
? 'gray'
|
|
19
|
+
: 'green'
|
|
20
|
+
: status === 'failure'
|
|
21
|
+
? 'red'
|
|
22
|
+
: isCacheStatus
|
|
23
|
+
? 'cyan'
|
|
24
|
+
: 'white' },
|
|
25
|
+
' ',
|
|
26
|
+
label),
|
|
27
|
+
additionalStatusText ? (React.createElement(ink_1.Box, { marginLeft: 1 },
|
|
28
|
+
React.createElement(ink_1.Text, { dimColor: true },
|
|
29
|
+
"[",
|
|
30
|
+
additionalStatusText,
|
|
31
|
+
"]"))) : undefined)));
|
|
32
|
+
}
|
|
33
|
+
exports.TaskRow = TaskRow;
|
|
34
|
+
function getSymbol(status, muted) {
|
|
35
|
+
if (status === 'failure') {
|
|
36
|
+
return React.createElement(ink_1.Text, { color: "red" }, figures.cross);
|
|
37
|
+
}
|
|
38
|
+
if (status === 'success') {
|
|
39
|
+
return (React.createElement(ink_1.Text, { color: muted === true ? 'gray' : 'green' }, figures.tick));
|
|
40
|
+
}
|
|
41
|
+
if (status === 'pending') {
|
|
42
|
+
return React.createElement(ink_1.Text, { color: "gray" }, figures.info);
|
|
43
|
+
}
|
|
44
|
+
if (status === 'cache') {
|
|
45
|
+
return React.createElement(ink_1.Text, { color: "gray" }, "\uD83D\uDCC2");
|
|
46
|
+
}
|
|
47
|
+
if (status === 'remote-cache') {
|
|
48
|
+
return React.createElement(ink_1.Text, { color: "gray" }, "\u2601\uFE0F");
|
|
49
|
+
}
|
|
50
|
+
return ' ';
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=task-row.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-row.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/tasks-runner/run-command/components/task-row.tsx"],"names":[],"mappings":";;;AACA,mCAAmC;AACnC,6BAAgC;AAChC,6CAAkC;AAClC,+BAA+B;AAW/B,SAAgB,OAAO,CAAC,EACtB,KAAK,EACL,MAAM,EACN,KAAK,EACL,oBAAoB,EACpB,WAAW,GACE;IACb,IAAI,IAAI,GACN,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CACrB,oBAAC,UAAI,IAAC,KAAK,EAAC,MAAM;QAChB,oBAAC,qBAAO,IAAC,IAAI,EAAE,WAAW,GAAI,CACzB,CACR,CAAC,CAAC,CAAC,CACF,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CACzB,CAAC;IACJ,MAAM,aAAa,GAAG,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,cAAc,CAAC;IAEtE,OAAO,CACL,oBAAC,SAAG,IAAC,aAAa,EAAC,QAAQ;QACzB,oBAAC,SAAG;YACF,oBAAC,SAAG,IAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACrC,oBAAC,UAAI,QAAE,IAAI,CAAQ,CACf;YACN,oBAAC,UAAI,IACH,KAAK,EACH,MAAM,KAAK,SAAS;oBAClB,CAAC,CAAC,KAAK,KAAK,IAAI;wBACd,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,OAAO;oBACX,CAAC,CAAC,MAAM,KAAK,SAAS;wBACtB,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,aAAa;4BACf,CAAC,CAAC,MAAM;4BACR,CAAC,CAAC,OAAO;gBAGZ,GAAG;gBACH,KAAK,CACD;YACN,oBAAoB,CAAC,CAAC,CAAC,CACtB,oBAAC,SAAG,IAAC,UAAU,EAAE,CAAC;gBAChB,oBAAC,UAAI,IAAC,QAAQ;;oBAAG,oBAAoB;wBAAS,CAC1C,CACP,CAAC,CAAC,CAAC,SAAS,CACT,CACF,CACP,CAAC;AACJ,CAAC;AA/CD,0BA+CC;AAED,SAAS,SAAS,CAAC,MAA0B,EAAE,KAAc;IAC3D,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,OAAO,oBAAC,UAAI,IAAC,KAAK,EAAC,KAAK,IAAE,OAAO,CAAC,KAAK,CAAQ,CAAC;KACjD;IAED,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,OAAO,CACL,oBAAC,UAAI,IAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAAG,OAAO,CAAC,IAAI,CAAQ,CACtE,CAAC;KACH;IAED,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,OAAO,oBAAC,UAAI,IAAC,KAAK,EAAC,MAAM,IAAE,OAAO,CAAC,IAAI,CAAQ,CAAC;KACjD;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,oBAAC,UAAI,IAAC,KAAK,EAAC,MAAM,mBAAU,CAAC;KACrC;IAED,IAAI,MAAM,KAAK,cAAc,EAAE;QAC7B,OAAO,oBAAC,UAAI,IAAC,KAAK,EAAC,MAAM,mBAAU,CAAC;KACrC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
import { TasksRunner } from './tasks-runner';
|
|
2
|
-
import { ReporterArgs } from './reporter';
|
|
3
|
-
import * as yargs from 'yargs';
|
|
4
1
|
import type { NxJsonConfiguration, ProjectGraph, ProjectGraphNode, TargetDependencyConfig, Task } from '@nrwl/devkit';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
|
|
8
|
-
export declare function runCommand
|
|
2
|
+
import { NxArgs } from '../../command-line/utils';
|
|
3
|
+
import { Environment } from '../../core/shared-interfaces';
|
|
4
|
+
import { TasksRunner } from '../tasks-runner';
|
|
5
|
+
export declare function runCommand(projectsToRun: ProjectGraphNode[], projectGraph: ProjectGraph, { nxJson, workspaceResults }: Environment, nxArgs: NxArgs, overrides: any, terminalOutputStrategy: 'default' | 'hide-cached-output' | 'run-one', initiatingProject: string | null): Promise<void>;
|
|
9
6
|
interface TaskParams {
|
|
10
7
|
project: ProjectGraphNode;
|
|
11
8
|
target: string;
|
|
@@ -2,19 +2,23 @@
|
|
|
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 path_1 = require("path");
|
|
6
|
-
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
7
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
8
6
|
const logger_1 = require("@nrwl/tao/src/shared/logger");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const
|
|
7
|
+
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
8
|
+
const ink_1 = require("ink");
|
|
9
|
+
const path_1 = require("path");
|
|
10
|
+
const react_1 = require("react");
|
|
11
|
+
const fileutils_1 = require("../../utilities/fileutils");
|
|
12
|
+
const output_1 = require("../../utilities/output");
|
|
13
|
+
const project_graph_utils_1 = require("../../utilities/project-graph-utils");
|
|
14
|
+
const empty_terminal_output_life_cycle_1 = require("../empty-terminal-output-life-cycle");
|
|
15
|
+
const life_cycle_1 = require("../life-cycle");
|
|
16
|
+
const run_many_terminal_output_life_cycle_1 = require("../run-many-terminal-output-life-cycle");
|
|
17
|
+
const run_one_terminal_output_life_cycle_1 = require("../run-one-terminal-output-life-cycle");
|
|
18
|
+
const task_timings_life_cycle_1 = require("../task-timings-life-cycle");
|
|
19
|
+
const utils_1 = require("../utils");
|
|
20
|
+
const run_command_1 = require("./components/run-command");
|
|
21
|
+
const ink_run_many_life_cycle_1 = require("./ink-run-many-life-cycle");
|
|
18
22
|
function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, projectsToRun, tasks, nxArgs, overrides) {
|
|
19
23
|
if (terminalOutputStrategy === 'run-one') {
|
|
20
24
|
return new run_one_terminal_output_life_cycle_1.RunOneTerminalOutputLifeCycle(initiatingProject, projectsToRun.map((t) => t.name), tasks, nxArgs);
|
|
@@ -23,6 +27,9 @@ function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, p
|
|
|
23
27
|
return new empty_terminal_output_life_cycle_1.EmptyTerminalOutputLifeCycle();
|
|
24
28
|
}
|
|
25
29
|
else {
|
|
30
|
+
if (process.env.NX_TASKS_RUNNER_USE_INK === 'true') {
|
|
31
|
+
return new ink_run_many_life_cycle_1.InkRunManyLifeCycle(projectsToRun.map((t) => t.name), tasks, nxArgs);
|
|
32
|
+
}
|
|
26
33
|
return new run_many_terminal_output_life_cycle_1.RunManyTerminalOutputLifeCycle(projectsToRun.map((t) => t.name), tasks, nxArgs, overrides);
|
|
27
34
|
}
|
|
28
35
|
}
|
|
@@ -42,13 +49,19 @@ function runCommand(projectsToRun, projectGraph, { nxJson, workspaceResults }, n
|
|
|
42
49
|
configuration: nxArgs.configuration,
|
|
43
50
|
overrides,
|
|
44
51
|
}, projectGraph, initiatingProject, defaultDependencyConfigs);
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
];
|
|
52
|
+
const terminalOutputLifeCycle = getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, projectsToRun, tasks, nxArgs, overrides);
|
|
53
|
+
const lifeCycles = [terminalOutputLifeCycle];
|
|
48
54
|
if (process.env.NX_PERF_LOGGING) {
|
|
49
55
|
lifeCycles.push(new task_timings_life_cycle_1.TaskTimingsLifeCycle());
|
|
50
56
|
}
|
|
51
57
|
const lifeCycle = new life_cycle_1.CompositeLifeCycle(lifeCycles);
|
|
58
|
+
let inkWaitUntilExit;
|
|
59
|
+
if (process.env.NX_TASKS_RUNNER_USE_INK === 'true') {
|
|
60
|
+
const { waitUntilExit } = (0, ink_1.render)((0, react_1.createElement)(run_command_1.RunCommandComponent, {
|
|
61
|
+
lifeCycle: terminalOutputLifeCycle,
|
|
62
|
+
}));
|
|
63
|
+
inkWaitUntilExit = waitUntilExit;
|
|
64
|
+
}
|
|
52
65
|
const promiseOrObservable = tasksRunner(tasks, Object.assign(Object.assign({}, runnerOptions), { lifeCycle }), {
|
|
53
66
|
initiatingProject,
|
|
54
67
|
target: nxArgs.target,
|
|
@@ -63,6 +76,9 @@ function runCommand(projectsToRun, projectGraph, { nxJson, workspaceResults }, n
|
|
|
63
76
|
// simply await the promise
|
|
64
77
|
anyFailures = yield anyFailuresInPromise(promiseOrObservable);
|
|
65
78
|
}
|
|
79
|
+
if (inkWaitUntilExit) {
|
|
80
|
+
yield inkWaitUntilExit();
|
|
81
|
+
}
|
|
66
82
|
// fix for https://github.com/nrwl/nx/issues/1666
|
|
67
83
|
if (process.stdin['unref'])
|
|
68
84
|
process.stdin.unref();
|
|
@@ -216,7 +232,7 @@ function getRunner(nxArgs, nxJson) {
|
|
|
216
232
|
let runner = nxArgs.runner;
|
|
217
233
|
//TODO: vsavkin remove in Nx 12
|
|
218
234
|
if (!nxJson.tasksRunnerOptions) {
|
|
219
|
-
const t = require('
|
|
235
|
+
const t = require('../default-tasks-runner');
|
|
220
236
|
return {
|
|
221
237
|
tasksRunner: t.defaultTasksRunner,
|
|
222
238
|
runnerOptions: nxArgs,
|
|
@@ -224,7 +240,7 @@ function getRunner(nxArgs, nxJson) {
|
|
|
224
240
|
}
|
|
225
241
|
//TODO: vsavkin remove in Nx 12
|
|
226
242
|
if (!runner && !nxJson.tasksRunnerOptions.default) {
|
|
227
|
-
const t = require('
|
|
243
|
+
const t = require('../default-tasks-runner');
|
|
228
244
|
return {
|
|
229
245
|
tasksRunner: t.defaultTasksRunner,
|
|
230
246
|
runnerOptions: nxArgs,
|
|
@@ -245,7 +261,7 @@ function getRunner(nxArgs, nxJson) {
|
|
|
245
261
|
}
|
|
246
262
|
}
|
|
247
263
|
else {
|
|
248
|
-
tasksRunner = require('
|
|
264
|
+
tasksRunner = require('../default-tasks-runner').defaultTasksRunner;
|
|
249
265
|
}
|
|
250
266
|
return {
|
|
251
267
|
tasksRunner,
|
|
@@ -293,4 +309,4 @@ function ensureTargetDependenciesBackwardCompatibility(nxJson, nxArgs) {
|
|
|
293
309
|
}
|
|
294
310
|
}
|
|
295
311
|
}
|
|
296
|
-
//# sourceMappingURL=
|
|
312
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/run-command/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { Task } from '@nrwl/devkit';
|
|
2
|
+
import { TaskCacheStatus } from '../../utilities/output';
|
|
3
|
+
import { LifeCycle, TaskResult } from '../life-cycle';
|
|
4
|
+
export interface InkRunManyLifeCycleOnStartCommandParams {
|
|
5
|
+
projectNames: string[];
|
|
6
|
+
tasks: Task[];
|
|
7
|
+
args: {
|
|
8
|
+
target?: string;
|
|
9
|
+
configuration?: string;
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
export declare class InkRunManyLifeCycle implements LifeCycle {
|
|
13
|
+
private readonly projectNames;
|
|
14
|
+
private readonly tasks;
|
|
15
|
+
private readonly args;
|
|
16
|
+
callbacks: {
|
|
17
|
+
onStartCommand: (params: InkRunManyLifeCycleOnStartCommandParams) => void;
|
|
18
|
+
onStartTasks: (tasks: Task[]) => void;
|
|
19
|
+
onEndTasks: (taskResults: TaskResult[]) => void;
|
|
20
|
+
onPrintTaskTerminalOutput: (task: Task, cacheStatus: TaskCacheStatus, output: string) => void;
|
|
21
|
+
};
|
|
22
|
+
constructor(projectNames: string[], tasks: Task[], args: {
|
|
23
|
+
target?: string;
|
|
24
|
+
configuration?: string;
|
|
25
|
+
});
|
|
26
|
+
startCommand(): void;
|
|
27
|
+
startTasks(tasks: any): void;
|
|
28
|
+
endTasks(taskResults: TaskResult[]): void;
|
|
29
|
+
printTaskTerminalOutput(task: Task, cacheStatus: TaskCacheStatus, output: string): void;
|
|
30
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.InkRunManyLifeCycle = void 0;
|
|
4
|
+
class InkRunManyLifeCycle {
|
|
5
|
+
constructor(projectNames, tasks, args) {
|
|
6
|
+
this.projectNames = projectNames;
|
|
7
|
+
this.tasks = tasks;
|
|
8
|
+
this.args = args;
|
|
9
|
+
this.callbacks = {
|
|
10
|
+
onStartCommand: () => { },
|
|
11
|
+
onStartTasks: () => { },
|
|
12
|
+
onEndTasks: () => { },
|
|
13
|
+
onPrintTaskTerminalOutput: () => { },
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
startCommand() {
|
|
17
|
+
this.callbacks.onStartCommand({
|
|
18
|
+
projectNames: this.projectNames,
|
|
19
|
+
tasks: this.tasks,
|
|
20
|
+
args: this.args,
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
startTasks(tasks) {
|
|
24
|
+
this.callbacks.onStartTasks(tasks);
|
|
25
|
+
}
|
|
26
|
+
endTasks(taskResults) {
|
|
27
|
+
this.callbacks.onEndTasks(taskResults);
|
|
28
|
+
}
|
|
29
|
+
printTaskTerminalOutput(task, cacheStatus, output) {
|
|
30
|
+
this.callbacks.onPrintTaskTerminalOutput(task, cacheStatus, output);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
exports.InkRunManyLifeCycle = InkRunManyLifeCycle;
|
|
34
|
+
//# sourceMappingURL=ink-run-many-life-cycle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ink-run-many-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/run-command/ink-run-many-life-cycle.ts"],"names":[],"mappings":";;;AAUA,MAAa,mBAAmB;IAiB9B,YACmB,YAAsB,EACtB,KAAa,EACb,IAGhB;QALgB,iBAAY,GAAZ,YAAY,CAAU;QACtB,UAAK,GAAL,KAAK,CAAQ;QACb,SAAI,GAAJ,IAAI,CAGpB;QAtBH,cAAS,GASL;YACF,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;YACxB,YAAY,EAAE,GAAG,EAAE,GAAE,CAAC;YACtB,UAAU,EAAE,GAAG,EAAE,GAAE,CAAC;YACpB,yBAAyB,EAAE,GAAG,EAAE,GAAE,CAAC;SACpC,CAAC;IASC,CAAC;IAEJ,YAAY;QACV,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;YAC5B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,KAAK;QACd,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,QAAQ,CAAC,WAAyB;QAChC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAED,uBAAuB,CACrB,IAAU,EACV,WAA4B,EAC5B,MAAc;QAEd,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;CACF;AAjDD,kDAiDC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Observable } from 'rxjs';
|
|
2
2
|
import type { NxJsonConfiguration, ProjectGraph, Task } from '@nrwl/devkit';
|
|
3
3
|
export type { Task } from '@nrwl/devkit';
|
|
4
|
-
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'cache';
|
|
4
|
+
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'cache' | 'remote-cache';
|
|
5
5
|
/**
|
|
6
6
|
* @deprecated Return Promise<{[id: string]: TaskStatus}> from the tasks runner
|
|
7
7
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/tasks-runner.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/tasks-runner.ts"],"names":[],"mappings":";;;AAaA;;;;GAIG;AACH,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IAC3B,qDAAgC,CAAA;IAChC,uDAAkC,CAAA;IAClC,qEAAgD,CAAA;AAClD,CAAC,EAJW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAI5B"}
|
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.listPluginCapabilities = exports.getPluginCapabilities = void 0;
|
|
4
|
-
const chalk = require("chalk");
|
|
5
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
5
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
6
|
+
const chalk = require("chalk");
|
|
7
|
+
const path_1 = require("path");
|
|
7
8
|
const output_1 = require("../output");
|
|
8
9
|
const shared_1 = require("./shared");
|
|
9
|
-
function tryGetCollection(
|
|
10
|
-
if (!
|
|
10
|
+
function tryGetCollection(packageJsonPath, collectionFile, propName) {
|
|
11
|
+
if (!collectionFile) {
|
|
11
12
|
return null;
|
|
12
13
|
}
|
|
13
14
|
try {
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
});
|
|
17
|
-
return (0, devkit_1.readJsonFile)(jsonFilePath)[propName];
|
|
15
|
+
const collectionFilePath = (0, path_1.join)((0, path_1.dirname)(packageJsonPath), collectionFile);
|
|
16
|
+
return (0, devkit_1.readJsonFile)(collectionFilePath)[propName];
|
|
18
17
|
}
|
|
19
18
|
catch (_a) {
|
|
20
19
|
return null;
|
|
@@ -28,10 +27,10 @@ function getPluginCapabilities(workspaceRoot, pluginName) {
|
|
|
28
27
|
const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
|
|
29
28
|
return {
|
|
30
29
|
name: pluginName,
|
|
31
|
-
generators: tryGetCollection(
|
|
32
|
-
tryGetCollection(
|
|
33
|
-
executors: tryGetCollection(
|
|
34
|
-
tryGetCollection(
|
|
30
|
+
generators: tryGetCollection(packageJsonPath, packageJson.generators, 'generators') ||
|
|
31
|
+
tryGetCollection(packageJsonPath, packageJson.schematics, 'schematics'),
|
|
32
|
+
executors: tryGetCollection(packageJsonPath, packageJson.executors, 'executors') ||
|
|
33
|
+
tryGetCollection(packageJsonPath, packageJson.builders, 'builders'),
|
|
35
34
|
};
|
|
36
35
|
}
|
|
37
36
|
catch (_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B
|
|
1
|
+
{"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.3.0-beta.
|
|
4
|
+
exports.nxVersion = '13.3.0-beta.23';
|
|
5
5
|
exports.angularCliVersion = '~13.0.0';
|
|
6
6
|
exports.typescriptVersion = '~4.4.3';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|