nx 14.5.5-beta.0 → 14.6.0-beta.1
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/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 +1 -0
- package/src/hasher/hasher.js +8 -2
- package/src/hasher/hasher.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/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/package-manager.d.ts +0 -1
- package/src/utils/package-manager.js +16 -13
- package/src/utils/package-manager.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
# [14.6.0-beta.1](https://github.com/nrwl/nx/compare/14.5.4...14.6.0-beta.1) (2022-08-11)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.6.0-beta.1",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://nx.dev",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/cli": "14.
|
|
35
|
-
"@nrwl/tao": "14.
|
|
34
|
+
"@nrwl/cli": "14.6.0-beta.1",
|
|
35
|
+
"@nrwl/tao": "14.6.0-beta.1",
|
|
36
36
|
"@parcel/watcher": "2.0.4",
|
|
37
37
|
"chalk": "4.1.0",
|
|
38
38
|
"chokidar": "^3.5.1",
|
|
@@ -106,5 +106,5 @@
|
|
|
106
106
|
"executors": "./executors.json",
|
|
107
107
|
"main": "./bin/nx.js",
|
|
108
108
|
"typings": "./bin/nx.d.ts",
|
|
109
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "918ddf6d4b93849e3925b00f0e95457727cf3972"
|
|
110
110
|
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Task, TaskGraph } from '../config/task-graph';
|
|
2
|
+
import { Hasher } from './hasher';
|
|
3
|
+
import { ProjectGraph } from '../config/project-graph';
|
|
4
|
+
import { Workspaces } from '../config/workspaces';
|
|
5
|
+
export declare function hashDependsOnOtherTasks(workspaces: Workspaces, hasher: Hasher, projectGraph: ProjectGraph, taskGraph: TaskGraph, task: Task): boolean;
|
|
6
|
+
export declare function hashTask(workspaces: Workspaces, hasher: Hasher, projectGraph: ProjectGraph, taskGraph: TaskGraph, task: Task): Promise<void>;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.hashTask = exports.hashDependsOnOtherTasks = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const utils_1 = require("../tasks-runner/utils");
|
|
6
|
+
const project_graph_1 = require("../project-graph/project-graph");
|
|
7
|
+
function hashDependsOnOtherTasks(workspaces, hasher, projectGraph, taskGraph, task) {
|
|
8
|
+
const customHasher = (0, utils_1.getCustomHasher)(task, workspaces, workspaces.readNxJson(), projectGraph);
|
|
9
|
+
if (customHasher)
|
|
10
|
+
return true;
|
|
11
|
+
return hasher.hashDependsOnOtherTasks(task);
|
|
12
|
+
}
|
|
13
|
+
exports.hashDependsOnOtherTasks = hashDependsOnOtherTasks;
|
|
14
|
+
function hashTask(workspaces, hasher, projectGraph, taskGraph, task) {
|
|
15
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
const customHasher = (0, utils_1.getCustomHasher)(task, workspaces, workspaces.readNxJson(), projectGraph);
|
|
17
|
+
const { value, details } = yield (customHasher
|
|
18
|
+
? customHasher(task, {
|
|
19
|
+
hasher,
|
|
20
|
+
projectGraph,
|
|
21
|
+
taskGraph,
|
|
22
|
+
workspaceConfig: (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
|
|
23
|
+
})
|
|
24
|
+
: hasher.hashTask(task));
|
|
25
|
+
task.hash = value;
|
|
26
|
+
task.hashDetails = details;
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
exports.hashTask = hashTask;
|
|
30
|
+
//# sourceMappingURL=hash-task.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hash-task.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hash-task.ts"],"names":[],"mappings":";;;;AACA,iDAAwD;AACxD,kEAA2F;AAK3F,SAAgB,uBAAuB,CACrC,UAAsB,EACtB,MAAc,EACd,YAA0B,EAC1B,SAAoB,EACpB,IAAU;IAEV,MAAM,YAAY,GAAG,IAAA,uBAAe,EAClC,IAAI,EACJ,UAAU,EACV,UAAU,CAAC,UAAU,EAAE,EACvB,YAAY,CACb,CAAC;IACF,IAAI,YAAY;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC;AAfD,0DAeC;AAED,SAAsB,QAAQ,CAC5B,UAAsB,EACtB,MAAc,EACd,YAA0B,EAC1B,SAAoB,EACpB,IAAU;;QAEV,MAAM,YAAY,GAAG,IAAA,uBAAe,EAClC,IAAI,EACJ,UAAU,EACV,UAAU,CAAC,UAAU,EAAE,EACvB,YAAY,CACb,CAAC;QACF,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,YAAY;YAC5C,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE;gBACjB,MAAM;gBACN,YAAY;gBACZ,SAAS;gBACT,eAAe,EACb,IAAA,yDAAyC,EAAC,YAAY,CAAC;aAC1D,CAAC;YACJ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;IAC7B,CAAC;CAAA;AAxBD,4BAwBC"}
|
package/src/hasher/hasher.d.ts
CHANGED
|
@@ -49,6 +49,7 @@ export declare class Hasher {
|
|
|
49
49
|
private hashing;
|
|
50
50
|
constructor(projectGraph: ProjectGraph, nxJson: NxJsonConfiguration, options: any, hashing?: HashingImpl);
|
|
51
51
|
hashTask(task: Task): Promise<Hash>;
|
|
52
|
+
hashDependsOnOtherTasks(task: Task): boolean;
|
|
52
53
|
/**
|
|
53
54
|
* @deprecated use hashTask instead
|
|
54
55
|
*/
|
package/src/hasher/hasher.js
CHANGED
|
@@ -55,6 +55,11 @@ class Hasher {
|
|
|
55
55
|
};
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
|
+
hashDependsOnOtherTasks(task) {
|
|
59
|
+
const inputs = this.taskHasher.inputs(task);
|
|
60
|
+
// check here for outputs
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
58
63
|
/**
|
|
59
64
|
* @deprecated use hashTask instead
|
|
60
65
|
*/
|
|
@@ -152,7 +157,7 @@ class TaskHasher {
|
|
|
152
157
|
return this.hashExternalDependency(task);
|
|
153
158
|
}
|
|
154
159
|
const projectGraphDeps = (_a = this.projectGraph.dependencies[task.target.project]) !== null && _a !== void 0 ? _a : [];
|
|
155
|
-
const { selfInputs, depsInputs } = this.inputs(task
|
|
160
|
+
const { selfInputs, depsInputs } = this.inputs(task);
|
|
156
161
|
const self = yield this.hashSelfInputs(task, selfInputs);
|
|
157
162
|
const deps = yield this.hashDepsTasks(depsInputs, projectGraphDeps, visited);
|
|
158
163
|
let details = {};
|
|
@@ -195,7 +200,8 @@ class TaskHasher {
|
|
|
195
200
|
.filter((r) => !!r);
|
|
196
201
|
});
|
|
197
202
|
}
|
|
198
|
-
inputs(task
|
|
203
|
+
inputs(task) {
|
|
204
|
+
const projectNode = this.projectGraph.nodes[task.target.project];
|
|
199
205
|
const namedInputs = Object.assign(Object.assign({ default: [{ fileset: '{projectRoot}/**/*' }] }, this.nxJson.namedInputs), projectNode.data.namedInputs);
|
|
200
206
|
if (task.target.target === '$input') {
|
|
201
207
|
return {
|
package/src/hasher/hasher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.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"}
|
|
@@ -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":";;;;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;AAC/C,yDAAsD;AACtD,iDAA8C;AAC9C,uDAA4E;AAE5E,SAAe,0BAA0B,CACvC,iBAAyB,EACzB,YAAsB,EACtB,KAAa,EACb,MAAc,EACd,SAAkC,EAClC,aAAkB;;QAElB,MAAM,QAAQ,GAAG,iBAAiB,IAAI,IAAI,CAAC;QAC3C,MAAM,gBAAgB,GACpB,yBAAyB,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,CAAC,WAAW,CAAC;YACnE,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM;YACzC,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,OAAO,CAAC;QAEzD,MAAM,sBAAsB,qBAAQ,SAAS,CAAE,CAAC;QAChD,OAAO,sBAAsB,CAAC,wBAAwB,CAAC,CAAC;QAExD,IAAI,QAAQ,EAAE;YACZ,IAAI,gBAAgB,EAAE;gBACpB,OAAO,MAAM,IAAA,8EAAiC,EAAC;oBAC7C,iBAAiB;oBACjB,KAAK;oBACL,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,sBAAsB;iBAClC,CAAC,CAAC;aACJ;YACD,OAAO;gBACL,SAAS,EAAE,IAAI,+EAAmC,CAChD,iBAAiB,EACjB,YAAY,EACZ,KAAK,EACL,MAAM,CACP;gBACD,YAAY,EAAE,OAAO,CAAC,OAAO,EAAE;aAChC,CAAC;SACH;aAAM;YACL,IAAI,gBAAgB,EAAE;gBACpB,OAAO,MAAM,IAAA,gFAAkC,EAAC;oBAC9C,YAAY;oBACZ,KAAK;oBACL,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,sBAAsB;iBAClC,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO;oBACL,SAAS,EAAE,IAAI,iFAAoC,CACjD,YAAY,EACZ,KAAK,EACL,MAAM,EACN,sBAAsB,CACvB;oBACD,YAAY,EAAE,OAAO,CAAC,OAAO,EAAE;iBAChC,CAAC;aACH;SACF;IACH,CAAC;CAAA;AAED,SAAe,mCAAmC,CAChD,UAAsB,EACtB,MAAc,EACd,YAA0B,EAC1B,SAAoB;;QAEpB,MAAM,GAAG,GAAG,EAAqB,CAAC;QAClC,KAAK,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC5C,IACE,CAAC,IAAA,mCAAuB,EAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC,EACxE;gBACA,GAAG,CAAC,IAAI,CAAC,IAAA,oBAAQ,EAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;aACpE;SACF;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CAAA;AAED,SAAsB,UAAU,CAC9B,aAAwC,EACxC,YAA0B,EAC1B,EAAE,MAAM,EAAmC,EAC3C,MAAc,EACd,SAAc,EACd,iBAAgC,EAChC,uBAA4E;;QAE5E,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAY,EAAC,SAAS,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,GAAS,EAAE;YAC1E,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAEjE,MAAM,wBAAwB,GAAG,uBAAuB,CACtD,MAAM,CAAC,cAAc,EACrB,uBAAuB,CACxB,CAAC;YACF,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAEtD,MAAM,SAAS,GAAG,IAAA,mCAAe,EAC/B,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,CAAC,MAAM,CAAC,MAAM,CAAC,EACf,MAAM,CAAC,aAAa,EACpB,SAAS,CACV,CAAC;YAEF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;YAC/D,MAAM,mCAAmC,CACvC,IAAI,uBAAU,CAAC,8BAAa,CAAC,EAC7B,MAAM,EACN,YAAY,EACZ,SAAS,CACV,CAAC;YAEF,MAAM,KAAK,GAAG,IAAA,4BAAS,EAAC,SAAS,CAAC,CAAC;YACnC,IAAI,KAAK,EAAE;gBACT,IAAI,MAAM,CAAC,cAAc,EAAE;oBACzB,eAAM,CAAC,IAAI,CAAC;wBACV,KAAK,EAAE,0CAA0C;wBACjD,SAAS,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;qBACtC,CAAC,CAAC;oBACH,IAAA,8BAAW,EAAC,SAAS,CAAC,CAAC;iBACxB;qBAAM;oBACL,eAAM,CAAC,KAAK,CAAC;wBACX,KAAK,EAAE,4EAA4E;wBACnF,SAAS,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;qBACtC,CAAC,CAAC;oBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACjB;aACF;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC7C,IAAI,MAAM,CAAC,WAAW,IAAI,QAAQ,EAAE;gBAClC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;gBACtC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;aACvC;YACD,IAAI,MAAM,CAAC,WAAW,IAAI,yBAAyB,EAAE;gBACnD,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;aACvC;YACD,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,0BAA0B,CAClE,iBAAiB,EACjB,YAAY,EACZ,KAAK,EACL,MAAM,EACN,SAAS,EACT,aAAa,CACd,CAAC;YACF,MAAM,UAAU,GAAG,CAAC,SAAS,CAAgB,CAAC;YAE9C,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE;gBAC/B,UAAU,CAAC,IAAI,CAAC,IAAI,8CAAoB,EAAE,CAAC,CAAC;aAC7C;YAED,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;gBAC1B,UAAU,CAAC,IAAI,CAAC,IAAI,kDAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;aACrE;YAED,MAAM,mBAAmB,GAAG,WAAW,CACrC,KAAK,kCACA,aAAa,KAAE,SAAS,EAAE,IAAI,+BAAkB,CAAC,UAAU,CAAC,KACjE;gBACE,iBAAiB,EACf,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB;gBAC7D,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,YAAY;gBACZ,MAAM;gBACN,MAAM;gBACN,SAAS;gBACT,MAAM;aACP,CACF,CAAC;YACF,IAAI,WAAW,CAAC;YAChB,IAAK,mBAA2B,CAAC,SAAS,EAAE;gBAC1C,WAAW,GAAG,MAAM,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;aAClE;iBAAM;gBACL,2BAA2B;gBAC3B,WAAW,GAAG,MAAM,oBAAoB,CAAC,mBAA0B,CAAC,CAAC;aACtE;YACD,MAAM,YAAY,CAAC;YACnB,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAA,CAAC,CAAC;QACH,iDAAiD;QACjD,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YAAG,OAAO,CAAC,KAAa,CAAC,KAAK,EAAE,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;CAAA;AAzGD,gCAyGC;AAED,SAAS,uBAAuB,CAC9B,QAAwB,EACxB,IAAwB;IAExB,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAClC,GAAG,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjC,CAAC,CAAC,CAAC;IACH,IAAI,IAAI,EAAE;QACR,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9B,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE;gBACV,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aAC/B;iBAAM;gBACL,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;aAClB;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;KACZ;AACH,CAAC;AAED,SAAe,oBAAoB,CACjC,OAA8C;;QAE9C,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC,IAAI,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,SAAS,CAC1C,CAAC;IACJ,CAAC;CAAA;AAED,SAAe,uBAAuB,CAAC,GAAQ;;QAC7C,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,WAAW,GAAG,KAAK,CAAC;YACxB,GAAG,CAAC,SAAS,CACX,CAAC,CAAC,EAAE,EAAE;gBACJ,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE;oBACd,WAAW,GAAG,IAAI,CAAC;iBACpB;YACH,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;gBACR,eAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,kCAAkC;iBAC1C,CAAC,CAAC;gBACH,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,GAAG,CAAC,IAAI,CAAC,CAAC;YACZ,CAAC,EACD,GAAG,EAAE;gBACH,GAAG,CAAC,WAAW,CAAC,CAAC;YACnB,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAS,yBAAyB,CAChC,KAAa,EACb,OAAY,EACZ,WAAmB;IAEnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,IAAA,YAAI,GAAE;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAEvE,MAAM,YAAY,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAkB,EAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9E,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAgB,SAAS,CACvB,MAAc,EACd,MAA2B;IAK3B,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3B,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;KACxE;IACD,IAAI,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACrC,IAAI,UAAU,GAAW,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAElE,IAAI,WAAW,CAAC;QAChB,IAAI,UAAU,EAAE;YACd,IAAI,IAAA,0BAAc,EAAC,UAAU,CAAC,EAAE;gBAC9B,UAAU,GAAG,IAAA,WAAI,EAAC,8BAAa,EAAE,UAAU,CAAC,CAAC;aAC9C;YAED,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;YAClC,uCAAuC;YACvC,IAAI,WAAW,CAAC,OAAO,EAAE;gBACvB,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC;aACnC;SACF;aAAM;YACL,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,kBAAkB,CAAC;SACpE;QAED,OAAO;YACL,WAAW;YACX,aAAa,kCACR,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,GACzC,MAAM,CACV;SACF,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,2CAA2C,MAAM,EAAE,CAAC,CAAC;KACtE;AACH,CAAC;AAxCD,8BAwCC"}
|
|
@@ -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"}
|
|
@@ -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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"}
|