nx 14.5.4 → 14.5.6
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/package.json +4 -4
- package/src/adapter/compat.js +15 -2
- package/src/adapter/compat.js.map +1 -1
- package/src/command-line/generate.d.ts +1 -1
- package/src/command-line/generate.js +39 -18
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/list.js +5 -0
- package/src/command-line/list.js.map +1 -1
- package/src/command-line/migrate.js +44 -25
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/repair.d.ts +1 -1
- package/src/command-line/repair.js +10 -5
- package/src/command-line/repair.js.map +1 -1
- package/src/command-line/report.d.ts +1 -1
- package/src/command-line/report.js +38 -20
- package/src/command-line/report.js.map +1 -1
- package/src/core/dep-graph/3rdpartylicenses.txt +0 -229
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/main.esm.js.LICENSE.txt +4 -9
- package/src/core/dep-graph/polyfills.esm.js +1 -1
- package/src/core/dep-graph/styles.css +2 -2
- package/src/generators/testing-utils/create-tree-with-empty-workspace.d.ts +2 -1
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js +13 -4
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js.map +1 -1
- package/src/hasher/hash-task.d.ts +6 -0
- package/src/hasher/hash-task.js +30 -0
- package/src/hasher/hash-task.js.map +1 -0
- package/src/hasher/hasher.d.ts +3 -1
- package/src/hasher/hasher.js +95 -64
- package/src/hasher/hasher.js.map +1 -1
- package/src/tasks-runner/cache.d.ts +1 -3
- package/src/tasks-runner/cache.js +12 -55
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/default-tasks-runner.js +1 -3
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/life-cycles/formatting-utils.js +12 -1
- package/src/tasks-runner/life-cycles/formatting-utils.js.map +1 -1
- package/src/tasks-runner/run-command.js +17 -0
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +2 -0
- package/src/tasks-runner/tasks-schedule.d.ts +0 -1
- package/src/tasks-runner/tasks-schedule.js +4 -17
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/utils/nx-plugin.js +1 -1
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/package-json.d.ts +18 -0
- package/src/utils/package-json.js +28 -5
- package/src/utils/package-json.js.map +1 -1
- package/src/utils/package-manager.d.ts +0 -1
- package/src/utils/package-manager.js +16 -13
- package/src/utils/package-manager.js.map +1 -1
- package/src/utils/plugins/local-plugins.d.ts +4 -0
- package/src/utils/plugins/local-plugins.js +59 -0
- package/src/utils/plugins/local-plugins.js.map +1 -0
- package/src/utils/plugins/plugin-capabilities.js +2 -2
- package/src/utils/plugins/plugin-capabilities.js.map +1 -1
|
@@ -143,7 +143,7 @@ class Cache {
|
|
|
143
143
|
const collapsedOutputsInCache = collapseExpandedOutputs(outputsInCache);
|
|
144
144
|
const [latestHashesDifferent, outputMissing] = yield Promise.all([
|
|
145
145
|
this.areLatestOutputsHashesDifferentThanTaskHash(collapsedOutputsInCache, taskWithCachedResult),
|
|
146
|
-
this.
|
|
146
|
+
this.isAnyOutputMissing(outputsInCache, outputsInWorkspace),
|
|
147
147
|
]);
|
|
148
148
|
return latestHashesDifferent || outputMissing;
|
|
149
149
|
});
|
|
@@ -253,67 +253,24 @@ class Cache {
|
|
|
253
253
|
}
|
|
254
254
|
});
|
|
255
255
|
}
|
|
256
|
-
|
|
256
|
+
isAnyOutputMissing(outputsInCache, outputsInWorkspace) {
|
|
257
257
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
258
|
+
for (let i = 0; i < outputsInCache.length; i++) {
|
|
259
|
+
const cacheOutputPath = outputsInCache[i];
|
|
260
|
+
const workspaceOutputPath = outputsInWorkspace[i];
|
|
261
|
+
const cacheExists = yield (0, fs_extra_1.pathExists)(cacheOutputPath);
|
|
262
|
+
const rootExists = yield (0, fs_extra_1.pathExists)(workspaceOutputPath);
|
|
263
|
+
if (!cacheExists || !rootExists)
|
|
261
264
|
return true;
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
+
if ((yield (0, fs_extra_1.lstat)(cacheOutputPath)).isDirectory() &&
|
|
266
|
+
(yield (0, fs_extra_1.lstat)(workspaceOutputPath)).isDirectory() &&
|
|
267
|
+
(yield (0, fs_extra_1.readdir)(cacheOutputPath)).length !==
|
|
268
|
+
(yield (0, fs_extra_1.readdir)(workspaceOutputPath)).length)
|
|
265
269
|
return true;
|
|
266
|
-
}
|
|
267
|
-
if (!isFile) {
|
|
268
|
-
const [cachedFiles, workspaceFiles] = yield Promise.all([
|
|
269
|
-
this.getFilesInDirectory((0, path_1.join)(result.cachedResult.outputsPath, path)),
|
|
270
|
-
this.getFilesInDirectory((0, path_1.join)(workspace_root_1.workspaceRoot, path)),
|
|
271
|
-
]);
|
|
272
|
-
if (workspaceFiles.size !== cachedFiles.size) {
|
|
273
|
-
return true;
|
|
274
|
-
}
|
|
275
|
-
for (const file of cachedFiles) {
|
|
276
|
-
if (!workspaceFiles.has(file)) {
|
|
277
|
-
return true;
|
|
278
|
-
}
|
|
279
|
-
workspaceFiles.delete(file);
|
|
280
|
-
}
|
|
281
|
-
if (workspaceFiles.size !== 0) {
|
|
282
|
-
return true;
|
|
283
|
-
}
|
|
284
|
-
}
|
|
285
|
-
workspaceSet.delete(path);
|
|
286
|
-
}
|
|
287
|
-
if (workspaceSet.size !== 0) {
|
|
288
|
-
return true;
|
|
289
270
|
}
|
|
290
271
|
return false;
|
|
291
272
|
});
|
|
292
273
|
}
|
|
293
|
-
getFilesInDirectory(path) {
|
|
294
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
295
|
-
const paths = new Set();
|
|
296
|
-
yield this.visitDirectory(path, (entry) => {
|
|
297
|
-
paths.add((0, path_1.relative)(path, entry));
|
|
298
|
-
});
|
|
299
|
-
return paths;
|
|
300
|
-
});
|
|
301
|
-
}
|
|
302
|
-
visitDirectory(path, visitor) {
|
|
303
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
304
|
-
const children = yield (0, fs_extra_1.readdir)((0, path_1.join)(path), {
|
|
305
|
-
withFileTypes: true,
|
|
306
|
-
});
|
|
307
|
-
yield Promise.all(children.map((child) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
308
|
-
if (child.isFile()) {
|
|
309
|
-
visitor((0, path_1.join)(path, child.name));
|
|
310
|
-
}
|
|
311
|
-
else {
|
|
312
|
-
yield this.visitDirectory((0, path_1.join)(path, child.name), visitor);
|
|
313
|
-
}
|
|
314
|
-
})));
|
|
315
|
-
});
|
|
316
|
-
}
|
|
317
274
|
getFileNameWithLatestRecordedHashForOutput(output) {
|
|
318
275
|
return (0, path_1.join)(this.latestOutputsHashesDir, `${this.getLatestOutputHashFilename(output)}.hash`);
|
|
319
276
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ exports.defaultTasksRunner = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const task_orchestrator_1 = require("./task-orchestrator");
|
|
6
6
|
const perf_hooks_1 = require("perf_hooks");
|
|
7
|
-
const hasher_1 = require("../hasher/hasher");
|
|
8
7
|
const defaultTasksRunner = (tasks, options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
9
8
|
if (options['parallel'] === 'false' ||
|
|
10
9
|
options['parallel'] === false) {
|
|
@@ -31,8 +30,7 @@ function runAllTasks(tasks, options, context) {
|
|
|
31
30
|
perf_hooks_1.performance.mark('task-graph-created');
|
|
32
31
|
perf_hooks_1.performance.measure('nx-prep-work', 'init-local', 'task-graph-created');
|
|
33
32
|
perf_hooks_1.performance.measure('graph-creation', 'command-execution-begins', 'task-graph-created');
|
|
34
|
-
const
|
|
35
|
-
const orchestrator = new task_orchestrator_1.TaskOrchestrator(hasher, context.initiatingProject, context.projectGraph, context.taskGraph, options, (_a = context.nxArgs) === null || _a === void 0 ? void 0 : _a.nxBail);
|
|
33
|
+
const orchestrator = new task_orchestrator_1.TaskOrchestrator(context.hasher, context.initiatingProject, context.projectGraph, context.taskGraph, options, (_a = context.nxArgs) === null || _a === void 0 ? void 0 : _a.nxBail);
|
|
36
34
|
return orchestrator.run();
|
|
37
35
|
});
|
|
38
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/default-tasks-runner.ts"],"names":[],"mappings":";;;;AACA,2DAAuD;AACvD,2CAAyC;
|
|
1
|
+
{"version":3,"file":"default-tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/default-tasks-runner.ts"],"names":[],"mappings":";;;;AACA,2DAAuD;AACvD,2CAAyC;AAyBlC,MAAM,kBAAkB,GAE3B,CACF,KAAa,EACb,OAAkC,EAClC,OAQC,EACsC,EAAE;IACzC,IACG,OAAe,CAAC,UAAU,CAAC,KAAK,OAAO;QACvC,OAAe,CAAC,UAAU,CAAC,KAAK,KAAK,EACtC;QACC,OAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAClC;SAAM,IACJ,OAAe,CAAC,UAAU,CAAC,KAAK,MAAM;QACtC,OAAe,CAAC,UAAU,CAAC,KAAK,IAAI;QACpC,OAAe,CAAC,UAAU,CAAC,KAAK,SAAS,EAC1C;QACC,OAAe,CAAC,UAAU,CAAC,GAAG,MAAM,CAAE,OAAe,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;KAC7E;IAED,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;IACjC,IAAI;QACF,OAAO,MAAM,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;KACnD;YAAS;QACR,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;KAChC;AACH,CAAC,CAAA,CAAC;AAlCW,QAAA,kBAAkB,sBAkC7B;AAEF,SAAe,WAAW,CACxB,KAAa,EACb,OAAkC,EAClC,OAOC;;;QAED,yCAAyC;QACzC,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAEvC,wBAAW,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,oBAAoB,CAAC,CAAC;QACxE,wBAAW,CAAC,OAAO,CACjB,gBAAgB,EAChB,0BAA0B,EAC1B,oBAAoB,CACrB,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,oCAAgB,CACvC,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,SAAS,EACjB,OAAO,EACP,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CACvB,CAAC;QAEF,OAAO,YAAY,CAAC,GAAG,EAAE,CAAC;;CAC3B;AAED,kBAAe,0BAAkB,CAAC"}
|
|
@@ -4,7 +4,18 @@ exports.formatFlags = void 0;
|
|
|
4
4
|
function formatFlags(leftPadding, flag, value) {
|
|
5
5
|
return flag == '_'
|
|
6
6
|
? `${leftPadding} ${value.join(' ')}`
|
|
7
|
-
: `${leftPadding} --${flag}=${value}`;
|
|
7
|
+
: `${leftPadding} --${flag}=${formatValue(value)}`;
|
|
8
8
|
}
|
|
9
9
|
exports.formatFlags = formatFlags;
|
|
10
|
+
function formatValue(value) {
|
|
11
|
+
if (Array.isArray(value)) {
|
|
12
|
+
return `[${value.join(',')}]`;
|
|
13
|
+
}
|
|
14
|
+
else if (typeof value === 'object') {
|
|
15
|
+
return JSON.stringify(value);
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
return value;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
10
21
|
//# sourceMappingURL=formatting-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatting-utils.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/formatting-utils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW,CACzB,WAAmB,EACnB,IAAY,EACZ,KAAU;IAEV,OAAO,IAAI,IAAI,GAAG;QAChB,CAAC,CAAC,GAAG,WAAW,KAAM,KAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACpD,CAAC,CAAC,GAAG,WAAW,OAAO,IAAI,IAAI,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"formatting-utils.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/formatting-utils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW,CACzB,WAAmB,EACnB,IAAY,EACZ,KAAU;IAEV,OAAO,IAAI,IAAI,GAAG;QAChB,CAAC,CAAC,GAAG,WAAW,KAAM,KAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACpD,CAAC,CAAC,GAAG,WAAW,OAAO,IAAI,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;AACxD,CAAC;AARD,kCAQC;AAED,SAAS,WAAW,CAAC,KAAU;IAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;KAC/B;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;KAC9B;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
|
|
@@ -18,6 +18,9 @@ const dynamic_run_one_terminal_output_life_cycle_1 = require("./life-cycles/dyna
|
|
|
18
18
|
const create_task_graph_1 = require("./create-task-graph");
|
|
19
19
|
const task_graph_utils_1 = require("./task-graph-utils");
|
|
20
20
|
const params_1 = require("../utils/params");
|
|
21
|
+
const workspaces_1 = require("nx/src/config/workspaces");
|
|
22
|
+
const hasher_1 = require("nx/src/hasher/hasher");
|
|
23
|
+
const hash_task_1 = require("nx/src/hasher/hash-task");
|
|
21
24
|
function getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, overrides, runnerOptions) {
|
|
22
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
26
|
const isRunOne = initiatingProject != null;
|
|
@@ -58,6 +61,17 @@ function getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxAr
|
|
|
58
61
|
}
|
|
59
62
|
});
|
|
60
63
|
}
|
|
64
|
+
function hashTasksThatDontDependOnOtherTasks(workspaces, hasher, projectGraph, taskGraph) {
|
|
65
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
66
|
+
const res = [];
|
|
67
|
+
for (let t of Object.values(taskGraph.tasks)) {
|
|
68
|
+
if (!(0, hash_task_1.hashDependsOnOtherTasks)(workspaces, hasher, projectGraph, taskGraph, t)) {
|
|
69
|
+
res.push((0, hash_task_1.hashTask)(workspaces, hasher, projectGraph, taskGraph, t));
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return Promise.all(res);
|
|
73
|
+
});
|
|
74
|
+
}
|
|
61
75
|
function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides, initiatingProject, extraTargetDependencies) {
|
|
62
76
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
63
77
|
const status = yield (0, params_1.handleErrors)(overrides['verbose'] === true, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -65,6 +79,8 @@ function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides,
|
|
|
65
79
|
const defaultDependencyConfigs = mergeTargetDependencies(nxJson.targetDefaults, extraTargetDependencies);
|
|
66
80
|
const projectNames = projectsToRun.map((t) => t.name);
|
|
67
81
|
const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, projectNames, [nxArgs.target], nxArgs.configuration, overrides);
|
|
82
|
+
const hasher = new hasher_1.Hasher(projectGraph, nxJson, runnerOptions);
|
|
83
|
+
yield hashTasksThatDontDependOnOtherTasks(new workspaces_1.Workspaces(workspace_root_1.workspaceRoot), hasher, projectGraph, taskGraph);
|
|
68
84
|
const cycle = (0, task_graph_utils_1.findCycle)(taskGraph);
|
|
69
85
|
if (cycle) {
|
|
70
86
|
if (nxArgs.nxIgnoreCycles) {
|
|
@@ -105,6 +121,7 @@ function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides,
|
|
|
105
121
|
nxJson,
|
|
106
122
|
nxArgs,
|
|
107
123
|
taskGraph,
|
|
124
|
+
hasher,
|
|
108
125
|
});
|
|
109
126
|
let anyFailures;
|
|
110
127
|
if (promiseOrObservable.subscribe) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":";;;;AACA,+BAA4B;AAC5B,4DAAwD;AAExD,kDAAoD;AACpD,4CAAyC;AACzC,mCAA6C;AAC7C,6CAA6D;AAC7D,yHAAgH;AAChH,uHAA8G;AAC9G,mFAA6E;AAC7E,2HAA+G;AAC/G,uFAAiF;AACjF,0CAAsC;AACtC,yHAA6G;AAQ7G,2DAAsD;AACtD,yDAA4D;AAE5D,4CAA+C;
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { NxJsonConfiguration } from '../config/nx-json';
|
|
|
2
2
|
import { ProjectGraph } from '../config/project-graph';
|
|
3
3
|
import { Task, TaskGraph } from '../config/task-graph';
|
|
4
4
|
import { NxArgs } from '../utils/command-line-utils';
|
|
5
|
+
import { Hasher } from '../hasher/hasher';
|
|
5
6
|
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'local-cache-kept-existing' | 'local-cache' | 'remote-cache';
|
|
6
7
|
/**
|
|
7
8
|
* `any | Promise<{ [id: string]: TaskStatus }>`
|
|
@@ -14,6 +15,7 @@ export declare type TasksRunner<T = unknown> = (tasks: Task[], options: T, conte
|
|
|
14
15
|
nxJson: NxJsonConfiguration;
|
|
15
16
|
nxArgs: NxArgs;
|
|
16
17
|
taskGraph?: TaskGraph;
|
|
18
|
+
hasher?: Hasher;
|
|
17
19
|
}) => any | Promise<{
|
|
18
20
|
[id: string]: TaskStatus;
|
|
19
21
|
}>;
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TasksSchedule = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
|
-
const
|
|
6
|
+
const hash_task_1 = require("../hasher/hash-task");
|
|
7
7
|
class TasksSchedule {
|
|
8
8
|
constructor(hasher, nxJson, projectGraph, taskGraph, workspaces, options) {
|
|
9
9
|
this.hasher = hasher;
|
|
@@ -58,7 +58,9 @@ class TasksSchedule {
|
|
|
58
58
|
scheduleTask(taskId) {
|
|
59
59
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
60
60
|
const task = this.taskGraph.tasks[taskId];
|
|
61
|
-
|
|
61
|
+
if (!task.hash) {
|
|
62
|
+
yield (0, hash_task_1.hashTask)(this.workspaces, this.hasher, this.projectGraph, this.taskGraph, task);
|
|
63
|
+
}
|
|
62
64
|
this.notScheduledTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(this.notScheduledTaskGraph, [taskId]);
|
|
63
65
|
this.options.lifeCycle.scheduleTask(task);
|
|
64
66
|
this.scheduledTasks.push(taskId);
|
|
@@ -109,21 +111,6 @@ class TasksSchedule {
|
|
|
109
111
|
canBeScheduled(taskId) {
|
|
110
112
|
return this.taskGraph.dependencies[taskId].every((id) => this.completedTasks.has(id));
|
|
111
113
|
}
|
|
112
|
-
hashTask(task) {
|
|
113
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
114
|
-
const customHasher = (0, utils_1.getCustomHasher)(task, this.workspaces, this.nxJson, this.projectGraph);
|
|
115
|
-
const { value, details } = yield (customHasher
|
|
116
|
-
? customHasher(task, {
|
|
117
|
-
hasher: this.hasher,
|
|
118
|
-
projectGraph: this.projectGraph,
|
|
119
|
-
taskGraph: this.taskGraph,
|
|
120
|
-
workspaceConfig: (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(this.projectGraph),
|
|
121
|
-
})
|
|
122
|
-
: this.hasher.hashTask(task));
|
|
123
|
-
task.hash = value;
|
|
124
|
-
task.hashDetails = details;
|
|
125
|
-
});
|
|
126
|
-
}
|
|
127
114
|
}
|
|
128
115
|
exports.TasksSchedule = TasksSchedule;
|
|
129
116
|
//# sourceMappingURL=tasks-schedule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks-schedule.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":";;;;AAEA,
|
|
1
|
+
{"version":3,"file":"tasks-schedule.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":";;;;AAEA,mCAKiB;AAMjB,mDAA+C;AAO/C,MAAa,aAAa;IAUxB,YACmB,MAAc,EACd,MAA2B,EAC3B,YAA0B,EAC1B,SAAoB,EACpB,UAAsB,EACtB,OAAkC;QALlC,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAqB;QAC3B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,cAAS,GAAT,SAAS,CAAW;QACpB,eAAU,GAAV,UAAU,CAAY;QACtB,YAAO,GAAP,OAAO,CAA2B;QAf7C,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;IASxC,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;YAE1C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBACd,MAAM,IAAA,oBAAQ,EACZ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,SAAS,EACd,IAAI,CACL,CAAC;aACH;YAED,IAAI,CAAC,qBAAqB,GAAG,IAAA,gCAAwB,EACnD,IAAI,CAAC,qBAAqB,EAC1B,CAAC,MAAM,CAAC,CACT,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;KAAA;IAEO,eAAe;QACrB,MAAM,QAAQ,GAA8B,EAAE,CAAC;QAC/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE;YACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxD,MAAM,YAAY,GAAG,IAAA,8BAAsB,EACzC,QAAQ,EACR,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,CAClB,CAAC;YACF,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;SACpE;QACD,KAAK,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAChE,IAAI,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;SACjD;IACH,CAAC;IAEO,aAAa,CAAC,EAAE,YAAY,EAAE,SAAS,EAAS;QACtD,2FAA2F;QAC3F,IAAI,CAAC,qBAAqB,GAAG,IAAA,gCAAwB,EACnD,IAAI,CAAC,qBAAqB,EAC1B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAC7B,CAAC;QAEF,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1D,CAAC;IAEO,qBAAqB,CAC3B,OAAkC,EAClC,IAAU,EACV,gBAAwB,EACxB,MAAe;;QAEf,MAAM,EAAE,0BAA0B,EAAE,GAAG,IAAA,0BAAkB,EACvD,IAAI,EACJ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,MAAM,CACZ,CAAC;QACF,MAAM,YAAY,GAAG,IAAA,8BAAsB,EACzC,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,CAClB,CAAC;QACF,IAAI,gBAAgB,KAAK,YAAY,EAAE;YACrC,OAAO;SACR;QAED,IAAI,CAAC,0BAA0B,EAAE;YAC/B,OAAO;SACR;QAED,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACtC,MAAA,OAAO,CAAC,gBAAgB,CAAC,mCACxB;gBACC,KAAK,EAAE,EAAE;gBACT,YAAY,EAAE,EAAE;gBAChB,KAAK,EAAE,EAAE;aACI,CAAC,CAAC;QAEnB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QAC5B,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,MAAM,EAAE;YACV,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC3B;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;SACvE;IACH,CAAC;IAEO,cAAc,CAAC,MAAc;QACnC,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAC5B,CAAC;IACJ,CAAC;CACF;AAhKD,sCAgKC"}
|
package/src/utils/nx-plugin.js
CHANGED
|
@@ -75,7 +75,7 @@ function mergePluginTargetsWithNxTargets(projectRoot, targets, plugins) {
|
|
|
75
75
|
exports.mergePluginTargetsWithNxTargets = mergePluginTargetsWithNxTargets;
|
|
76
76
|
function readPluginPackageJson(pluginName, paths = [workspace_root_1.workspaceRoot]) {
|
|
77
77
|
try {
|
|
78
|
-
const result = (0, package_json_1.
|
|
78
|
+
const result = (0, package_json_1.readModulePackageJsonWithoutFallbacks)(pluginName, paths);
|
|
79
79
|
return {
|
|
80
80
|
json: result.packageJson,
|
|
81
81
|
path: result.path,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-plugin.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AACjC,2BAAgC;AAChC,6BAA6B;AAE7B,qDAAkD;AAElD,qDAAiD;AACjD,kDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"nx-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,24 @@ export declare function buildTargetFromScript(script: string, nx: NxProjectPacka
|
|
|
56
56
|
};
|
|
57
57
|
defaultConfiguration?: string;
|
|
58
58
|
};
|
|
59
|
+
/**
|
|
60
|
+
* Uses `require.resolve` to read the package.json for a module.
|
|
61
|
+
*
|
|
62
|
+
* This will fail if the module doesn't export package.json
|
|
63
|
+
*
|
|
64
|
+
* @returns package json contents and path
|
|
65
|
+
*/
|
|
66
|
+
export declare function readModulePackageJsonWithoutFallbacks(moduleSpecifier: string, requirePaths?: string[]): {
|
|
67
|
+
packageJson: PackageJson;
|
|
68
|
+
path: string;
|
|
69
|
+
};
|
|
70
|
+
/**
|
|
71
|
+
* Reads the package.json file for a specified module.
|
|
72
|
+
*
|
|
73
|
+
* Includes a fallback that accounts for modules that don't export package.json
|
|
74
|
+
*
|
|
75
|
+
* @returns package json contents and path
|
|
76
|
+
*/
|
|
59
77
|
export declare function readModulePackageJson(moduleSpecifier: string, requirePaths?: string[]): {
|
|
60
78
|
packageJson: PackageJson;
|
|
61
79
|
path: string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.readModulePackageJson = exports.buildTargetFromScript = exports.readNxMigrateConfig = void 0;
|
|
3
|
+
exports.readModulePackageJson = exports.readModulePackageJsonWithoutFallbacks = exports.buildTargetFromScript = exports.readNxMigrateConfig = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const fileutils_1 = require("./fileutils");
|
|
@@ -24,14 +24,37 @@ function buildTargetFromScript(script, nx) {
|
|
|
24
24
|
return Object.assign(Object.assign({}, nxTargetConfiguration), { executor: 'nx:run-script', options: Object.assign(Object.assign({}, (nxTargetConfiguration.options || {})), { script }) });
|
|
25
25
|
}
|
|
26
26
|
exports.buildTargetFromScript = buildTargetFromScript;
|
|
27
|
+
/**
|
|
28
|
+
* Uses `require.resolve` to read the package.json for a module.
|
|
29
|
+
*
|
|
30
|
+
* This will fail if the module doesn't export package.json
|
|
31
|
+
*
|
|
32
|
+
* @returns package json contents and path
|
|
33
|
+
*/
|
|
34
|
+
function readModulePackageJsonWithoutFallbacks(moduleSpecifier, requirePaths = [workspace_root_1.workspaceRoot]) {
|
|
35
|
+
const packageJsonPath = require.resolve(`${moduleSpecifier}/package.json`, {
|
|
36
|
+
paths: requirePaths,
|
|
37
|
+
});
|
|
38
|
+
const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
|
|
39
|
+
return {
|
|
40
|
+
path: packageJsonPath,
|
|
41
|
+
packageJson,
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
exports.readModulePackageJsonWithoutFallbacks = readModulePackageJsonWithoutFallbacks;
|
|
45
|
+
/**
|
|
46
|
+
* Reads the package.json file for a specified module.
|
|
47
|
+
*
|
|
48
|
+
* Includes a fallback that accounts for modules that don't export package.json
|
|
49
|
+
*
|
|
50
|
+
* @returns package json contents and path
|
|
51
|
+
*/
|
|
27
52
|
function readModulePackageJson(moduleSpecifier, requirePaths = [workspace_root_1.workspaceRoot]) {
|
|
28
53
|
let packageJsonPath;
|
|
29
54
|
let packageJson;
|
|
30
55
|
try {
|
|
31
|
-
packageJsonPath
|
|
32
|
-
|
|
33
|
-
});
|
|
34
|
-
packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
|
|
56
|
+
({ path: packageJsonPath, packageJson } =
|
|
57
|
+
readModulePackageJsonWithoutFallbacks(moduleSpecifier, requirePaths));
|
|
35
58
|
}
|
|
36
59
|
catch (_a) {
|
|
37
60
|
const entryPoint = require.resolve(moduleSpecifier, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,+BAAqC;AAKrC,2CAA2C;AAC3C,qDAAiD;AA0DjD,SAAgB,mBAAmB,CACjC,IAA0B;IAE1B,MAAM,uBAAuB,GAAG,CAC9B,QAA6C,EAClB,EAAE;QAC7B,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAC;SACX;QACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;SACnD;QAED,uCACK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAChE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACzE;IACJ,CAAC,CAAC;IAEF,qDACK,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAC1C,uBAAuB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAE9C,uBAAuB,CAAC,IAAW,CAAC,EACvC;AACJ,CAAC;AAzBD,kDAyBC;AAED,SAAgB,qBAAqB,CACnC,MAAc,EACd,EAAqC;;IAErC,MAAM,qBAAqB,GAAG,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,0CAAG,MAAM,CAAC,KAAI,EAAE,CAAC;IAE1D,uCACK,qBAAqB,KACxB,QAAQ,EAAE,eAAe,EACzB,OAAO,kCACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,MAAM,OAER;AACJ,CAAC;AAdD,sDAcC;AAED,SAAgB,
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,17 +36,22 @@ exports.detectPackageManager = detectPackageManager;
|
|
|
36
36
|
*/
|
|
37
37
|
function getPackageManagerCommand(packageManager = detectPackageManager()) {
|
|
38
38
|
const commands = {
|
|
39
|
-
yarn: () =>
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
39
|
+
yarn: () => {
|
|
40
|
+
const yarnVersion = getPackageManagerVersion('yarn');
|
|
41
|
+
const useBerry = (0, semver_1.gte)(yarnVersion, '2.0.0');
|
|
42
|
+
return {
|
|
43
|
+
install: 'yarn',
|
|
44
|
+
ciInstall: useBerry
|
|
45
|
+
? 'yarn install --immutable'
|
|
46
|
+
: 'yarn install --frozen-lockfile',
|
|
47
|
+
add: useBerry ? 'yarn add' : 'yarn add -W',
|
|
48
|
+
addDev: useBerry ? 'yarn add -D' : 'yarn add -D -W',
|
|
49
|
+
rm: 'yarn remove',
|
|
50
|
+
exec: useBerry ? 'yarn exec' : 'yarn',
|
|
51
|
+
run: (script, args) => `yarn ${script} ${args}`,
|
|
52
|
+
list: useBerry ? 'yarn info --name-only' : 'yarn list',
|
|
53
|
+
};
|
|
54
|
+
},
|
|
50
55
|
pnpm: () => {
|
|
51
56
|
const pnpmVersion = getPackageManagerVersion('pnpm');
|
|
52
57
|
const useExec = (0, semver_1.gte)(pnpmVersion, '6.13.0');
|
|
@@ -57,7 +62,6 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
|
|
|
57
62
|
ciInstall: 'pnpm install --frozen-lockfile',
|
|
58
63
|
add: isPnpmWorkspace ? 'pnpm add -w' : 'pnpm add',
|
|
59
64
|
addDev: isPnpmWorkspace ? 'pnpm add -Dw' : 'pnpm add -D',
|
|
60
|
-
addGlobal: 'pnpm add -g',
|
|
61
65
|
rm: 'pnpm rm',
|
|
62
66
|
exec: useExec ? 'pnpm exec' : 'pnpx',
|
|
63
67
|
run: (script, args) => includeDoubleDashBeforeArgs
|
|
@@ -75,7 +79,6 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
|
|
|
75
79
|
ciInstall: 'npm ci',
|
|
76
80
|
add: 'npm install',
|
|
77
81
|
addDev: 'npm install -D',
|
|
78
|
-
addGlobal: 'npm install -g',
|
|
79
82
|
rm: 'npm rm',
|
|
80
83
|
exec: 'npx',
|
|
81
84
|
run: (script, args) => `npm run ${script} -- ${args}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":";;;;AAAA,iDAA+C;AAC/C,2BAA8C;AAC9C,uCAAkC;AAClC,+BAAqC;AACrC,6BAA8B;AAC9B,+BAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { PluginCapabilities } from './models';
|
|
2
|
+
import { ProjectsConfigurations } from 'nx/src/config/workspace-json-project-json';
|
|
3
|
+
export declare function getLocalWorkspacePlugins(projectsConfiguration: ProjectsConfigurations): Map<string, PluginCapabilities>;
|
|
4
|
+
export declare function listLocalWorkspacePlugins(installedPlugins: Map<string, PluginCapabilities>): void;
|