@nrwl/workspace 13.4.0-beta.1 → 13.4.0-beta.2
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +3 -3
- package/package.json +6 -10
- package/presets/core.json +21 -0
- package/src/command-line/nx-commands.js +1 -1
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/utils.js +1 -1
- package/src/command-line/utils.js.map +1 -1
- package/src/core/dep-graph/3rdpartylicenses.txt +196 -216
- package/src/core/dep-graph/index.html +15 -187
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/main.esm.js.LICENSE.txt +51 -0
- package/src/core/dep-graph/styles.css +1 -1
- package/src/core/nx-deps/nx-deps-cache.js +10 -2
- package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +4 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +11 -4
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-nodes/workspace-projects.js +6 -2
- package/src/core/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +26 -19
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +1 -1
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.d.ts +3 -1
- package/src/core/project-graph/daemon/server/watcher.js +24 -25
- package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
- package/src/core/project-graph/project-graph-worker.js +3 -1
- package/src/core/project-graph/project-graph-worker.js.map +1 -1
- package/src/core/project-graph/project-graph.js +1 -1
- package/src/generators/new/new.d.ts +1 -1
- package/src/generators/new/new.js +19 -9
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/preset/preset.js +7 -6
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/utils/presets.d.ts +5 -2
- package/src/generators/utils/presets.js +4 -1
- package/src/generators/utils/presets.js.map +1 -1
- package/src/generators/workspace/files/README.md__tmpl__ +2 -2
- package/src/generators/workspace/workspace.js +10 -4
- package/src/generators/workspace/workspace.js.map +1 -1
- package/src/migrations/update-13-2-0/set-parallel-default.js +12 -8
- package/src/migrations/update-13-2-0/set-parallel-default.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +1 -0
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycle.d.ts +11 -10
- package/src/tasks-runner/life-cycle.js.map +1 -1
- package/src/tasks-runner/{run-command/index.d.ts → run-command.d.ts} +7 -4
- package/src/tasks-runner/{run-command/index.js → run-command.js} +18 -34
- package/src/tasks-runner/run-command.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/tasks-runner/utils.js +4 -1
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utilities/project-graph-utils.d.ts +2 -2
- package/src/utilities/project-graph-utils.js.map +1 -1
- package/src/utils/runtime-lint-utils.js +1 -1
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +2 -2
- package/src/tasks-runner/run-command/components/no-targets-run.d.ts +0 -7
- package/src/tasks-runner/run-command/components/no-targets-run.js +0 -20
- package/src/tasks-runner/run-command/components/no-targets-run.js.map +0 -1
- package/src/tasks-runner/run-command/components/nx-output-row-title.d.ts +0 -7
- package/src/tasks-runner/run-command/components/nx-output-row-title.js +0 -17
- package/src/tasks-runner/run-command/components/nx-output-row-title.js.map +0 -1
- package/src/tasks-runner/run-command/components/run-command.d.ts +0 -16
- package/src/tasks-runner/run-command/components/run-command.js +0 -55
- package/src/tasks-runner/run-command/components/run-command.js.map +0 -1
- package/src/tasks-runner/run-command/components/run-many.d.ts +0 -15
- package/src/tasks-runner/run-command/components/run-many.js +0 -123
- package/src/tasks-runner/run-command/components/run-many.js.map +0 -1
- package/src/tasks-runner/run-command/components/task-list.d.ts +0 -7
- package/src/tasks-runner/run-command/components/task-list.js +0 -29
- package/src/tasks-runner/run-command/components/task-list.js.map +0 -1
- package/src/tasks-runner/run-command/components/task-row.d.ts +0 -12
- package/src/tasks-runner/run-command/components/task-row.js +0 -52
- package/src/tasks-runner/run-command/components/task-row.js.map +0 -1
- package/src/tasks-runner/run-command/index.js.map +0 -1
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.d.ts +0 -30
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js +0 -34
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js.map +0 -1
@@ -63,8 +63,10 @@ function generatePreset(host, opts) {
|
|
63
63
|
}
|
64
64
|
else if (value === false) {
|
65
65
|
acc.push(`--no-${key}`);
|
66
|
+
// nxWorkspaceRoot breaks Tao CLI if incorrectly set, so need to exclude it.
|
67
|
+
// TODO(jack): Should read in the preset schema and only pass the options specified.
|
66
68
|
}
|
67
|
-
else {
|
69
|
+
else if (key !== 'nxWorkspaceRoot') {
|
68
70
|
// string, number (don't handle arrays or nested objects)
|
69
71
|
acc.push(`--${key}=${value}`);
|
70
72
|
}
|
@@ -133,6 +135,9 @@ function initializeGitRepo(host, rootDirectory, options) {
|
|
133
135
|
function newGenerator(host, options) {
|
134
136
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
135
137
|
if (options.skipInstall &&
|
138
|
+
options.preset !== presets_1.Preset.Apps &&
|
139
|
+
options.preset !== presets_1.Preset.Core &&
|
140
|
+
options.preset !== presets_1.Preset.TS &&
|
136
141
|
options.preset !== presets_1.Preset.Empty &&
|
137
142
|
options.preset !== presets_1.Preset.NPM) {
|
138
143
|
throw new Error(`Cannot select a preset when skipInstall is set to true.`);
|
@@ -173,6 +178,8 @@ function addCloudDependencies(host, options) {
|
|
173
178
|
}
|
174
179
|
function getPresetDependencies(preset, version) {
|
175
180
|
switch (preset) {
|
181
|
+
case presets_1.Preset.TS:
|
182
|
+
return { dependencies: {}, dev: { '@nrwl/js': versions_1.nxVersion } };
|
176
183
|
case presets_1.Preset.Angular:
|
177
184
|
return { dependencies: { '@nrwl/angular': versions_1.nxVersion }, dev: {} };
|
178
185
|
case presets_1.Preset.AngularWithNest:
|
@@ -211,7 +218,10 @@ function getPresetDependencies(preset, version) {
|
|
211
218
|
}
|
212
219
|
}
|
213
220
|
function addPresetDependencies(host, options) {
|
214
|
-
if (options.preset === presets_1.Preset.
|
221
|
+
if (options.preset === presets_1.Preset.Apps ||
|
222
|
+
options.preset === presets_1.Preset.Core ||
|
223
|
+
options.preset === presets_1.Preset.Empty ||
|
224
|
+
options.preset === presets_1.Preset.NPM) {
|
215
225
|
return;
|
216
226
|
}
|
217
227
|
const { dependencies, dev } = getPresetDependencies(options.preset, options.presetVersion);
|
@@ -222,13 +232,13 @@ function normalizeOptions(options) {
|
|
222
232
|
if (!options.directory) {
|
223
233
|
options.directory = options.name;
|
224
234
|
}
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
options.preset =
|
231
|
-
options.presetVersion =
|
235
|
+
// If the preset already contains a version in the name
|
236
|
+
// -- my-package@2.0.1
|
237
|
+
// -- @scope/package@version
|
238
|
+
const match = options.preset.match(/^(?<package>(@.+\/)?[^@]+)(@(?<version>\d+\.\d+\.\d+))?$/);
|
239
|
+
if (match) {
|
240
|
+
options.preset = match.groups.package;
|
241
|
+
options.presetVersion = match.groups.version;
|
232
242
|
}
|
233
243
|
return options;
|
234
244
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
@@ -22,10 +22,11 @@ exports.presetSchematic = (0, devkit_1.convertNxGenerator)(presetGenerator);
|
|
22
22
|
exports.default = presetGenerator;
|
23
23
|
function createPreset(tree, options) {
|
24
24
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
25
|
-
if (options.preset === presets_1.Preset.Empty
|
26
|
-
|
27
|
-
|
28
|
-
|
25
|
+
if (options.preset === presets_1.Preset.Empty ||
|
26
|
+
options.preset === presets_1.Preset.Apps ||
|
27
|
+
options.preset === presets_1.Preset.NPM ||
|
28
|
+
options.preset === presets_1.Preset.Core ||
|
29
|
+
options.preset === presets_1.Preset.TS) {
|
29
30
|
return;
|
30
31
|
}
|
31
32
|
else if (options.preset === presets_1.Preset.Angular) {
|
@@ -217,7 +218,7 @@ describe('AppComponent', () => {
|
|
217
218
|
<img
|
218
219
|
width="450"
|
219
220
|
src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png"
|
220
|
-
alt="Nx - Smart, Extensible Build
|
221
|
+
alt="Nx - Smart, Fast and Extensible Build System"
|
221
222
|
/>
|
222
223
|
</div>
|
223
224
|
<div>Message: {{ (hello$|async)|json }}</div>
|
@@ -271,7 +272,7 @@ export const App = () => {
|
|
271
272
|
<img
|
272
273
|
width="450"
|
273
274
|
src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png"
|
274
|
-
alt="Nx - Smart, Extensible Build
|
275
|
+
alt="Nx - Smart, Fast and Extensible Build System"
|
275
276
|
/>
|
276
277
|
</div>
|
277
278
|
<div>{m.message}</div>
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AAGtB,gDAAsD;AAEtD,0DAAsD;AACtD,gEAA4D;AAC5D,8CAA0C;AAE1C,SAAsB,eAAe,CAAC,IAAU,EAAE,OAAe;;QAC/D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAPD,0CAOC;AAEY,QAAA,eAAe,GAAG,IAAA,2BAAkB,EAAC,eAAe,CAAC,CAAC;AACnE,kBAAe,eAAe,CAAC;AAE/B,SAAe,YAAY,CAAC,IAAU,EAAE,OAAe;;QACrD,
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|
@@ -1,14 +1,17 @@
|
|
1
1
|
export declare enum Preset {
|
2
|
+
Apps = "apps",
|
2
3
|
Empty = "empty",
|
4
|
+
Core = "core",
|
3
5
|
NPM = "npm",
|
6
|
+
TS = "ts",
|
4
7
|
WebComponents = "web-components",
|
5
8
|
Angular = "angular",
|
6
9
|
AngularWithNest = "angular-nest",
|
7
10
|
React = "react",
|
8
11
|
ReactWithExpress = "react-express",
|
12
|
+
ReactNative = "react-native",
|
9
13
|
NextJs = "next",
|
10
14
|
Gatsby = "gatsby",
|
11
15
|
Nest = "nest",
|
12
|
-
Express = "express"
|
13
|
-
ReactNative = "react-native"
|
16
|
+
Express = "express"
|
14
17
|
}
|
@@ -3,17 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Preset = void 0;
|
4
4
|
var Preset;
|
5
5
|
(function (Preset) {
|
6
|
+
Preset["Apps"] = "apps";
|
6
7
|
Preset["Empty"] = "empty";
|
8
|
+
Preset["Core"] = "core";
|
7
9
|
Preset["NPM"] = "npm";
|
10
|
+
Preset["TS"] = "ts";
|
8
11
|
Preset["WebComponents"] = "web-components";
|
9
12
|
Preset["Angular"] = "angular";
|
10
13
|
Preset["AngularWithNest"] = "angular-nest";
|
11
14
|
Preset["React"] = "react";
|
12
15
|
Preset["ReactWithExpress"] = "react-express";
|
16
|
+
Preset["ReactNative"] = "react-native";
|
13
17
|
Preset["NextJs"] = "next";
|
14
18
|
Preset["Gatsby"] = "gatsby";
|
15
19
|
Preset["Nest"] = "nest";
|
16
20
|
Preset["Express"] = "express";
|
17
|
-
Preset["ReactNative"] = "react-native";
|
18
21
|
})(Preset = exports.Preset || (exports.Preset = {}));
|
19
22
|
//# sourceMappingURL=presets.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
1
|
+
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAgBX;AAhBD,WAAY,MAAM;IAChB,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,qBAAW,CAAA;IACX,mBAAS,CAAA;IACT,0CAAgC,CAAA;IAChC,6BAAmB,CAAA;IACnB,0CAAgC,CAAA;IAChC,yBAAe,CAAA;IACf,4CAAkC,CAAA;IAClC,sCAA4B,CAAA;IAC5B,yBAAe,CAAA;IACf,2BAAiB,CAAA;IACjB,uBAAa,CAAA;IACb,6BAAmB,CAAA;AACrB,CAAC,EAhBW,MAAM,GAAN,cAAM,KAAN,cAAM,QAgBjB"}
|
@@ -6,7 +6,7 @@ This project was generated using [Nx](https://nx.dev).
|
|
6
6
|
|
7
7
|
<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="450"></p>
|
8
8
|
|
9
|
-
🔎 **Smart, Extensible Build
|
9
|
+
🔎 **Smart, Fast and Extensible Build System**
|
10
10
|
|
11
11
|
## Quick Start & Documentation
|
12
12
|
|
@@ -98,7 +98,7 @@ This project was generated using [Nx](https://nx.dev).
|
|
98
98
|
|
99
99
|
<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="450"></p>
|
100
100
|
|
101
|
-
🔎 **Smart, Extensible Build
|
101
|
+
🔎 **Smart, Fast and Extensible Build System**
|
102
102
|
|
103
103
|
## Adding capabilities to your workspace
|
104
104
|
|
@@ -18,8 +18,10 @@ function decorateAngularClI(host, options) {
|
|
18
18
|
}
|
19
19
|
function setPresetProperty(tree, options) {
|
20
20
|
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
|
21
|
-
if (options.preset === presets_1.Preset.
|
22
|
-
|
21
|
+
if (options.preset === presets_1.Preset.Core ||
|
22
|
+
options.preset === presets_1.Preset.TS ||
|
23
|
+
options.preset === presets_1.Preset.NPM) {
|
24
|
+
addPropertyWithStableKeys(json, 'extends', '@nrwl/workspace/presets/core.json');
|
23
25
|
delete json.implicitDependencies;
|
24
26
|
delete json.targetDependencies;
|
25
27
|
delete json.workspaceLayout;
|
@@ -28,7 +30,9 @@ function setPresetProperty(tree, options) {
|
|
28
30
|
});
|
29
31
|
}
|
30
32
|
function createAppsAndLibsFolders(host, options) {
|
31
|
-
if (options.preset === presets_1.Preset.
|
33
|
+
if (options.preset === presets_1.Preset.Core ||
|
34
|
+
options.preset === presets_1.Preset.TS ||
|
35
|
+
options.preset === presets_1.Preset.NPM) {
|
32
36
|
host.write((0, path_1.join)(options.directory, 'packages/.gitkeep'), '');
|
33
37
|
}
|
34
38
|
else {
|
@@ -75,7 +79,9 @@ function addNpmScripts(host, options) {
|
|
75
79
|
return json;
|
76
80
|
});
|
77
81
|
}
|
78
|
-
if (options.preset !== presets_1.Preset.
|
82
|
+
if (options.preset !== presets_1.Preset.TS &&
|
83
|
+
options.preset !== presets_1.Preset.Core &&
|
84
|
+
options.preset !== presets_1.Preset.NPM) {
|
79
85
|
(0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'package.json'), (json) => {
|
80
86
|
Object.assign(json.scripts, {
|
81
87
|
start: 'nx serve',
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AAEtB,mDAK8B;AAC9B,2BAAkC;AAClC,+BAA8C;AAC9C,8DAAgF;AAChF,8CAA0C;AAC1C,+DAAiE;AAEpD,QAAA,4BAA4B,GAAG;IAC1C,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAe;IACrD,MAAM,WAAW,GAAG,IAAA,iBAAY,EAC9B,IAAA,WAAQ,EAAC,SAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,iCAAiC,CAAC,CAC7E,CAAC,QAAQ,EAAE,CAAC;IACb,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,EAAE,WAAW,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,OAAe;IACpD,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5D,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":"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"}
|
@@ -4,17 +4,21 @@ exports.setParallelDefault = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
function setParallelDefault(host) {
|
7
|
+
var _a, _b;
|
7
8
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
8
9
|
const config = (0, devkit_1.readWorkspaceConfiguration)(host);
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
10
|
+
const defaultTaskRunnerOptions = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
|
11
|
+
if (defaultTaskRunnerOptions) {
|
12
|
+
if (defaultTaskRunnerOptions.parallel) {
|
13
|
+
defaultTaskRunnerOptions.parallel =
|
14
|
+
defaultTaskRunnerOptions.maxParallel || 3;
|
15
|
+
delete defaultTaskRunnerOptions.maxParallel;
|
16
|
+
}
|
17
|
+
else {
|
18
|
+
defaultTaskRunnerOptions.parallel = 1;
|
19
|
+
}
|
20
|
+
(0, devkit_1.updateWorkspaceConfiguration)(host, config);
|
13
21
|
}
|
14
|
-
else {
|
15
|
-
config.tasksRunnerOptions['default'].options.parallel = 1;
|
16
|
-
}
|
17
|
-
(0, devkit_1.updateWorkspaceConfiguration)(host, config);
|
18
22
|
yield (0, devkit_1.formatFiles)(host);
|
19
23
|
});
|
20
24
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"set-parallel-default.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-2-0/set-parallel-default.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;
|
1
|
+
{"version":3,"file":"set-parallel-default.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-2-0/set-parallel-default.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,SAAsB,kBAAkB,CAAC,IAAU;;;QACjD,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAChD,MAAM,wBAAwB,GAC5B,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,CAAC;QAClD,IAAI,wBAAwB,EAAE;YAC5B,IAAI,wBAAwB,CAAC,QAAQ,EAAE;gBACrC,wBAAwB,CAAC,QAAQ;oBAC/B,wBAAwB,CAAC,WAAW,IAAI,CAAC,CAAC;gBAC5C,OAAO,wBAAwB,CAAC,WAAW,CAAC;aAC7C;iBAAM;gBACL,wBAAwB,CAAC,QAAQ,GAAG,CAAC,CAAC;aACvC;YACD,IAAA,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC5C;QACD,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAfD,gDAeC;AAED,kBAAe,kBAAkB,CAAC"}
|
@@ -177,6 +177,7 @@ class ForkedProcessTaskRunner {
|
|
177
177
|
FORCE_COLOR: forceColor,
|
178
178
|
NX_INVOKED_BY_RUNNER: 'true',
|
179
179
|
NX_WORKSPACE_ROOT: this.workspaceRoot,
|
180
|
+
NX_SKIP_NX_CACHE: this.options.skipNxCache ? 'true' : undefined,
|
180
181
|
};
|
181
182
|
if (outputPath) {
|
182
183
|
env.NX_TERMINAL_OUTPUT_PATH = outputPath;
|
@@ -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":"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
|
1
|
+
{"version":3,"file":"forked-process-task-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/forked-process-task-runner.ts"],"names":[],"mappings":";;;AAAA,2BAAiD;AACjD,iCAAiC;AACjC,iDAAmD;AACnD,2DAA2D;AAG3D,gDAA8D;AAC9D,mCAA4D;AAE5D,+BAA4B;AAC5B,2DAIgC;AAEhC,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AAE3D,MAAa,uBAAuB;IAMlC,YAA6B,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;QAL/D,kBAAa,GAAG,sBAAW,CAAC;QAC5B,YAAO,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEjC,cAAS,GAAG,IAAI,GAAG,EAAgB,CAAC;QAG1C,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,kDAAkD;IAC3C,mBAAmB,CAAC,EAAE,YAAY,EAAE,SAAS,EAAS;QAC3D,OAAO,IAAI,OAAO,CAAe,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5C,IAAI;gBACF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;gBAClD,IAAI,KAAK,GAAG,CAAC,EAAE;oBACb,eAAM,CAAC,aAAa,CAClB,WAAW,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,eAAM,CAAC,IAAI,CAC1C,OAAO,CACR,SAAS,eAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CACtC,CAAC;iBACH;qBAAM;oBACL,MAAM,IAAI,GAAG,IAAA,6BAAqB,EAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACtE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBAE3C,eAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;iBAChC;gBAED,MAAM,CAAC,GAAG,IAAA,oBAAI,EAAC,UAAU,EAAE;oBACzB,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC;oBAC/C,GAAG,EAAE,IAAI,CAAC,yBAAyB,EAAE;iBACtC,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAEtB,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;oBAC9B,IAAI,IAAI,KAAK,IAAI;wBAAE,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACpD,IAAI,IAAI,KAAK,CAAC,EAAE;wBACd,MAAM,OAAO,GAAiB,EAAE,CAAC;wBACjC,KAAK,MAAM,UAAU,IAAI,SAAS,CAAC,KAAK,EAAE;4BACxC,OAAO,CAAC,UAAU,CAAC,GAAG;gCACpB,OAAO,EAAE,KAAK;6BACf,CAAC;yBACH;wBACD,GAAG,CACD,IAAI,KAAK,CACP,IAAI,YAAY,oCAAoC,IAAI,EAAE,CAC3D,CACF,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;gBAEH,CAAC,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAqB,EAAE,EAAE;oBACxC,QAAQ,OAAO,CAAC,IAAI,EAAE;wBACpB,KAAK,iCAAgB,CAAC,QAAQ,CAAC,CAAC;4BAC9B,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;yBACtB;qBACF;gBACH,CAAC,CAAC,CAAC;gBAEH,kBAAkB;gBAClB,CAAC,CAAC,IAAI,CAAC;oBACL,IAAI,EAAE,iCAAgB,CAAC,KAAK;oBAC5B,SAAS;oBACT,YAAY;iBACb,CAAC,CAAC;aACJ;YAAC,OAAO,CAAC,EAAE;gBACV,GAAG,CAAC,CAAC,CAAC,CAAC;aACR;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,4BAA4B,CACjC,IAAU,EACV,EACE,aAAa,EACb,mBAAmB,GACqC;QAE1D,OAAO,IAAI,OAAO,CAA2C,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACxE,IAAI;gBACF,MAAM,IAAI,GAAG,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC;gBACzC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAE3C,IAAI,aAAa,EAAE;oBACjB,eAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;iBAChC;gBACD,MAAM,CAAC,GAAG,IAAA,oBAAI,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;oBACjC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;oBACzC,GAAG,EAAE,IAAI,CAAC,sBAAsB,CAC9B,IAAI,EACJ,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,SAAS;wBACnC,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAC3B,SAAS,EACT,aAAa,CACd;iBACF,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtB,IAAI,GAAG,GAAG,EAAE,CAAC;gBACb,IAAI,UAAU,GAAG,EAAE,CAAC;gBACpB,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC5B,IAAI,aAAa,EAAE;wBACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;qBAC7B;oBACD,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAC3B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACpC,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC5B,IAAI,aAAa,EAAE;wBACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;qBAC7B;oBACD,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACpC,CAAC,CAAC,CAAC;gBAEH,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;oBAC5B,IAAI,IAAI,KAAK,IAAI;wBAAE,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACpD,4DAA4D;oBAC5D,kCAAkC;oBAClC,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAE3C,IAAI,CAAC,aAAa,EAAE;wBAClB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,uBAAuB,CAC5C,IAAI,EACJ,wBAAe,CAAC,OAAO,EACvB,cAAc,CACf,CAAC;qBACH;oBACD,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;oBAC9D,GAAG,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,GAAG,CAAC,CAAC,CAAC,CAAC;aACR;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,8BAA8B,CACnC,IAAU,EACV,EACE,aAAa,EACb,mBAAmB,GACqC;QAE1D,OAAO,IAAI,OAAO,CAA2C,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACxE,IAAI;gBACF,MAAM,IAAI,GAAG,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC;gBACzC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAE3C,IAAI,aAAa,EAAE;oBACjB,eAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;iBAChC;gBACD,MAAM,CAAC,GAAG,IAAA,oBAAI,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;oBACjC,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC;oBAC/C,GAAG,EAAE,IAAI,CAAC,sBAAsB,CAC9B,IAAI,EACJ,SAAS,EACT,mBAAmB,EACnB,aAAa,CACd;iBACF,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtB,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;oBAC5B,IAAI,IAAI,KAAK,IAAI;wBAAE,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACpD,4DAA4D;oBAC5D,iCAAiC;oBACjC,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;oBACpE,IAAI,CAAC,aAAa,EAAE;wBAClB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,uBAAuB,CAC5C,IAAI,EACJ,wBAAe,CAAC,OAAO,EACvB,cAAc,CACf,CAAC;qBACH;oBACD,GAAG,CAAC;wBACF,IAAI;wBACJ,cAAc;qBACf,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,GAAG,CAAC,CAAC,CAAC,CAAC;aACR;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,kBAAkB,CAAC,UAAkB;QAC3C,IAAI;YACF,OAAO,IAAA,iBAAY,EAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;SAC5C;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAEO,mBAAmB,CAAC,UAAkB,EAAE,OAAe;QAC7D,IAAI;YACF,IAAA,kBAAa,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SACpC;QAAC,OAAO,CAAC,EAAE,GAAE;IAChB,CAAC;IAED,+BAA+B;IACvB,yBAAyB;QAC/B,qDAEK,IAAI,CAAC,kCAAkC,EAAE,GAEzC,OAAO,CAAC,GAAG,GAEX,IAAI,CAAC,iCAAiC,CACvC,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CACzE,EACD;IACJ,CAAC;IAEO,sBAAsB,CAC5B,IAAU,EACV,UAAkB,EAClB,UAAkB,EAClB,aAAsB;QAEtB,qDAEK,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,GAEpC,OAAO,CAAC,GAAG,GAEX,IAAI,CAAC,wBAAwB,CAC9B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,aAAa,CACd,EACD;IACJ,CAAC;IAEO,iCAAiC,CACvC,UAAkB,EAClB,UAAmB,EACnB,aAAuB;QAEvB,MAAM,GAAG,GAAsB;YAC7B,WAAW,EAAE,UAAU;YACvB,oBAAoB,EAAE,MAAM;YAC5B,iBAAiB,EAAE,IAAI,CAAC,aAAa;YACrC,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;SAChE,CAAC;QAEF,IAAI,UAAU,EAAE;YACd,GAAG,CAAC,uBAAuB,GAAG,UAAU,CAAC;YACzC,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;gBAC9B,GAAG,CAAC,0BAA0B,GAAG,MAAM,CAAC;aACzC;YACD,IAAI,aAAa,EAAE;gBACjB,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC;aAChC;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,wBAAwB,CAC9B,IAAU,EACV,UAAkB,EAClB,UAAkB,EAClB,aAAsB;QAEtB,MAAM,GAAG,GAAsB;YAC7B,sBAAsB,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC3C,YAAY,EAAE,IAAI,CAAC,IAAI;SACxB,CAAC;QAEF,kEAAkE;QAClE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE;YACjC,GAAG,CAAC,0BAA0B,GAAG,MAAM,CAAC;SACzC;QAED,uCACK,IAAI,CAAC,iCAAiC,CACvC,UAAU,EACV,UAAU,EACV,aAAa,CACd,GACE,GAAG,EACN;IACJ,CAAC;IAEO,kCAAkC;QACxC,qDACK,QAAQ,CAAC,MAAM,CAAC,GAChB,QAAQ,CAAC,YAAY,CAAC,GACtB,QAAQ,CAAC,YAAY,CAAC,EACzB;IACJ,CAAC;IAEO,yBAAyB,CAAC,IAAU;QAC1C,2HACK,IAAI,CAAC,kCAAkC,EAAE,GACzC,QAAQ,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,GACtC,QAAQ,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GACtC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,OAAO,CAAC,GACpC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,aAAa,CAAC,GAC1C,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,aAAa,CAAC,GAC1C,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,GAC1D,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,SAAS,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAC7D;IACJ,CAAC;IAED,kCAAkC;IAE1B,YAAY,CAAC,MAAc;QACjC,IAAI,MAAM,KAAK,QAAQ;YAAE,OAAO,GAAG,GAAG,CAAC,CAAC;QACxC,IAAI,MAAM,KAAK,QAAQ;YAAE,OAAO,GAAG,GAAG,CAAC,CAAC;QACxC,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,GAAG,GAAG,EAAE,CAAC;QAC1C,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,0BAA0B;QAChC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACxB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC3B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;YACH,iEAAiE;YACjE,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACzB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC3B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;YACH,oEAAoE;YACpE,kEAAkE;QACpE,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACxB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC3B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;YACH,oEAAoE;YACpE,kEAAkE;QACpE,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAlVD,0DAkVC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,IAAI;QACF,MAAM,WAAW,GAAG,IAAA,iBAAY,EAAC,IAAI,CAAC,CAAC;QACvC,OAAO,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;KAClC;IAAC,OAAO,CAAC,EAAE,GAAE;AAChB,CAAC"}
|
@@ -1,13 +1,6 @@
|
|
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
|
-
}
|
11
4
|
export interface LifeCycle {
|
12
5
|
startCommand?(): void;
|
13
6
|
endCommand?(): void;
|
@@ -25,11 +18,15 @@ export interface LifeCycle {
|
|
25
18
|
*/
|
26
19
|
endTask?(task: Task, code: number): void;
|
27
20
|
startTasks?(task: Task[]): void;
|
28
|
-
endTasks?(taskResults:
|
21
|
+
endTasks?(taskResults: Array<{
|
22
|
+
task: Task;
|
23
|
+
status: TaskStatus;
|
24
|
+
code: number;
|
25
|
+
}>): void;
|
29
26
|
printTaskTerminalOutput?(task: Task, cacheStatus: TaskCacheStatus, output: string): void;
|
30
27
|
}
|
31
28
|
export declare class CompositeLifeCycle implements LifeCycle {
|
32
|
-
readonly lifeCycles
|
29
|
+
private readonly lifeCycles;
|
33
30
|
constructor(lifeCycles: LifeCycle[]);
|
34
31
|
startCommand(): void;
|
35
32
|
endCommand(): void;
|
@@ -37,6 +34,10 @@ export declare class CompositeLifeCycle implements LifeCycle {
|
|
37
34
|
startTask(task: Task): void;
|
38
35
|
endTask(task: Task, code: number): void;
|
39
36
|
startTasks(tasks: Task[]): void;
|
40
|
-
endTasks(taskResults:
|
37
|
+
endTasks(taskResults: Array<{
|
38
|
+
task: Task;
|
39
|
+
status: TaskStatus;
|
40
|
+
code: number;
|
41
|
+
}>): void;
|
41
42
|
printTaskTerminalOutput(task: Task, cacheStatus: TaskCacheStatus, output: string): void;
|
42
43
|
}
|
@@ -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":";;;AAsCA,MAAa,kBAAkB;IAC7B,YAA6B,UAAuB;QAAvB,eAAU,GAAV,UAAU,CAAa;IAAG,CAAC;IAExD,YAAY;QACV,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,EAAE,CAAC;aAClB;SACF;IACH,CAAC;IAED,UAAU;QACR,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,EAAE,CAAC;aAChB;SACF;IACH,CAAC;IAED,YAAY,CAAC,IAAU;QACrB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aACtB;SACF;IACH,CAAC;IAED,SAAS,CAAC,IAAU;QAClB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,SAAS,EAAE;gBACf,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aACnB;SACF;IACH,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,IAAY;QAC9B,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,OAAO,EAAE;gBACb,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACvB;SACF;IACH,CAAC;IAED,UAAU,CAAC,KAAa;QACtB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aACrB;iBAAM,IAAI,CAAC,CAAC,SAAS,EAAE;gBACtB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC;SACF;IACH,CAAC;IAED,QAAQ,CACN,WAAoE;QAEpE,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,QAAQ,EAAE;gBACd,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;aACzB;iBAAM,IAAI,CAAC,CAAC,OAAO,EAAE;gBACpB,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aACvD;SACF;IACH,CAAC;IAED,uBAAuB,CACrB,IAAU,EACV,WAA4B,EAC5B,MAAc;QAEd,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,uBAAuB,EAAE;gBAC7B,CAAC,CAAC,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;aACtD;SACF;IACH,CAAC;CACF;AA5ED,gDA4EC"}
|
@@ -1,8 +1,11 @@
|
|
1
|
+
import { TasksRunner } from './tasks-runner';
|
2
|
+
import { ReporterArgs } from './reporter';
|
3
|
+
import * as yargs from 'yargs';
|
1
4
|
import type { NxJsonConfiguration, ProjectGraph, ProjectGraphNode, TargetDependencyConfig, Task } from '@nrwl/devkit';
|
2
|
-
import {
|
3
|
-
import {
|
4
|
-
|
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>;
|
5
|
+
import { Environment } from '../core/shared-interfaces';
|
6
|
+
import { NxArgs } from '../command-line/utils';
|
7
|
+
declare type RunArgs = yargs.Arguments & ReporterArgs;
|
8
|
+
export declare function runCommand<T extends RunArgs>(projectsToRun: ProjectGraphNode[], projectGraph: ProjectGraph, { nxJson, workspaceResults }: Environment, nxArgs: NxArgs, overrides: any, terminalOutputStrategy: 'default' | 'hide-cached-output' | 'run-one', initiatingProject: string | null): Promise<void>;
|
6
9
|
interface TaskParams {
|
7
10
|
project: ProjectGraphNode;
|
8
11
|
target: string;
|
@@ -2,23 +2,19 @@
|
|
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");
|
5
7
|
const devkit_1 = require("@nrwl/devkit");
|
6
8
|
const logger_1 = require("@nrwl/tao/src/shared/logger");
|
7
|
-
const
|
8
|
-
const
|
9
|
-
const
|
10
|
-
const
|
11
|
-
const
|
12
|
-
const
|
13
|
-
const
|
14
|
-
const
|
15
|
-
const
|
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");
|
9
|
+
const fileutils_1 = require("../utilities/fileutils");
|
10
|
+
const project_graph_utils_1 = require("../utilities/project-graph-utils");
|
11
|
+
const output_1 = require("../utilities/output");
|
12
|
+
const utils_1 = require("./utils");
|
13
|
+
const life_cycle_1 = require("./life-cycle");
|
14
|
+
const run_many_terminal_output_life_cycle_1 = require("./run-many-terminal-output-life-cycle");
|
15
|
+
const empty_terminal_output_life_cycle_1 = require("./empty-terminal-output-life-cycle");
|
16
|
+
const run_one_terminal_output_life_cycle_1 = require("./run-one-terminal-output-life-cycle");
|
17
|
+
const task_timings_life_cycle_1 = require("./task-timings-life-cycle");
|
22
18
|
function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, projectsToRun, tasks, nxArgs, overrides) {
|
23
19
|
if (terminalOutputStrategy === 'run-one') {
|
24
20
|
return new run_one_terminal_output_life_cycle_1.RunOneTerminalOutputLifeCycle(initiatingProject, projectsToRun.map((t) => t.name), tasks, nxArgs);
|
@@ -27,9 +23,6 @@ function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, p
|
|
27
23
|
return new empty_terminal_output_life_cycle_1.EmptyTerminalOutputLifeCycle();
|
28
24
|
}
|
29
25
|
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
|
-
}
|
33
26
|
return new run_many_terminal_output_life_cycle_1.RunManyTerminalOutputLifeCycle(projectsToRun.map((t) => t.name), tasks, nxArgs, overrides);
|
34
27
|
}
|
35
28
|
}
|
@@ -49,19 +42,13 @@ function runCommand(projectsToRun, projectGraph, { nxJson, workspaceResults }, n
|
|
49
42
|
configuration: nxArgs.configuration,
|
50
43
|
overrides,
|
51
44
|
}, projectGraph, initiatingProject, defaultDependencyConfigs);
|
52
|
-
const
|
53
|
-
|
45
|
+
const lifeCycles = [
|
46
|
+
getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, projectsToRun, tasks, nxArgs, overrides),
|
47
|
+
];
|
54
48
|
if (process.env.NX_PERF_LOGGING) {
|
55
49
|
lifeCycles.push(new task_timings_life_cycle_1.TaskTimingsLifeCycle());
|
56
50
|
}
|
57
51
|
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
|
-
}
|
65
52
|
const promiseOrObservable = tasksRunner(tasks, Object.assign(Object.assign({}, runnerOptions), { lifeCycle }), {
|
66
53
|
initiatingProject,
|
67
54
|
target: nxArgs.target,
|
@@ -76,9 +63,6 @@ function runCommand(projectsToRun, projectGraph, { nxJson, workspaceResults }, n
|
|
76
63
|
// simply await the promise
|
77
64
|
anyFailures = yield anyFailuresInPromise(promiseOrObservable);
|
78
65
|
}
|
79
|
-
if (inkWaitUntilExit) {
|
80
|
-
yield inkWaitUntilExit();
|
81
|
-
}
|
82
66
|
// fix for https://github.com/nrwl/nx/issues/1666
|
83
67
|
if (process.stdin['unref'])
|
84
68
|
process.stdin.unref();
|
@@ -237,7 +221,7 @@ function getRunner(nxArgs, nxJson) {
|
|
237
221
|
let runner = nxArgs.runner;
|
238
222
|
//TODO: vsavkin remove in Nx 12
|
239
223
|
if (!nxJson.tasksRunnerOptions) {
|
240
|
-
const t = require('
|
224
|
+
const t = require('./default-tasks-runner');
|
241
225
|
return {
|
242
226
|
tasksRunner: t.defaultTasksRunner,
|
243
227
|
runnerOptions: nxArgs,
|
@@ -245,7 +229,7 @@ function getRunner(nxArgs, nxJson) {
|
|
245
229
|
}
|
246
230
|
//TODO: vsavkin remove in Nx 12
|
247
231
|
if (!runner && !nxJson.tasksRunnerOptions.default) {
|
248
|
-
const t = require('
|
232
|
+
const t = require('./default-tasks-runner');
|
249
233
|
return {
|
250
234
|
tasksRunner: t.defaultTasksRunner,
|
251
235
|
runnerOptions: nxArgs,
|
@@ -266,7 +250,7 @@ function getRunner(nxArgs, nxJson) {
|
|
266
250
|
}
|
267
251
|
}
|
268
252
|
else {
|
269
|
-
tasksRunner = require('
|
253
|
+
tasksRunner = require('./default-tasks-runner').defaultTasksRunner;
|
270
254
|
}
|
271
255
|
return {
|
272
256
|
tasksRunner,
|
@@ -314,4 +298,4 @@ function ensureTargetDependenciesBackwardCompatibility(nxJson, nxArgs) {
|
|
314
298
|
}
|
315
299
|
}
|
316
300
|
}
|
317
|
-
//# sourceMappingURL=
|
301
|
+
//# sourceMappingURL=run-command.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|