@nrwl/nx-cloud 15.2.0-beta.5 → 15.2.0
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/generators.json +2 -1
- package/lib/core/api/error-reporter.api.js +1 -36
- package/lib/core/api/run-group.api.js +1 -68
- package/lib/core/models/run-context.model.d.ts +2 -2
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +1 -93
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +1 -312
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js +1 -133
- package/lib/core/runners/cloud-enabled/cloud-run.api.js +1 -170
- package/lib/core/runners/cloud-enabled/id-generator.js +1 -16
- package/lib/core/runners/distributed-agent/distributed-agent.api.js +1 -80
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js +1 -154
- package/lib/core/runners/distributed-agent/execute-tasks.js +1 -114
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js +1 -58
- package/lib/core/runners/distributed-agent/invoke-tasks-using-run-many.js +1 -97
- package/lib/core/runners/distributed-execution/distributed-execution.api.js +1 -143
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js +1 -115
- package/lib/core/runners/distributed-execution/process-task.js +1 -45
- package/lib/core/runners/distributed-execution/process-tasks.js +1 -67
- package/lib/core/runners/distributed-execution/split-task-graph-into-stages.js +1 -37
- package/lib/core/runners/distributed-execution/task-graph-creator.js +1 -100
- package/lib/core/terminal-output/end-of-run-message.d.ts +2 -1
- package/lib/core/terminal-output/end-of-run-message.js +3 -2
- package/lib/core/terminal-output/end-of-run-message.js.map +1 -1
- package/lib/nx-cloud-tasks-runner.js +2 -2
- package/lib/nx-cloud-tasks-runner.js.map +1 -1
- package/lib/utilities/environment.d.ts +1 -1
- package/lib/utilities/environment.js +2 -2
- package/lib/utilities/environment.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,45 +1 @@
|
|
|
1
|
-
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.processTask = void 0;
|
|
13
|
-
const environment_1 = require("../../../utilities/environment");
|
|
14
|
-
const serializer_overrides_1 = require("../../../utilities/serializer-overrides");
|
|
15
|
-
const { output } = require('../../../utilities/nx-imports');
|
|
16
|
-
function processTask(dteArtifactStorage, tasks, completedTask) {
|
|
17
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
18
|
-
if (environment_1.VERBOSE_LOGGING) {
|
|
19
|
-
output.note({
|
|
20
|
-
title: `Processing task ${completedTask.taskId}`,
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
|
-
const matchingTask = tasks.find((tt) => completedTask.taskId === tt.id);
|
|
24
|
-
if (!matchingTask) {
|
|
25
|
-
throw new Error(`Found unknown task: ${completedTask.taskId}`);
|
|
26
|
-
}
|
|
27
|
-
const terminalOutput = yield dteArtifactStorage.retrieveAndExtract(completedTask.hash, completedTask.url);
|
|
28
|
-
output.logCommand(getCommand(matchingTask));
|
|
29
|
-
process.stdout.write(terminalOutput);
|
|
30
|
-
output.addVerticalSeparator();
|
|
31
|
-
});
|
|
32
|
-
}
|
|
33
|
-
exports.processTask = processTask;
|
|
34
|
-
function getCommand(task) {
|
|
35
|
-
const config = task.target.configuration
|
|
36
|
-
? `:${task.target.configuration}`
|
|
37
|
-
: '';
|
|
38
|
-
return [
|
|
39
|
-
'nx',
|
|
40
|
-
'run',
|
|
41
|
-
`${task.target.project}:${task.target.target}${config}`,
|
|
42
|
-
(0, serializer_overrides_1.serializeOverrides)(task),
|
|
43
|
-
].join(' ');
|
|
44
|
-
}
|
|
45
|
-
//# sourceMappingURL=process-task.js.map
|
|
1
|
+
const a12_0x279d=['processTask','__esModule','../../../utilities/serializer-overrides','throw','__awaiter','Found\x20unknown\x20task:\x20','project','next','defineProperty','target','../../../utilities/environment','write','logCommand','serializeOverrides','run','addVerticalSeparator','value','hash','VERBOSE_LOGGING','../../../utilities/nx-imports','configuration','then','retrieveAndExtract','taskId','join','url'];(function(_0x38d41b,_0x279dfb){const _0x55869b=function(_0x183cee){while(--_0x183cee){_0x38d41b['push'](_0x38d41b['shift']());}};_0x55869b(++_0x279dfb);}(a12_0x279d,0x152));const a12_0x5586=function(_0x38d41b,_0x279dfb){_0x38d41b=_0x38d41b-0x0;let _0x55869b=a12_0x279d[_0x38d41b];return _0x55869b;};'use strict';var __awaiter=this&&this[a12_0x5586('0x4')]||function(_0x16f640,_0x496433,_0x1adfda,_0x1d290e){function _0x616080(_0x505593){return _0x505593 instanceof _0x1adfda?_0x505593:new _0x1adfda(function(_0x56140f){_0x56140f(_0x505593);});}return new(_0x1adfda||(_0x1adfda=Promise))(function(_0x9ad750,_0x20b368){function _0x2790e9(_0x5b78d2){try{_0x1dc38c(_0x1d290e[a12_0x5586('0x7')](_0x5b78d2));}catch(_0x3a0c2e){_0x20b368(_0x3a0c2e);}}function _0x41c576(_0x48eb41){try{_0x1dc38c(_0x1d290e[a12_0x5586('0x3')](_0x48eb41));}catch(_0x3dfb8c){_0x20b368(_0x3dfb8c);}}function _0x1dc38c(_0x5c7e23){_0x5c7e23['done']?_0x9ad750(_0x5c7e23[a12_0x5586('0x10')]):_0x616080(_0x5c7e23[a12_0x5586('0x10')])[a12_0x5586('0x15')](_0x2790e9,_0x41c576);}_0x1dc38c((_0x1d290e=_0x1d290e['apply'](_0x16f640,_0x496433||[]))[a12_0x5586('0x7')]());});};Object[a12_0x5586('0x8')](exports,a12_0x5586('0x1'),{'value':!![]});exports[a12_0x5586('0x0')]=void 0x0;const environment_1=require(a12_0x5586('0xa'));const serializer_overrides_1=require(a12_0x5586('0x2'));const {output}=require(a12_0x5586('0x13'));function processTask(_0x587a69,_0xe5be4f,_0x1d54e2){return __awaiter(this,void 0x0,void 0x0,function*(){if(environment_1[a12_0x5586('0x12')]){output['note']({'title':'Processing\x20task\x20'+_0x1d54e2['taskId']});}const _0x32c8eb=_0xe5be4f['find'](_0xb64243=>_0x1d54e2[a12_0x5586('0x17')]===_0xb64243['id']);if(!_0x32c8eb){throw new Error(a12_0x5586('0x5')+_0x1d54e2[a12_0x5586('0x17')]);}const _0x324e5e=yield _0x587a69[a12_0x5586('0x16')](_0x1d54e2[a12_0x5586('0x11')],_0x1d54e2[a12_0x5586('0x19')]);output[a12_0x5586('0xc')](getCommand(_0x32c8eb));process['stdout'][a12_0x5586('0xb')](_0x324e5e);output[a12_0x5586('0xf')]();});}exports['processTask']=processTask;function getCommand(_0xe2a348){const _0x4a2b8f=_0xe2a348[a12_0x5586('0x9')]['configuration']?':'+_0xe2a348[a12_0x5586('0x9')][a12_0x5586('0x14')]:'';return['nx',a12_0x5586('0xe'),_0xe2a348[a12_0x5586('0x9')][a12_0x5586('0x6')]+':'+_0xe2a348[a12_0x5586('0x9')]['target']+_0x4a2b8f,(0x0,serializer_overrides_1[a12_0x5586('0xd')])(_0xe2a348)][a12_0x5586('0x18')]('\x20');}
|
|
@@ -1,67 +1 @@
|
|
|
1
|
-
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.processTasks = void 0;
|
|
13
|
-
const create_unchanged_value_timeout_1 = require("../../../utilities/create-unchanged-value-timeout");
|
|
14
|
-
const environment_1 = require("../../../utilities/environment");
|
|
15
|
-
const waiter_1 = require("../../../utilities/waiter");
|
|
16
|
-
const process_task_1 = require("./process-task");
|
|
17
|
-
const { output } = require('../../../utilities/nx-imports');
|
|
18
|
-
function processTasks(api, dteArtifactStorage, executionId, tasks) {
|
|
19
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
20
|
-
const processedTasks = {};
|
|
21
|
-
const failIfNumberOfCompletedTasksDoesNotChangeAfterTimeout = (0, create_unchanged_value_timeout_1.createUnchangedValueTimeout)({
|
|
22
|
-
title: `No new completed tasks after ${environment_1.NO_COMPLETED_TASKS_TIMEOUT / 1000} seconds.`,
|
|
23
|
-
timeout: environment_1.NO_COMPLETED_TASKS_TIMEOUT,
|
|
24
|
-
});
|
|
25
|
-
const waiter = new waiter_1.Waiter();
|
|
26
|
-
while (true) {
|
|
27
|
-
if (environment_1.VERBOSE_LOGGING) {
|
|
28
|
-
output.note({
|
|
29
|
-
title: 'Waiting...',
|
|
30
|
-
});
|
|
31
|
-
}
|
|
32
|
-
yield waiter.wait();
|
|
33
|
-
const r = yield api.status(executionId);
|
|
34
|
-
if (environment_1.VERBOSE_LOGGING) {
|
|
35
|
-
output.note({
|
|
36
|
-
title: `Status update`,
|
|
37
|
-
bodyLines: [
|
|
38
|
-
`executionId: ${executionId}`,
|
|
39
|
-
`executionStatus: ${r.executionStatus}`,
|
|
40
|
-
`number of completed tasks: ${r.completedTasks.length}`,
|
|
41
|
-
`error: ${r.criticalErrorMessage}`,
|
|
42
|
-
],
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
|
-
if (r.criticalErrorMessage) {
|
|
46
|
-
output.error({
|
|
47
|
-
title: 'Distributed Execution Terminated',
|
|
48
|
-
bodyLines: ['Error:', r.criticalErrorMessage],
|
|
49
|
-
});
|
|
50
|
-
process.exit(1);
|
|
51
|
-
}
|
|
52
|
-
failIfNumberOfCompletedTasksDoesNotChangeAfterTimeout(r.completedTasks.length);
|
|
53
|
-
for (const t of r.completedTasks) {
|
|
54
|
-
if (processedTasks[t.taskId])
|
|
55
|
-
continue;
|
|
56
|
-
yield (0, process_task_1.processTask)(dteArtifactStorage, tasks, t);
|
|
57
|
-
waiter.reset();
|
|
58
|
-
processedTasks[t.taskId] = true;
|
|
59
|
-
}
|
|
60
|
-
if (r.executionStatus === 'COMPLETED') {
|
|
61
|
-
return { commandStatus: r.commandStatus, runUrl: r.runUrl };
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
exports.processTasks = processTasks;
|
|
67
|
-
//# sourceMappingURL=process-tasks.js.map
|
|
1
|
+
const a13_0x4554=['COMPLETED','error','Waiting...','executionStatus','../../../utilities/waiter','done','../../../utilities/environment','value','runUrl','length','__awaiter','VERBOSE_LOGGING','NO_COMPLETED_TASKS_TIMEOUT','./process-task','error:\x20','exit','completedTasks','commandStatus','note','Status\x20update','Waiter','__esModule','taskId','apply','createUnchangedValueTimeout','executionStatus:\x20','next','executionId:\x20','Error:','processTask','criticalErrorMessage','reset','../../../utilities/nx-imports','Distributed\x20Execution\x20Terminated','defineProperty','processTasks'];(function(_0x5823eb,_0x4554a0){const _0x8e0d66=function(_0x7f0676){while(--_0x7f0676){_0x5823eb['push'](_0x5823eb['shift']());}};_0x8e0d66(++_0x4554a0);}(a13_0x4554,0x1d6));const a13_0x8e0d=function(_0x5823eb,_0x4554a0){_0x5823eb=_0x5823eb-0x0;let _0x8e0d66=a13_0x4554[_0x5823eb];return _0x8e0d66;};'use strict';var __awaiter=this&&this[a13_0x8e0d('0x8')]||function(_0x51954e,_0x1d44c8,_0x40e50f,_0x544d7b){function _0x1ee28c(_0x5e5560){return _0x5e5560 instanceof _0x40e50f?_0x5e5560:new _0x40e50f(function(_0x41e4e8){_0x41e4e8(_0x5e5560);});}return new(_0x40e50f||(_0x40e50f=Promise))(function(_0x1d4869,_0x12f9e4){function _0x136700(_0x40ddff){try{_0x2918be(_0x544d7b[a13_0x8e0d('0x18')](_0x40ddff));}catch(_0xad629){_0x12f9e4(_0xad629);}}function _0x34a86f(_0x28ad48){try{_0x2918be(_0x544d7b['throw'](_0x28ad48));}catch(_0x5f18ca){_0x12f9e4(_0x5f18ca);}}function _0x2918be(_0x4b4e59){_0x4b4e59[a13_0x8e0d('0x3')]?_0x1d4869(_0x4b4e59[a13_0x8e0d('0x5')]):_0x1ee28c(_0x4b4e59[a13_0x8e0d('0x5')])['then'](_0x136700,_0x34a86f);}_0x2918be((_0x544d7b=_0x544d7b[a13_0x8e0d('0x15')](_0x51954e,_0x1d44c8||[]))[a13_0x8e0d('0x18')]());});};Object[a13_0x8e0d('0x20')](exports,a13_0x8e0d('0x13'),{'value':!![]});exports['processTasks']=void 0x0;const create_unchanged_value_timeout_1=require('../../../utilities/create-unchanged-value-timeout');const environment_1=require(a13_0x8e0d('0x4'));const waiter_1=require(a13_0x8e0d('0x2'));const process_task_1=require(a13_0x8e0d('0xb'));const {output}=require(a13_0x8e0d('0x1e'));function processTasks(_0x1a6a91,_0x41b7e8,_0x133257,_0x5bd2e6){return __awaiter(this,void 0x0,void 0x0,function*(){const _0x2cfff7={};const _0x9f3dab=(0x0,create_unchanged_value_timeout_1[a13_0x8e0d('0x16')])({'title':'No\x20new\x20completed\x20tasks\x20after\x20'+environment_1[a13_0x8e0d('0xa')]/0x3e8+'\x20seconds.','timeout':environment_1['NO_COMPLETED_TASKS_TIMEOUT']});const _0x3058c5=new waiter_1[(a13_0x8e0d('0x12'))]();while(!![]){if(environment_1[a13_0x8e0d('0x9')]){output[a13_0x8e0d('0x10')]({'title':a13_0x8e0d('0x0')});}yield _0x3058c5['wait']();const _0x3747d7=yield _0x1a6a91['status'](_0x133257);if(environment_1['VERBOSE_LOGGING']){output[a13_0x8e0d('0x10')]({'title':a13_0x8e0d('0x11'),'bodyLines':[a13_0x8e0d('0x19')+_0x133257,a13_0x8e0d('0x17')+_0x3747d7['executionStatus'],'number\x20of\x20completed\x20tasks:\x20'+_0x3747d7['completedTasks'][a13_0x8e0d('0x7')],a13_0x8e0d('0xc')+_0x3747d7[a13_0x8e0d('0x1c')]]});}if(_0x3747d7['criticalErrorMessage']){output[a13_0x8e0d('0x23')]({'title':a13_0x8e0d('0x1f'),'bodyLines':[a13_0x8e0d('0x1a'),_0x3747d7[a13_0x8e0d('0x1c')]]});process[a13_0x8e0d('0xd')](0x1);}_0x9f3dab(_0x3747d7[a13_0x8e0d('0xe')][a13_0x8e0d('0x7')]);for(const _0x654a0 of _0x3747d7[a13_0x8e0d('0xe')]){if(_0x2cfff7[_0x654a0[a13_0x8e0d('0x14')]])continue;yield(0x0,process_task_1[a13_0x8e0d('0x1b')])(_0x41b7e8,_0x5bd2e6,_0x654a0);_0x3058c5[a13_0x8e0d('0x1d')]();_0x2cfff7[_0x654a0[a13_0x8e0d('0x14')]]=!![];}if(_0x3747d7[a13_0x8e0d('0x1')]===a13_0x8e0d('0x22')){return{'commandStatus':_0x3747d7[a13_0x8e0d('0xf')],'runUrl':_0x3747d7[a13_0x8e0d('0x6')]};}}});}exports[a13_0x8e0d('0x21')]=processTasks;
|
|
@@ -1,37 +1 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.splitTasksIntoStages = void 0;
|
|
4
|
-
function splitTasksIntoStages(taskGraph) {
|
|
5
|
-
const stages = [];
|
|
6
|
-
const notStagedTaskIds = new Set(Object.values(taskGraph.tasks).map((t) => t.id));
|
|
7
|
-
let stageIndex = 0;
|
|
8
|
-
// Loop through tasks and try to stage them. As tasks are staged, they are removed from the loop
|
|
9
|
-
while (notStagedTaskIds.size > 0) {
|
|
10
|
-
const currentStage = (stages[stageIndex] = []);
|
|
11
|
-
for (const taskId of notStagedTaskIds) {
|
|
12
|
-
let ready = true;
|
|
13
|
-
for (const dependency of taskGraph.dependencies[taskId]) {
|
|
14
|
-
if (notStagedTaskIds.has(dependency)) {
|
|
15
|
-
// dependency has not been staged yet, this task is not ready to be staged.
|
|
16
|
-
ready = false;
|
|
17
|
-
break;
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
// Some dependency still has not been staged, skip it for now, it will be processed again
|
|
21
|
-
if (!ready) {
|
|
22
|
-
continue;
|
|
23
|
-
}
|
|
24
|
-
// All the dependencies have been staged, let's stage it.
|
|
25
|
-
const task = taskGraph.tasks[taskId];
|
|
26
|
-
currentStage.push(task);
|
|
27
|
-
}
|
|
28
|
-
// Remove the entire new stage of tasks from the list
|
|
29
|
-
for (const task of currentStage) {
|
|
30
|
-
notStagedTaskIds.delete(task.id);
|
|
31
|
-
}
|
|
32
|
-
stageIndex++;
|
|
33
|
-
}
|
|
34
|
-
return stages;
|
|
35
|
-
}
|
|
36
|
-
exports.splitTasksIntoStages = splitTasksIntoStages;
|
|
37
|
-
//# sourceMappingURL=split-task-graph-into-stages.js.map
|
|
1
|
+
const a14_0x170b=['map','size','has','push','defineProperty','tasks','__esModule','splitTasksIntoStages','dependencies','delete'];(function(_0x128090,_0x170bca){const _0x513a92=function(_0x2373b1){while(--_0x2373b1){_0x128090['push'](_0x128090['shift']());}};_0x513a92(++_0x170bca);}(a14_0x170b,0xb1));const a14_0x513a=function(_0x128090,_0x170bca){_0x128090=_0x128090-0x0;let _0x513a92=a14_0x170b[_0x128090];return _0x513a92;};'use strict';Object[a14_0x513a('0x7')](exports,a14_0x513a('0x9'),{'value':!![]});exports[a14_0x513a('0x0')]=void 0x0;function splitTasksIntoStages(_0x2ddc9e){const _0x3808dc=[];const _0x426b24=new Set(Object['values'](_0x2ddc9e[a14_0x513a('0x8')])[a14_0x513a('0x3')](_0x366b49=>_0x366b49['id']));let _0x5cd34d=0x0;while(_0x426b24[a14_0x513a('0x4')]>0x0){const _0x19062f=_0x3808dc[_0x5cd34d]=[];for(const _0x24c5e2 of _0x426b24){let _0x193912=!![];for(const _0x367990 of _0x2ddc9e[a14_0x513a('0x1')][_0x24c5e2]){if(_0x426b24[a14_0x513a('0x5')](_0x367990)){_0x193912=![];break;}}if(!_0x193912){continue;}const _0x2bf51c=_0x2ddc9e['tasks'][_0x24c5e2];_0x19062f[a14_0x513a('0x6')](_0x2bf51c);}for(const _0x1b87ce of _0x19062f){_0x426b24[a14_0x513a('0x2')](_0x1b87ce['id']);}_0x5cd34d++;}return _0x3808dc;}exports[a14_0x513a('0x0')]=splitTasksIntoStages;
|
|
@@ -1,100 +1 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TaskGraphCreator = exports.createTaskGraphCompat = void 0;
|
|
4
|
-
const stripJsonComments = require("strip-json-comments");
|
|
5
|
-
const fs_1 = require("fs");
|
|
6
|
-
const { getDependencyConfigs, workspaceRoot, } = require('../../../utilities/nx-imports');
|
|
7
|
-
function createTaskGraphCompat(options, projectGraph, tasks) {
|
|
8
|
-
const nxjson = JSON.parse(stripJsonComments((0, fs_1.readFileSync)(`${workspaceRoot}/nx.json`).toString()));
|
|
9
|
-
return new TaskGraphCreator(projectGraph, getDefaultDependencyConfigs(nxjson, options)).createTaskGraph(tasks);
|
|
10
|
-
}
|
|
11
|
-
exports.createTaskGraphCompat = createTaskGraphCompat;
|
|
12
|
-
function getDefaultDependencyConfigs(nxJson, runnerOptions) {
|
|
13
|
-
var _a, _b;
|
|
14
|
-
const defaults = (_a = nxJson.targetDependencies) !== null && _a !== void 0 ? _a : {};
|
|
15
|
-
const strictlyOrderedTargets = runnerOptions
|
|
16
|
-
? (_b = runnerOptions.strictlyOrderedTargets) !== null && _b !== void 0 ? _b : ['build']
|
|
17
|
-
: [];
|
|
18
|
-
// Strictly Ordered Targets depend on their dependencies
|
|
19
|
-
for (const target of strictlyOrderedTargets) {
|
|
20
|
-
defaults[target] = defaults[target] || [];
|
|
21
|
-
defaults[target].push({
|
|
22
|
-
target,
|
|
23
|
-
projects: 'dependencies',
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
return defaults;
|
|
27
|
-
}
|
|
28
|
-
/**
|
|
29
|
-
* This is only used for versions of Nx prior to 14 where the task graph
|
|
30
|
-
* wasn't part of the context so we have to recreate it
|
|
31
|
-
*/
|
|
32
|
-
class TaskGraphCreator {
|
|
33
|
-
constructor(projectGraph, defaultTargetDependencies) {
|
|
34
|
-
this.projectGraph = projectGraph;
|
|
35
|
-
this.defaultTargetDependencies = defaultTargetDependencies;
|
|
36
|
-
}
|
|
37
|
-
createTaskGraph(tasks) {
|
|
38
|
-
const graph = {
|
|
39
|
-
roots: [],
|
|
40
|
-
tasks: {},
|
|
41
|
-
dependencies: {},
|
|
42
|
-
};
|
|
43
|
-
for (const task of tasks) {
|
|
44
|
-
this.addTaskToGraph(task, graph);
|
|
45
|
-
const dependencyConfigs = getDependencyConfigs(task.target, this.defaultTargetDependencies, this.projectGraph);
|
|
46
|
-
if (!dependencyConfigs) {
|
|
47
|
-
continue;
|
|
48
|
-
}
|
|
49
|
-
this.addTaskDependencies(task, dependencyConfigs, tasks, graph);
|
|
50
|
-
}
|
|
51
|
-
graph.roots = Object.keys(graph.dependencies).filter((k) => graph.dependencies[k].length === 0);
|
|
52
|
-
return graph;
|
|
53
|
-
}
|
|
54
|
-
addTaskDependencies(task, dependencyConfigs, tasks, graph) {
|
|
55
|
-
for (const dependencyConfig of dependencyConfigs) {
|
|
56
|
-
if (dependencyConfig.projects === 'self') {
|
|
57
|
-
for (const t of tasks) {
|
|
58
|
-
if (t.target.project === task.target.project &&
|
|
59
|
-
t.target.target === dependencyConfig.target) {
|
|
60
|
-
graph.dependencies[task.id].push(t.id);
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
else if (dependencyConfig.projects === 'dependencies') {
|
|
65
|
-
const seen = new Set();
|
|
66
|
-
this.addDependencies(task.target.project, dependencyConfig.target, tasks, graph, task.id, seen);
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
addDependencies(project, target, tasks, graph, taskId, seen) {
|
|
71
|
-
seen.add(project);
|
|
72
|
-
const dependencies = this.projectGraph.dependencies[project];
|
|
73
|
-
if (dependencies) {
|
|
74
|
-
const projectDependencies = dependencies.map((dependency) => dependency.target);
|
|
75
|
-
for (const projectDependency of projectDependencies) {
|
|
76
|
-
if (seen.has(projectDependency)) {
|
|
77
|
-
continue;
|
|
78
|
-
}
|
|
79
|
-
const dependency = this.findTask({ project: projectDependency, target }, tasks);
|
|
80
|
-
if (dependency) {
|
|
81
|
-
if (graph.dependencies[taskId].indexOf(dependency.id) === -1) {
|
|
82
|
-
graph.dependencies[taskId].push(dependency.id);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
else {
|
|
86
|
-
this.addDependencies(projectDependency, target, tasks, graph, taskId, seen);
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
findTask({ project, target }, tasks) {
|
|
92
|
-
return tasks.find((t) => t.target.project === project && t.target.target === target);
|
|
93
|
-
}
|
|
94
|
-
addTaskToGraph(task, graph) {
|
|
95
|
-
graph.tasks[task.id] = task;
|
|
96
|
-
graph.dependencies[task.id] = [];
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
exports.TaskGraphCreator = TaskGraphCreator;
|
|
100
|
-
//# sourceMappingURL=task-graph-creator.js.map
|
|
1
|
+
const a15_0x16d3=['target','defaultTargetDependencies','find','indexOf','keys','add','length','strictlyOrderedTargets','build','tasks','projects','createTaskGraph','TaskGraphCreator','project','strip-json-comments','filter','__esModule','toString','../../../utilities/nx-imports','projectGraph','has','dependencies','defineProperty','push','addDependencies','roots','/nx.json','findTask','createTaskGraphCompat','addTaskDependencies','addTaskToGraph','self','parse'];(function(_0xdd71ec,_0x16d367){const _0x53b8b6=function(_0xd99597){while(--_0xd99597){_0xdd71ec['push'](_0xdd71ec['shift']());}};_0x53b8b6(++_0x16d367);}(a15_0x16d3,0x9e));const a15_0x53b8=function(_0xdd71ec,_0x16d367){_0xdd71ec=_0xdd71ec-0x0;let _0x53b8b6=a15_0x16d3[_0xdd71ec];return _0x53b8b6;};'use strict';Object[a15_0x53b8('0x1d')](exports,a15_0x53b8('0x17'),{'value':!![]});exports[a15_0x53b8('0x13')]=exports[a15_0x53b8('0x2')]=void 0x0;const stripJsonComments=require(a15_0x53b8('0x15'));const fs_1=require('fs');const {getDependencyConfigs,workspaceRoot}=require(a15_0x53b8('0x19'));function createTaskGraphCompat(_0x1107bb,_0x51d7cd,_0x1bdbb3){const _0x318202=JSON[a15_0x53b8('0x6')](stripJsonComments((0x0,fs_1['readFileSync'])(workspaceRoot+a15_0x53b8('0x0'))[a15_0x53b8('0x18')]()));return new TaskGraphCreator(_0x51d7cd,getDefaultDependencyConfigs(_0x318202,_0x1107bb))[a15_0x53b8('0x12')](_0x1bdbb3);}exports[a15_0x53b8('0x2')]=createTaskGraphCompat;function getDefaultDependencyConfigs(_0x53a470,_0x564887){var _0x5cb2f2,_0x2d7f22;const _0x27b925=(_0x5cb2f2=_0x53a470['targetDependencies'])!==null&&_0x5cb2f2!==void 0x0?_0x5cb2f2:{};const _0x13b3cf=_0x564887?(_0x2d7f22=_0x564887[a15_0x53b8('0xe')])!==null&&_0x2d7f22!==void 0x0?_0x2d7f22:[a15_0x53b8('0xf')]:[];for(const _0xdccc05 of _0x13b3cf){_0x27b925[_0xdccc05]=_0x27b925[_0xdccc05]||[];_0x27b925[_0xdccc05][a15_0x53b8('0x1e')]({'target':_0xdccc05,'projects':a15_0x53b8('0x1c')});}return _0x27b925;}class TaskGraphCreator{constructor(_0x58e8f,_0x12f8f3){this[a15_0x53b8('0x1a')]=_0x58e8f;this[a15_0x53b8('0x8')]=_0x12f8f3;}[a15_0x53b8('0x12')](_0x5d0d3f){const _0x4c4d34={'roots':[],'tasks':{},'dependencies':{}};for(const _0xe86f0c of _0x5d0d3f){this[a15_0x53b8('0x4')](_0xe86f0c,_0x4c4d34);const _0x1eef17=getDependencyConfigs(_0xe86f0c[a15_0x53b8('0x7')],this[a15_0x53b8('0x8')],this[a15_0x53b8('0x1a')]);if(!_0x1eef17){continue;}this[a15_0x53b8('0x3')](_0xe86f0c,_0x1eef17,_0x5d0d3f,_0x4c4d34);}_0x4c4d34[a15_0x53b8('0x20')]=Object[a15_0x53b8('0xb')](_0x4c4d34['dependencies'])[a15_0x53b8('0x16')](_0x965af4=>_0x4c4d34['dependencies'][_0x965af4][a15_0x53b8('0xd')]===0x0);return _0x4c4d34;}[a15_0x53b8('0x3')](_0x2a52e7,_0x33ff1d,_0x4d91e9,_0x73e47f){for(const _0x34c4bd of _0x33ff1d){if(_0x34c4bd['projects']===a15_0x53b8('0x5')){for(const _0x25d763 of _0x4d91e9){if(_0x25d763[a15_0x53b8('0x7')][a15_0x53b8('0x14')]===_0x2a52e7[a15_0x53b8('0x7')]['project']&&_0x25d763[a15_0x53b8('0x7')][a15_0x53b8('0x7')]===_0x34c4bd['target']){_0x73e47f[a15_0x53b8('0x1c')][_0x2a52e7['id']][a15_0x53b8('0x1e')](_0x25d763['id']);}}}else if(_0x34c4bd[a15_0x53b8('0x11')]===a15_0x53b8('0x1c')){const _0x4c04f9=new Set();this['addDependencies'](_0x2a52e7['target'][a15_0x53b8('0x14')],_0x34c4bd[a15_0x53b8('0x7')],_0x4d91e9,_0x73e47f,_0x2a52e7['id'],_0x4c04f9);}}}['addDependencies'](_0x47db92,_0x292ced,_0x1ea3fd,_0x19f3fc,_0x3ecded,_0x283222){_0x283222[a15_0x53b8('0xc')](_0x47db92);const _0x5d9ec3=this[a15_0x53b8('0x1a')][a15_0x53b8('0x1c')][_0x47db92];if(_0x5d9ec3){const _0xfd7acd=_0x5d9ec3['map'](_0x45c2b4=>_0x45c2b4[a15_0x53b8('0x7')]);for(const _0x57ccb2 of _0xfd7acd){if(_0x283222[a15_0x53b8('0x1b')](_0x57ccb2)){continue;}const _0x59e764=this[a15_0x53b8('0x1')]({'project':_0x57ccb2,'target':_0x292ced},_0x1ea3fd);if(_0x59e764){if(_0x19f3fc[a15_0x53b8('0x1c')][_0x3ecded][a15_0x53b8('0xa')](_0x59e764['id'])===-0x1){_0x19f3fc[a15_0x53b8('0x1c')][_0x3ecded][a15_0x53b8('0x1e')](_0x59e764['id']);}}else{this[a15_0x53b8('0x1f')](_0x57ccb2,_0x292ced,_0x1ea3fd,_0x19f3fc,_0x3ecded,_0x283222);}}}}[a15_0x53b8('0x1')]({project,target},_0xd9fa0f){return _0xd9fa0f[a15_0x53b8('0x9')](_0x3c2c5f=>_0x3c2c5f[a15_0x53b8('0x7')]['project']===project&&_0x3c2c5f[a15_0x53b8('0x7')][a15_0x53b8('0x7')]===target);}['addTaskToGraph'](_0x22894d,_0xf741b0){_0xf741b0[a15_0x53b8('0x10')][_0x22894d['id']]=_0x22894d;_0xf741b0['dependencies'][_0x22894d['id']]=[];}}exports[a15_0x53b8('0x13')]=TaskGraphCreator;
|
|
@@ -3,6 +3,7 @@ import { TaskExecution } from '../models/task-execution.model';
|
|
|
3
3
|
export declare class EndOfRunMessage {
|
|
4
4
|
private readonly runContext;
|
|
5
5
|
private readonly taskExecutions;
|
|
6
|
-
|
|
6
|
+
private readonly distributedExecutionId;
|
|
7
|
+
constructor(runContext: RunContext, taskExecutions: TaskExecution[], distributedExecutionId: string | undefined);
|
|
7
8
|
printCacheHitsMessage(): void;
|
|
8
9
|
}
|
|
@@ -4,12 +4,13 @@ exports.EndOfRunMessage = void 0;
|
|
|
4
4
|
const environment_1 = require("../../utilities/environment");
|
|
5
5
|
const print_message_1 = require("../../utilities/print-message");
|
|
6
6
|
class EndOfRunMessage {
|
|
7
|
-
constructor(runContext, taskExecutions) {
|
|
7
|
+
constructor(runContext, taskExecutions, distributedExecutionId) {
|
|
8
8
|
this.runContext = runContext;
|
|
9
9
|
this.taskExecutions = taskExecutions;
|
|
10
|
+
this.distributedExecutionId = distributedExecutionId;
|
|
10
11
|
}
|
|
11
12
|
printCacheHitsMessage() {
|
|
12
|
-
if ((0, environment_1.agentRunningInDistributedExecution)())
|
|
13
|
+
if ((0, environment_1.agentRunningInDistributedExecution)(this.distributedExecutionId))
|
|
13
14
|
return;
|
|
14
15
|
if (!this.runContext.runUrl) {
|
|
15
16
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;AAEA,6DAAiF;AACjF,iEAA6D;AAE7D,MAAa,eAAe;IAC1B,YACmB,UAAsB,EACtB,cAA+B
|
|
1
|
+
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;AAEA,6DAAiF;AACjF,iEAA6D;AAE7D,MAAa,eAAe;IAC1B,YACmB,UAAsB,EACtB,cAA+B,EAC/B,sBAA0C;QAF1C,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAiB;QAC/B,2BAAsB,GAAtB,sBAAsB,CAAoB;IAC1D,CAAC;IAEJ,qBAAqB;QACnB,IAAI,IAAA,gDAAkC,EAAC,IAAI,CAAC,sBAAsB,CAAC;YAAE,OAAO;QAE5E,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC3B,OAAO;SACR;QAED,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAC/C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,KAAK,YAAY,CACxC,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc;aAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,kBAAkB,CAAC;aACtE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAE7B,MAAM,OAAO,GAAG,EAAW,CAAC;QAC5B,IAAI,SAAS,EAAE;YACb,OAAO,CAAC,IAAI,CACV,6CAA6C,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CACtE,CAAC;SACH;aAAM,IAAI,cAAc,EAAE;YACzB,OAAO,CAAC,IAAI,CACV,6CAA6C,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CACtE,CAAC;SACH;aAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,QAAQ,CAAC;YACnE,OAAO,CAAC,IAAI,CACV,sCAAsC,KAAK,KAAK,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CACzE,CAAC;SACH;aAAM;YACL,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC1B,OAAO,CAAC,IAAI,CAAC,gCAAgC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;aACxE;SACF;QACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,IAAA,4BAAY,EAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACjC;IACH,CAAC;CACF;AA9CD,0CA8CC"}
|
|
@@ -37,12 +37,12 @@ const nxCloudTasksRunner = (tasks, options, context) => {
|
|
|
37
37
|
return tasksRunner(tasks, options, context);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
if ((0, environment_1.agentRunningInDistributedExecution)()) {
|
|
40
|
+
if ((0, environment_1.agentRunningInDistributedExecution)(process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID)) {
|
|
41
41
|
verifyAllOperationsAreCacheableOnAgent(tasks, options);
|
|
42
42
|
}
|
|
43
43
|
// distributed execution, main job
|
|
44
44
|
if ((0, distributed_task_execution_detection_1.isDistributedExecutionEnabled)(nxArgs['dte']) &&
|
|
45
|
-
!(0, environment_1.agentRunningInDistributedExecution)()) {
|
|
45
|
+
!(0, environment_1.agentRunningInDistributedExecution)(process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID)) {
|
|
46
46
|
verifyAllOperationsAreCacheableOnMainJob(tasks, options);
|
|
47
47
|
if (runnerReturnsPromise) {
|
|
48
48
|
return dtePromiseVersion(tasks, options, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-cloud-tasks-runner.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/lib/nx-cloud-tasks-runner.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,yDAKiC;AACjC,6CAA+E;AAC/E,4FAA4F;AAE5F,2GAAiG;AAEjG,MAAM,EACJ,WAAW,EACX,MAAM,EACN,oBAAoB,GACrB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAEtC,MAAM,kBAAkB,GAAQ,CAC9B,KAAa,EACb,OAA+B,EAC/B,OAAY,EACP,EAAE;IACP,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE9B,MAAM,oBAAoB,GAAG,CAAC,0BAAY,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACnE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC;IAEjE,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EACH,0EAA0E;YAC5E,SAAS,EAAE;gBACT,uEAAuE;aACxE;SACF,CAAC,CAAC;KACJ;IAED,IAAI,oBAAoB,IAAI,OAAO,EAAE;QACnC,OAAO,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAQ,CAAC;KACpD;IAED,IAAI,IAAA,+BAAiB,GAAE,EAAE;QACvB,IAAI,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE;YACvC,OAAO,IAAA,8CAAuB,EAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;SAC/D;aAAM;YACL,OAAO,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAQ,CAAC;SACpD;KACF;IAED,
|
|
1
|
+
{"version":3,"file":"nx-cloud-tasks-runner.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/lib/nx-cloud-tasks-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare let ACCESS_TOKEN: any;
|
|
|
16
16
|
export declare let ENCRYPTION_KEY: any;
|
|
17
17
|
export declare let VERBOSE_LOGGING: any;
|
|
18
18
|
export declare let NX_CLOUD_NO_TIMEOUTS: any;
|
|
19
|
-
export declare function agentRunningInDistributedExecution(): boolean;
|
|
19
|
+
export declare function agentRunningInDistributedExecution(distributedExecutionId: string | undefined): boolean;
|
|
20
20
|
export declare function nxInvokedByRunner(): boolean;
|
|
21
21
|
export declare function extractGitSha(): string | undefined;
|
|
22
22
|
export declare function getRunGroup(): string | undefined;
|
|
@@ -33,8 +33,8 @@ exports.NUMBER_OF_AXIOS_RETRIES = process.env.NX_CLOUD_NUMBER_OF_RETRIES
|
|
|
33
33
|
? 10
|
|
34
34
|
: 1;
|
|
35
35
|
loadEnvVars();
|
|
36
|
-
function agentRunningInDistributedExecution() {
|
|
37
|
-
return !!
|
|
36
|
+
function agentRunningInDistributedExecution(distributedExecutionId) {
|
|
37
|
+
return !!distributedExecutionId;
|
|
38
38
|
}
|
|
39
39
|
exports.agentRunningInDistributedExecution = agentRunningInDistributedExecution;
|
|
40
40
|
function nxInvokedByRunner() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/environment.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,iCAAiC;AACjC,2BAAkC;AAElC,+BAAmC;AAInC,mCAA+B;AAE/B,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAElD,WAAW;AACE,QAAA,yBAAyB,GAAG,0BAA0B,CAAC;AACvD,QAAA,iBAAiB,GAAG,OAAO,CAAC;AAC5B,QAAA,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB;IACtE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IAC/C,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa;AACb,QAAA,0BAA0B,GAAG,OAAO,CAAC,GAAG;KAClD,gCAAgC;IACjC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC;IACtD,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa;AACb,QAAA,mBAAmB,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,CAAC;AAC1C,QAAA,yBAAyB,GACpC,OAAO,CAAC,GAAG,CAAC,yBAAyB,KAAK,MAAM,CAAC;AACtC,QAAA,uBAAuB,GAAG,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC;AAC5C,QAAA,qDAAqD,GAAG,GAAG,CAAC;AAC5D,QAAA,0CAA0C,GAAG,OAAO,CAAC,GAAG;KAClE,0CAA0C;IAC3C,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC;IAChE,CAAC,CAAC,IAAI,CAAC;AACI,QAAA,qDAAqD,GAChE,OAAO,CAAC,GAAG,CAAC,qDAAqD,IAAI,OAAO,CAAC;AAClE,QAAA,sBAAsB,GACjC,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,MAAM,CAAC;AACnC,QAAA,uBAAuB,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B;IAC3E,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;IAChD,CAAC,CAAC,IAAA,YAAI,GAAE;QACR,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,CAAC,CAAC;AAON,WAAW,EAAE,CAAC;AAEd,SAAgB,kCAAkC
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/environment.ts"],"names":[],"mappings":"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"}
|