nx 14.1.9 → 14.2.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/bin/{init.d.ts → compute-project-graph.d.ts} +0 -0
- package/bin/{init.js → compute-project-graph.js} +1 -1
- package/bin/compute-project-graph.js.map +1 -0
- package/bin/nx.js +9 -1
- package/bin/nx.js.map +1 -1
- package/bin/run-executor.js +15 -2
- package/bin/run-executor.js.map +1 -1
- package/migrations.json +6 -0
- package/package.json +18 -8
- package/presets/core.json +13 -8
- package/presets/npm.json +13 -7
- package/src/adapter/compat.js +4 -4
- package/src/adapter/compat.js.map +1 -1
- package/src/adapter/ngcli-adapter.d.ts +4 -4
- package/src/adapter/ngcli-adapter.js +3 -0
- package/src/adapter/ngcli-adapter.js.map +1 -1
- package/src/command-line/affected.js +8 -2
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/connect-to-nx-cloud.js +3 -3
- package/src/command-line/connect-to-nx-cloud.js.map +1 -1
- package/src/command-line/dep-graph.js +7 -7
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/format.d.ts +2 -2
- package/src/command-line/format.js +4 -3
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/generate.js +137 -45
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/init.d.ts +1 -0
- package/src/command-line/init.js +39 -0
- package/src/command-line/init.js.map +1 -0
- package/src/command-line/lint.js +2 -2
- package/src/command-line/lint.js.map +1 -1
- package/src/command-line/list.js +2 -2
- package/src/command-line/list.js.map +1 -1
- package/src/command-line/migrate.js +9 -0
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +60 -9
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/print-affected.js +10 -10
- package/src/command-line/print-affected.js.map +1 -1
- package/src/command-line/read-environment.js +3 -3
- package/src/command-line/read-environment.js.map +1 -1
- package/src/command-line/report.js +3 -3
- package/src/command-line/report.js.map +1 -1
- package/src/command-line/run-many.js +2 -2
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +4 -6
- package/src/command-line/run-one.js.map +1 -1
- package/src/command-line/run.d.ts +2 -2
- package/src/command-line/run.js.map +1 -1
- package/src/command-line/workspace-generators.js +2 -2
- package/src/command-line/workspace-generators.js.map +1 -1
- package/src/config/configuration.d.ts +11 -0
- package/src/config/configuration.js +26 -0
- package/src/config/configuration.js.map +1 -0
- package/src/config/misc-interfaces.d.ts +3 -3
- package/src/config/workspace-json-project-json.d.ts +8 -4
- package/src/config/workspaces.d.ts +11 -7
- package/src/config/workspaces.js +29 -23
- package/src/config/workspaces.js.map +1 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/daemon/client/client.js +3 -3
- package/src/daemon/client/client.js.map +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.js +3 -3
- package/src/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/daemon/server/server.js +7 -7
- package/src/daemon/server/server.js.map +1 -1
- package/src/daemon/server/shutdown-utils.js +2 -2
- package/src/daemon/server/shutdown-utils.js.map +1 -1
- package/src/daemon/server/watcher.js +10 -10
- package/src/daemon/server/watcher.js.map +1 -1
- package/src/generators/utils/project-configuration.d.ts +3 -3
- package/src/generators/utils/project-configuration.js.map +1 -1
- package/src/hasher/file-hasher-base.js +4 -4
- package/src/hasher/file-hasher-base.js.map +1 -1
- package/src/hasher/file-hasher.js +2 -2
- package/src/hasher/file-hasher.js.map +1 -1
- package/src/hasher/git-based-file-hasher.js +5 -5
- package/src/hasher/git-based-file-hasher.js.map +1 -1
- package/src/hasher/hasher.js +4 -4
- package/src/hasher/hasher.js.map +1 -1
- package/src/hasher/node-based-file-hasher.js +6 -6
- package/src/hasher/node-based-file-hasher.js.map +1 -1
- package/src/migrations/update-14-2-0/remove-default-collection.d.ts +2 -0
- package/src/migrations/update-14-2-0/remove-default-collection.js +19 -0
- package/src/migrations/update-14-2-0/remove-default-collection.js.map +1 -0
- package/src/project-graph/affected/affected-project-graph.d.ts +2 -2
- package/src/project-graph/affected/affected-project-graph.js +2 -1
- package/src/project-graph/affected/affected-project-graph.js.map +1 -1
- package/src/project-graph/build-nodes/npm-packages.js +2 -2
- package/src/project-graph/build-nodes/npm-packages.js.map +1 -1
- package/src/project-graph/build-nodes/workspace-projects.js +2 -2
- package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/project-graph/build-project-graph.d.ts +2 -2
- package/src/project-graph/build-project-graph.js +5 -5
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/file-utils.d.ts +1 -17
- package/src/project-graph/file-utils.js +8 -48
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/project-graph/nx-deps-cache.d.ts +2 -2
- package/src/project-graph/nx-deps-cache.js.map +1 -1
- package/src/project-graph/project-graph.js +2 -1
- package/src/project-graph/project-graph.js.map +1 -1
- package/src/tasks-runner/batch/run-batch.js +6 -6
- package/src/tasks-runner/batch/run-batch.js.map +1 -1
- package/src/tasks-runner/cache.js +2 -2
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/create-task-graph.d.ts +21 -0
- package/src/tasks-runner/create-task-graph.js +138 -0
- package/src/tasks-runner/create-task-graph.js.map +1 -0
- package/src/tasks-runner/default-tasks-runner.js +2 -5
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +10 -4
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +12 -12
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +1 -1
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/run-command.d.ts +0 -12
- package/src/tasks-runner/run-command.js +30 -193
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-graph-utils.d.ts +3 -0
- package/src/tasks-runner/task-graph-utils.js +56 -0
- package/src/tasks-runner/task-graph-utils.js.map +1 -0
- package/src/tasks-runner/task-orchestrator.d.ts +3 -1
- package/src/tasks-runner/task-orchestrator.js +23 -11
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-runner-v2.d.ts +2 -0
- package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +4 -1
- package/src/tasks-runner/tasks-schedule.js +0 -4
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/tasks-runner/utils.js +2 -2
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/add-command-prefix.d.ts +5 -0
- package/src/utils/add-command-prefix.js +59 -0
- package/src/utils/add-command-prefix.js.map +1 -0
- package/src/utils/cache-directory.js +2 -2
- package/src/utils/cache-directory.js.map +1 -1
- package/src/utils/command-line-utils.d.ts +6 -8
- package/src/utils/command-line-utils.js +9 -13
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/find-workspace-root.js +9 -7
- package/src/utils/find-workspace-root.js.map +1 -1
- package/src/utils/nx-plugin.js +10 -10
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/output.d.ts +1 -1
- package/src/utils/output.js +2 -2
- package/src/utils/output.js.map +1 -1
- package/src/utils/params.d.ts +2 -2
- package/src/utils/params.js.map +1 -1
- package/src/utils/plugins/models.d.ts +3 -14
- package/src/utils/plugins/plugin-capabilities.js +2 -2
- package/src/utils/plugins/plugin-capabilities.js.map +1 -1
- package/src/utils/register.d.ts +8 -1
- package/src/utils/register.js +81 -10
- package/src/utils/register.js.map +1 -1
- package/src/utils/target-project-locator.js +2 -2
- package/src/utils/target-project-locator.js.map +1 -1
- package/src/utils/typescript.js +5 -5
- package/src/utils/typescript.js.map +1 -1
- package/src/utils/versions.d.ts +6 -4
- package/src/utils/versions.js +7 -5
- package/src/utils/versions.js.map +1 -1
- package/src/utils/{app-root.d.ts → workspace-root.d.ts} +5 -4
- package/src/utils/workspace-root.js +41 -0
- package/src/utils/workspace-root.js.map +1 -0
- package/bin/init.js.map +0 -1
- package/src/tasks-runner/task-graph-creator.d.ts +0 -13
- package/src/tasks-runner/task-graph-creator.js +0 -71
- package/src/tasks-runner/task-graph-creator.js.map +0 -1
- package/src/utils/app-root.js +0 -39
- package/src/utils/app-root.js.map +0 -1
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getRunner = exports.
|
|
3
|
+
exports.getRunner = exports.runCommand = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
-
const
|
|
6
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
7
7
|
const fileutils_1 = require("../utils/fileutils");
|
|
8
|
-
const project_graph_utils_1 = require("../utils/project-graph-utils");
|
|
9
8
|
const output_1 = require("../utils/output");
|
|
10
9
|
const utils_1 = require("./utils");
|
|
11
10
|
const life_cycle_1 = require("./life-cycle");
|
|
@@ -16,6 +15,8 @@ const dynamic_run_many_terminal_output_life_cycle_1 = require("./life-cycles/dyn
|
|
|
16
15
|
const task_profiling_life_cycle_1 = require("./life-cycles/task-profiling-life-cycle");
|
|
17
16
|
const is_ci_1 = require("../utils/is-ci");
|
|
18
17
|
const dynamic_run_one_terminal_output_life_cycle_1 = require("./life-cycles/dynamic-run-one-terminal-output-life-cycle");
|
|
18
|
+
const create_task_graph_1 = require("./create-task-graph");
|
|
19
|
+
const task_graph_utils_1 = require("./task-graph-utils");
|
|
19
20
|
function getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, overrides, runnerOptions) {
|
|
20
21
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
22
|
const isRunOne = initiatingProject != null;
|
|
@@ -58,14 +59,32 @@ function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides,
|
|
|
58
59
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
59
60
|
const { tasksRunner, runnerOptions } = getRunner(nxArgs, nxJson);
|
|
60
61
|
const defaultDependencyConfigs = nxJson.targetDependencies;
|
|
61
|
-
const tasks = createTasksForProjectToRun(projectsToRun, {
|
|
62
|
-
target: nxArgs.target,
|
|
63
|
-
configuration: nxArgs.configuration,
|
|
64
|
-
overrides,
|
|
65
|
-
}, projectGraph, initiatingProject, defaultDependencyConfigs);
|
|
66
62
|
const projectNames = projectsToRun.map((t) => t.name);
|
|
63
|
+
const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, projectNames, [nxArgs.target], nxArgs.configuration, overrides);
|
|
64
|
+
const cycle = (0, task_graph_utils_1.findCycle)(taskGraph);
|
|
65
|
+
if (cycle) {
|
|
66
|
+
if (nxArgs.nxIgnoreCycles) {
|
|
67
|
+
output_1.output.warn({
|
|
68
|
+
title: `The task graph has a circular dependency`,
|
|
69
|
+
bodyLines: [`${cycle.join(' --> ')}`],
|
|
70
|
+
});
|
|
71
|
+
(0, task_graph_utils_1.makeAcyclic)(taskGraph);
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
output_1.output.error({
|
|
75
|
+
title: `Could not execute command because the task graph has a circular dependency`,
|
|
76
|
+
bodyLines: [`${cycle.join(' --> ')}`],
|
|
77
|
+
});
|
|
78
|
+
process.exit(1);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
const tasks = Object.values(taskGraph.tasks);
|
|
67
82
|
if (nxArgs.outputStyle == 'stream') {
|
|
68
83
|
process.env.NX_STREAM_OUTPUT = 'true';
|
|
84
|
+
process.env.NX_PREFIX_OUTPUT = 'true';
|
|
85
|
+
}
|
|
86
|
+
if (nxArgs.outputStyle == 'stream-without-prefixes') {
|
|
87
|
+
process.env.NX_STREAM_OUTPUT = 'true';
|
|
69
88
|
}
|
|
70
89
|
const { lifeCycle, renderIsDone } = yield getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, overrides, runnerOptions);
|
|
71
90
|
const lifeCycles = [lifeCycle];
|
|
@@ -80,6 +99,8 @@ function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides,
|
|
|
80
99
|
target: nxArgs.target,
|
|
81
100
|
projectGraph,
|
|
82
101
|
nxJson,
|
|
102
|
+
nxArgs,
|
|
103
|
+
taskGraph,
|
|
83
104
|
});
|
|
84
105
|
let anyFailures;
|
|
85
106
|
try {
|
|
@@ -131,16 +152,6 @@ function anyFailuresInObservable(obs) {
|
|
|
131
152
|
});
|
|
132
153
|
});
|
|
133
154
|
}
|
|
134
|
-
function createTasksForProjectToRun(projectsToRun, params, projectGraph, initiatingProject, defaultDependencyConfigs = {}) {
|
|
135
|
-
var _a, _b;
|
|
136
|
-
const tasksMap = new Map();
|
|
137
|
-
const seenSet = new Set();
|
|
138
|
-
for (const project of projectsToRun) {
|
|
139
|
-
addTasksForProjectTarget(Object.assign(Object.assign({ project }, params), { errorIfCannotFindConfiguration: project.name === initiatingProject }), defaultDependencyConfigs, projectGraph, (_b = (_a = project.data.targets) === null || _a === void 0 ? void 0 : _a[params.target]) === null || _b === void 0 ? void 0 : _b.executor, tasksMap, [], seenSet);
|
|
140
|
-
}
|
|
141
|
-
return Array.from(tasksMap.values());
|
|
142
|
-
}
|
|
143
|
-
exports.createTasksForProjectToRun = createTasksForProjectToRun;
|
|
144
155
|
function shouldUseDynamicLifeCycle(tasks, options, outputStyle) {
|
|
145
156
|
if (!process.stdout.isTTY)
|
|
146
157
|
return false;
|
|
@@ -151,171 +162,15 @@ function shouldUseDynamicLifeCycle(tasks, options, outputStyle) {
|
|
|
151
162
|
const noForwarding = !tasks.find((t) => (0, utils_1.shouldStreamOutput)(t, null, options));
|
|
152
163
|
return noForwarding;
|
|
153
164
|
}
|
|
154
|
-
function addTasksForProjectTarget({ project, target, configuration, overrides, errorIfCannotFindConfiguration, }, defaultDependencyConfigs = {}, projectGraph, originalTargetExecutor, tasksMap, path, seenSet) {
|
|
155
|
-
var _a, _b;
|
|
156
|
-
const task = createTask({
|
|
157
|
-
project,
|
|
158
|
-
target,
|
|
159
|
-
configuration,
|
|
160
|
-
overrides: ((_b = (_a = project.data.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.executor) === originalTargetExecutor
|
|
161
|
-
? overrides
|
|
162
|
-
: {},
|
|
163
|
-
errorIfCannotFindConfiguration,
|
|
164
|
-
});
|
|
165
|
-
const dependencyConfigs = (0, utils_1.getDependencyConfigs)({ project: project.name, target }, defaultDependencyConfigs, projectGraph);
|
|
166
|
-
if (dependencyConfigs) {
|
|
167
|
-
for (const dependencyConfig of dependencyConfigs) {
|
|
168
|
-
addTasksForProjectDependencyConfig(project, {
|
|
169
|
-
target,
|
|
170
|
-
configuration,
|
|
171
|
-
overrides,
|
|
172
|
-
}, dependencyConfig, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, path, seenSet);
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
tasksMap.set(task.id, task);
|
|
176
|
-
}
|
|
177
|
-
function createTask({ project, target, configuration, overrides, errorIfCannotFindConfiguration, }) {
|
|
178
|
-
var _a, _b;
|
|
179
|
-
if (!(0, project_graph_utils_1.projectHasTarget)(project, target)) {
|
|
180
|
-
output_1.output.error({
|
|
181
|
-
title: `Cannot find target '${target}' for project '${project.name}'`,
|
|
182
|
-
});
|
|
183
|
-
process.exit(1);
|
|
184
|
-
}
|
|
185
|
-
configuration !== null && configuration !== void 0 ? configuration : (configuration = (_b = (_a = project.data.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.defaultConfiguration);
|
|
186
|
-
const config = (0, project_graph_utils_1.projectHasTargetAndConfiguration)(project, target, configuration)
|
|
187
|
-
? configuration
|
|
188
|
-
: undefined;
|
|
189
|
-
if (errorIfCannotFindConfiguration && configuration && !config) {
|
|
190
|
-
output_1.output.error({
|
|
191
|
-
title: `Cannot find configuration '${configuration}' for project '${project.name}:${target}'`,
|
|
192
|
-
});
|
|
193
|
-
process.exit(1);
|
|
194
|
-
}
|
|
195
|
-
const qualifiedTarget = {
|
|
196
|
-
project: project.name,
|
|
197
|
-
target,
|
|
198
|
-
configuration: config,
|
|
199
|
-
};
|
|
200
|
-
return {
|
|
201
|
-
id: getId(qualifiedTarget),
|
|
202
|
-
target: qualifiedTarget,
|
|
203
|
-
projectRoot: project.data.root,
|
|
204
|
-
overrides: interpolateOverrides(overrides, project.name, project.data),
|
|
205
|
-
};
|
|
206
|
-
}
|
|
207
|
-
exports.createTask = createTask;
|
|
208
|
-
function addTasksForProjectDependencyConfig(project, { target, configuration, overrides, }, dependencyConfig, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, path, seenSet) {
|
|
209
|
-
const targetIdentifier = getId({
|
|
210
|
-
project: project.name,
|
|
211
|
-
target,
|
|
212
|
-
configuration,
|
|
213
|
-
});
|
|
214
|
-
const pathFragment = {
|
|
215
|
-
targetIdentifier,
|
|
216
|
-
hasTarget: (0, project_graph_utils_1.projectHasTarget)(project, target),
|
|
217
|
-
};
|
|
218
|
-
const newPath = [...path, pathFragment];
|
|
219
|
-
seenSet.add(targetIdentifier);
|
|
220
|
-
if (tasksMap.has(targetIdentifier)) {
|
|
221
|
-
return;
|
|
222
|
-
}
|
|
223
|
-
if (dependencyConfig.projects === 'dependencies') {
|
|
224
|
-
const dependencies = projectGraph.dependencies[project.name];
|
|
225
|
-
if (dependencies) {
|
|
226
|
-
for (const dep of dependencies) {
|
|
227
|
-
const depProject = projectGraph.nodes[dep.target];
|
|
228
|
-
if (depProject &&
|
|
229
|
-
(0, project_graph_utils_1.projectHasTarget)(depProject, dependencyConfig.target)) {
|
|
230
|
-
const depTargetId = getId({
|
|
231
|
-
project: depProject.name,
|
|
232
|
-
target: dependencyConfig.target,
|
|
233
|
-
configuration: configuration,
|
|
234
|
-
});
|
|
235
|
-
exitOnCircularDep(newPath, depTargetId);
|
|
236
|
-
if (seenSet.has(depTargetId)) {
|
|
237
|
-
continue;
|
|
238
|
-
}
|
|
239
|
-
addTasksForProjectTarget({
|
|
240
|
-
project: depProject,
|
|
241
|
-
target: dependencyConfig.target,
|
|
242
|
-
configuration,
|
|
243
|
-
overrides,
|
|
244
|
-
errorIfCannotFindConfiguration: false,
|
|
245
|
-
}, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, newPath, seenSet);
|
|
246
|
-
}
|
|
247
|
-
else {
|
|
248
|
-
if (!depProject) {
|
|
249
|
-
continue;
|
|
250
|
-
}
|
|
251
|
-
const depTargetId = getId({
|
|
252
|
-
project: depProject.name,
|
|
253
|
-
target: dependencyConfig.target,
|
|
254
|
-
configuration: configuration,
|
|
255
|
-
});
|
|
256
|
-
exitOnCircularDep(newPath, depTargetId);
|
|
257
|
-
if (seenSet.has(depTargetId)) {
|
|
258
|
-
continue;
|
|
259
|
-
}
|
|
260
|
-
addTasksForProjectDependencyConfig(depProject, { target, configuration, overrides }, dependencyConfig, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, newPath, seenSet);
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
}
|
|
265
|
-
else if ((0, project_graph_utils_1.projectHasTarget)(project, dependencyConfig.target)) {
|
|
266
|
-
addTasksForProjectTarget({
|
|
267
|
-
project,
|
|
268
|
-
target: dependencyConfig.target,
|
|
269
|
-
configuration,
|
|
270
|
-
overrides,
|
|
271
|
-
errorIfCannotFindConfiguration: false,
|
|
272
|
-
}, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, newPath, seenSet);
|
|
273
|
-
}
|
|
274
|
-
}
|
|
275
|
-
function exitOnCircularDep(path, targetIdentifier) {
|
|
276
|
-
if (path.length > 0 &&
|
|
277
|
-
path[path.length - 1].hasTarget &&
|
|
278
|
-
path.filter((p) => p.targetIdentifier === targetIdentifier).length > 0) {
|
|
279
|
-
const identifiers = path.map((p) => p.targetIdentifier);
|
|
280
|
-
output_1.output.error({
|
|
281
|
-
title: `Could not execute ${identifiers[0]} because it has a circular dependency`,
|
|
282
|
-
bodyLines: [`${[...identifiers, targetIdentifier].join(' --> ')}`],
|
|
283
|
-
});
|
|
284
|
-
process.exit(1);
|
|
285
|
-
}
|
|
286
|
-
}
|
|
287
|
-
function getId({ project, target, configuration, }) {
|
|
288
|
-
let id = `${project}:${target}`;
|
|
289
|
-
if (configuration) {
|
|
290
|
-
id += `:${configuration}`;
|
|
291
|
-
}
|
|
292
|
-
return id;
|
|
293
|
-
}
|
|
294
165
|
function getRunner(nxArgs, nxJson) {
|
|
295
166
|
let runner = nxArgs.runner;
|
|
296
|
-
//TODO: vsavkin remove in Nx 12
|
|
297
|
-
if (!nxJson.tasksRunnerOptions) {
|
|
298
|
-
const t = require('./default-tasks-runner');
|
|
299
|
-
return {
|
|
300
|
-
tasksRunner: t.defaultTasksRunner,
|
|
301
|
-
runnerOptions: nxArgs,
|
|
302
|
-
};
|
|
303
|
-
}
|
|
304
|
-
//TODO: vsavkin remove in Nx 12
|
|
305
|
-
if (!runner && !nxJson.tasksRunnerOptions.default) {
|
|
306
|
-
const t = require('./default-tasks-runner');
|
|
307
|
-
return {
|
|
308
|
-
tasksRunner: t.defaultTasksRunner,
|
|
309
|
-
runnerOptions: nxArgs,
|
|
310
|
-
};
|
|
311
|
-
}
|
|
312
167
|
runner = runner || 'default';
|
|
313
168
|
if (nxJson.tasksRunnerOptions[runner]) {
|
|
314
169
|
let modulePath = nxJson.tasksRunnerOptions[runner].runner;
|
|
315
170
|
let tasksRunner;
|
|
316
171
|
if (modulePath) {
|
|
317
172
|
if ((0, fileutils_1.isRelativePath)(modulePath)) {
|
|
318
|
-
modulePath = (0, path_1.join)(
|
|
173
|
+
modulePath = (0, path_1.join)(workspace_root_1.workspaceRoot, modulePath);
|
|
319
174
|
}
|
|
320
175
|
tasksRunner = require(modulePath);
|
|
321
176
|
// to support both babel and ts formats
|
|
@@ -339,22 +194,4 @@ function getRunner(nxArgs, nxJson) {
|
|
|
339
194
|
}
|
|
340
195
|
}
|
|
341
196
|
exports.getRunner = getRunner;
|
|
342
|
-
function interpolateOverrides(args, projectName, projectMetadata) {
|
|
343
|
-
const interpolatedArgs = Object.assign({}, args);
|
|
344
|
-
Object.entries(interpolatedArgs).forEach(([name, value]) => {
|
|
345
|
-
if (typeof value === 'string') {
|
|
346
|
-
const regex = /{project\.([^}]+)}/g;
|
|
347
|
-
interpolatedArgs[name] = value.replace(regex, (_, group) => {
|
|
348
|
-
if (group.includes('.')) {
|
|
349
|
-
throw new Error('Only top-level properties can be interpolated');
|
|
350
|
-
}
|
|
351
|
-
if (group === 'name') {
|
|
352
|
-
return projectName;
|
|
353
|
-
}
|
|
354
|
-
return projectMetadata[group];
|
|
355
|
-
});
|
|
356
|
-
}
|
|
357
|
-
});
|
|
358
|
-
return interpolatedArgs;
|
|
359
|
-
}
|
|
360
197
|
//# sourceMappingURL=run-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.makeAcyclic = exports.findCycle = void 0;
|
|
4
|
+
function _findCycle(taskGraph, taskId, visited, path) {
|
|
5
|
+
if (visited[taskId])
|
|
6
|
+
return null;
|
|
7
|
+
visited[taskId] = true;
|
|
8
|
+
for (const d of taskGraph.dependencies[taskId]) {
|
|
9
|
+
if (path.includes(d))
|
|
10
|
+
return [...path, d];
|
|
11
|
+
const cycle = _findCycle(taskGraph, d, visited, [...path, d]);
|
|
12
|
+
if (cycle)
|
|
13
|
+
return cycle;
|
|
14
|
+
}
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
function findCycle(taskGraph) {
|
|
18
|
+
const visited = {};
|
|
19
|
+
for (const t of Object.keys(taskGraph.dependencies)) {
|
|
20
|
+
visited[t] = false;
|
|
21
|
+
}
|
|
22
|
+
for (const t of Object.keys(taskGraph.dependencies)) {
|
|
23
|
+
const cycle = _findCycle(taskGraph, t, visited, [t]);
|
|
24
|
+
if (cycle)
|
|
25
|
+
return cycle;
|
|
26
|
+
}
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
exports.findCycle = findCycle;
|
|
30
|
+
function _makeAcyclic(taskGraph, taskId, visited, path) {
|
|
31
|
+
if (visited[taskId])
|
|
32
|
+
return;
|
|
33
|
+
visited[taskId] = true;
|
|
34
|
+
const deps = taskGraph.dependencies[taskId];
|
|
35
|
+
for (const d of [...deps]) {
|
|
36
|
+
if (path.includes(d)) {
|
|
37
|
+
deps.splice(deps.indexOf(d), 1);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
_makeAcyclic(taskGraph, d, visited, [...path, d]);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
function makeAcyclic(taskGraph) {
|
|
46
|
+
const visited = {};
|
|
47
|
+
for (const t of Object.keys(taskGraph.dependencies)) {
|
|
48
|
+
visited[t] = false;
|
|
49
|
+
}
|
|
50
|
+
for (const t of Object.keys(taskGraph.dependencies)) {
|
|
51
|
+
_makeAcyclic(taskGraph, t, visited, [t]);
|
|
52
|
+
}
|
|
53
|
+
taskGraph.roots = Object.keys(taskGraph.dependencies).filter((t) => taskGraph.dependencies[t].length === 0);
|
|
54
|
+
}
|
|
55
|
+
exports.makeAcyclic = makeAcyclic;
|
|
56
|
+
//# sourceMappingURL=task-graph-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-graph-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-graph-utils.ts"],"names":[],"mappings":";;;AAEA,SAAS,UAAU,CACjB,SAAoB,EACpB,MAAc,EACd,OAAsC,EACtC,IAAc;IAEd,IAAI,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IACjC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAEvB,KAAK,MAAM,CAAC,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;QAC9C,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;KACzB;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,SAAS,CAAC,SAAoB;IAC5C,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;QACnD,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;KACpB;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;QACnD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;KACzB;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAZD,8BAYC;AAED,SAAS,YAAY,CACnB,SAAoB,EACpB,MAAc,EACd,OAAsC,EACtC,IAAc;IAEd,IAAI,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO;IAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAEvB,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC5C,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE;QACzB,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACjC;aAAM;YACL,YAAY,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SACnD;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,WAAW,CAAC,SAAoB;IAC9C,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;QACnD,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;KACpB;IACD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;QACnD,YAAY,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;KAC1C;IACD,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,MAAM,CAC1D,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAC9C,CAAC;AACJ,CAAC;AAXD,kCAWC"}
|
|
@@ -9,6 +9,7 @@ export declare class TaskOrchestrator {
|
|
|
9
9
|
private readonly projectGraph;
|
|
10
10
|
private readonly taskGraph;
|
|
11
11
|
private readonly options;
|
|
12
|
+
private readonly bail;
|
|
12
13
|
private cache;
|
|
13
14
|
private workspace;
|
|
14
15
|
private forkedProcessTaskRunner;
|
|
@@ -17,7 +18,8 @@ export declare class TaskOrchestrator {
|
|
|
17
18
|
private completedTasks;
|
|
18
19
|
private waitingForTasks;
|
|
19
20
|
private groups;
|
|
20
|
-
|
|
21
|
+
private bailed;
|
|
22
|
+
constructor(hasher: Hasher, initiatingProject: string | undefined, projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions, bail: boolean);
|
|
21
23
|
run(): Promise<{
|
|
22
24
|
[id: string]: TaskStatus;
|
|
23
25
|
}>;
|
|
@@ -5,20 +5,21 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const workspaces_1 = require("../config/workspaces");
|
|
6
6
|
const perf_hooks_1 = require("perf_hooks");
|
|
7
7
|
const forked_process_task_runner_1 = require("./forked-process-task-runner");
|
|
8
|
-
const
|
|
8
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
9
9
|
const cache_1 = require("./cache");
|
|
10
10
|
const utils_1 = require("./utils");
|
|
11
11
|
const tasks_schedule_1 = require("./tasks-schedule");
|
|
12
12
|
class TaskOrchestrator {
|
|
13
13
|
// endregion internal state
|
|
14
|
-
constructor(hasher, initiatingProject, projectGraph, taskGraph, options) {
|
|
14
|
+
constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail) {
|
|
15
15
|
this.hasher = hasher;
|
|
16
16
|
this.initiatingProject = initiatingProject;
|
|
17
17
|
this.projectGraph = projectGraph;
|
|
18
18
|
this.taskGraph = taskGraph;
|
|
19
19
|
this.options = options;
|
|
20
|
+
this.bail = bail;
|
|
20
21
|
this.cache = new cache_1.Cache(this.options);
|
|
21
|
-
this.workspace = new workspaces_1.Workspaces(
|
|
22
|
+
this.workspace = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
|
|
22
23
|
this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
|
|
23
24
|
this.tasksSchedule = new tasks_schedule_1.TasksSchedule(this.hasher, this.projectGraph, this.taskGraph, this.workspace, this.options);
|
|
24
25
|
// region internal state
|
|
@@ -26,6 +27,7 @@ class TaskOrchestrator {
|
|
|
26
27
|
this.completedTasks = {};
|
|
27
28
|
this.waitingForTasks = [];
|
|
28
29
|
this.groups = [];
|
|
30
|
+
this.bailed = false;
|
|
29
31
|
}
|
|
30
32
|
run() {
|
|
31
33
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -47,7 +49,7 @@ class TaskOrchestrator {
|
|
|
47
49
|
executeNextBatchOfTasksUsingTaskSchedule() {
|
|
48
50
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
49
51
|
// completed all the tasks
|
|
50
|
-
if (!this.tasksSchedule.hasTasks()) {
|
|
52
|
+
if (!this.tasksSchedule.hasTasks() || this.bailed) {
|
|
51
53
|
return null;
|
|
52
54
|
}
|
|
53
55
|
const doNotSkipCache = this.options.skipNxCache === false ||
|
|
@@ -260,12 +262,21 @@ class TaskOrchestrator {
|
|
|
260
262
|
for (const { taskId, status } of taskResults) {
|
|
261
263
|
if (this.completedTasks[taskId] === undefined) {
|
|
262
264
|
this.completedTasks[taskId] = status;
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
265
|
+
if (status === 'failure' || status === 'skipped') {
|
|
266
|
+
if (this.bail) {
|
|
267
|
+
// mark the execution as bailed which will stop all further execution
|
|
268
|
+
// only the tasks that are currently running will finish
|
|
269
|
+
this.bailed = true;
|
|
270
|
+
}
|
|
271
|
+
else {
|
|
272
|
+
// only mark the packages that depend on the current task as skipped
|
|
273
|
+
// other tasks will continue to execute
|
|
274
|
+
this.complete(this.reverseTaskDeps[taskId].map((depTaskId) => ({
|
|
275
|
+
taskId: depTaskId,
|
|
276
|
+
status: 'skipped',
|
|
277
|
+
})));
|
|
278
|
+
}
|
|
279
|
+
}
|
|
269
280
|
}
|
|
270
281
|
}
|
|
271
282
|
}
|
|
@@ -273,7 +284,8 @@ class TaskOrchestrator {
|
|
|
273
284
|
// region utils
|
|
274
285
|
pipeOutputCapture(task) {
|
|
275
286
|
try {
|
|
276
|
-
return ((0, utils_1.getExecutorForTask)(task, this.workspace).schema.outputCapture ===
|
|
287
|
+
return ((0, utils_1.getExecutorForTask)(task, this.workspace).schema.outputCapture ===
|
|
288
|
+
'pipe' || process.env.NX_STREAM_OUTPUT === 'true');
|
|
277
289
|
}
|
|
278
290
|
catch (e) {
|
|
279
291
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { DefaultTasksRunnerOptions } from './default-tasks-runner';
|
|
|
2
2
|
import { ProjectGraph } from '../config/project-graph';
|
|
3
3
|
import { NxJsonConfiguration } from '../config/nx-json';
|
|
4
4
|
import { Task } from '../config/task-graph';
|
|
5
|
+
import { NxArgs } from '../utils/command-line-utils';
|
|
5
6
|
export { DefaultTasksRunnerOptions, RemoteCache } from './default-tasks-runner';
|
|
6
7
|
/**
|
|
7
8
|
* TODO: Remove after NX 15 is released
|
|
@@ -15,5 +16,6 @@ export declare const tasksRunnerV2: (tasks: Task[], options: DefaultTasksRunnerO
|
|
|
15
16
|
initiatingProject?: string;
|
|
16
17
|
projectGraph: ProjectGraph;
|
|
17
18
|
nxJson: NxJsonConfiguration;
|
|
19
|
+
nxArgs: NxArgs;
|
|
18
20
|
}) => any;
|
|
19
21
|
export default tasksRunnerV2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks-runner-v2.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-runner-v2.ts"],"names":[],"mappings":";;;AAAA,iEAGgC;
|
|
1
|
+
{"version":3,"file":"tasks-runner-v2.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-runner-v2.ts"],"names":[],"mappings":";;;AAAA,iEAGgC;AAShC;;;;;;GAMG;AACI,MAAM,aAAa,GAAG,CAC3B,KAAa,EACb,OAAkC,EAClC,OAMC,EACI,EAAE;IACP,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE;QACnC,MAAM,IAAI,KAAK,CACb,6EAA6E,CAC9E,CAAC;KACH;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACrD,MAAM,CAAC,GAAG,IAAI,OAAO,EAAE,CAAC;IACvB,IAAA,yCAAkB,EAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAS;SACjD,IAAI,CAAC,CAAC,KAAmC,EAAE,EAAE;QAC5C,mCAAmC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC,CAAC,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACX,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACX,CAAC,CAAC,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IAEL,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AA9BW,QAAA,aAAa,iBA8BxB;AAEF,SAAS,mCAAmC,CAAC,cAE5C;IACC,OAAO,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAO,EAAE;QACrD,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAC1C,OAAO;YACL,OAAO,EACL,UAAU,KAAK,SAAS;gBACvB,UAAkB,KAAK,OAAO;gBAC/B,UAAU,KAAK,aAAa;gBAC5B,UAAU,KAAK,2BAA2B;gBAC1C,UAAU,KAAK,cAAc;SAChC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kBAAe,qBAAa,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { NxJsonConfiguration } from '../config/nx-json';
|
|
2
2
|
import { ProjectGraph } from '../config/project-graph';
|
|
3
|
-
import { Task } from '../config/task-graph';
|
|
3
|
+
import { Task, TaskGraph } from '../config/task-graph';
|
|
4
|
+
import { NxArgs } from '../utils/command-line-utils';
|
|
4
5
|
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'local-cache-kept-existing' | 'local-cache' | 'remote-cache';
|
|
5
6
|
/**
|
|
6
7
|
* `any | Promise<{ [id: string]: TaskStatus }>`
|
|
@@ -11,6 +12,8 @@ export declare type TasksRunner<T = unknown> = (tasks: Task[], options: T, conte
|
|
|
11
12
|
initiatingProject?: string | null;
|
|
12
13
|
projectGraph: ProjectGraph;
|
|
13
14
|
nxJson: NxJsonConfiguration;
|
|
15
|
+
nxArgs: NxArgs;
|
|
16
|
+
taskGraph?: TaskGraph;
|
|
14
17
|
}) => any | Promise<{
|
|
15
18
|
[id: string]: TaskStatus;
|
|
16
19
|
}>;
|
|
@@ -59,10 +59,6 @@ class TasksSchedule {
|
|
|
59
59
|
yield this.hashTask(task);
|
|
60
60
|
this.notScheduledTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(this.notScheduledTaskGraph, [taskId]);
|
|
61
61
|
this.scheduledTasks.push(taskId);
|
|
62
|
-
// TODO vsavkin: remove the if statement after Nx 14 is out
|
|
63
|
-
if (this.options.lifeCycle.scheduleTask) {
|
|
64
|
-
this.options.lifeCycle.scheduleTask(task);
|
|
65
|
-
}
|
|
66
62
|
});
|
|
67
63
|
}
|
|
68
64
|
scheduleBatches() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks-schedule.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":";;;;AAEA,mCAMiB;AAWjB,MAAa,aAAa;IAUxB,YACmB,MAAc,EACd,YAA0B,EAC1B,SAAoB,EACpB,UAAsB,EACtB,OAAkC;QAJlC,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAc;QAC1B,cAAS,GAAT,SAAS,CAAW;QACpB,eAAU,GAAV,UAAU,CAAY;QACtB,YAAO,GAAP,OAAO,CAA2B;QAd7C,0BAAqB,GAAG,IAAI,CAAC,SAAS,CAAC;QACvC,oBAAe,GAAG,IAAA,4BAAoB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEvD,qBAAgB,GAAY,EAAE,CAAC;QAE/B,mBAAc,GAAa,EAAE,CAAC;QAE9B,mBAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IAQxC,CAAC;IAES,iBAAiB;;YAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM,EAAE;gBACxC,IAAI,CAAC,eAAe,EAAE,CAAC;aACxB;YACD,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE;gBACjD,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;oBAC7B,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;iBAC/B;aACF;QACH,CAAC;KAAA;IAEM,QAAQ;QACb,OAAO,CACL,IAAI,CAAC,gBAAgB,CAAC,MAAM;YAC1B,IAAI,CAAC,cAAc,CAAC,MAAM;YAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,MAAM;YACtD,CAAC,CACF,CAAC;IACJ,CAAC;IAEM,QAAQ,CAAC,OAAiB;QAC/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACjC;QACD,IAAI,CAAC,qBAAqB,GAAG,IAAA,gCAAwB,EACnD,IAAI,CAAC,qBAAqB,EAC1B,OAAO,CACR,CAAC;IACJ,CAAC;IAEM,QAAQ;QACb,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC;SAC1D;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE;YAC/B,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAEa,YAAY,CAAC,MAAc;;YACvC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC1C,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE1B,IAAI,CAAC,qBAAqB,GAAG,IAAA,gCAAwB,EACnD,IAAI,CAAC,qBAAqB,EAC1B,CAAC,MAAM,CAAC,CACT,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tasks-schedule.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const fs_1 = require("fs");
|
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const nx_plugin_1 = require("../utils/nx-plugin");
|
|
10
10
|
const package_manager_1 = require("../utils/package-manager");
|
|
11
|
-
const
|
|
11
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
12
12
|
function getCommandAsString(task) {
|
|
13
13
|
const execCommand = (0, package_manager_1.getPackageManagerCommand)().exec;
|
|
14
14
|
const args = getPrintableCommandArgsForTask(task);
|
|
@@ -135,7 +135,7 @@ function interpolateOutputs(template, data) {
|
|
|
135
135
|
function getExecutorNameForTask(task, workspace) {
|
|
136
136
|
const workspaceConfiguration = workspace.readWorkspaceConfiguration();
|
|
137
137
|
const project = workspaceConfiguration.projects[task.target.project];
|
|
138
|
-
const projectRoot = (0, path_1.join)(
|
|
138
|
+
const projectRoot = (0, path_1.join)(workspace_root_1.workspaceRoot, project.root);
|
|
139
139
|
if ((0, fs_1.existsSync)((0, path_1.join)(projectRoot, 'package.json'))) {
|
|
140
140
|
project.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(projectRoot, project.targets);
|
|
141
141
|
}
|