@nrwl/nx-cloud 15.1.0 → 15.2.0-beta.1

package/lib/core/runners/distributed-execution/process-task.js

@@ -0,0 +1,45 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processTask = void 0;
+const environment_1 = require("../../../utilities/environment");
+const serializer_overrides_1 = require("../../../utilities/serializer-overrides");
+const { output } = require('../../../utilities/nx-imports');
+function processTask(dteArtifactStorage, tasks, completedTask) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (environment_1.VERBOSE_LOGGING) {
+            output.note({
+                title: `Processing task ${completedTask.taskId}`,
+            });
+        }
+        const matchingTask = tasks.find((tt) => completedTask.taskId === tt.id);
+        if (!matchingTask) {
+            throw new Error(`Found unknown task: ${completedTask.taskId}`);
+        }
+        const terminalOutput = yield dteArtifactStorage.retrieveAndExtract(completedTask.hash, completedTask.url);
+        output.logCommand(getCommand(matchingTask));
+        process.stdout.write(terminalOutput);
+        output.addVerticalSeparator();
+    });
+}
+exports.processTask = processTask;
+function getCommand(task) {
+    const config = task.target.configuration
+        ? `:${task.target.configuration}`
+        : '';
+    return [
+        'nx',
+        'run',
+        `${task.target.project}:${task.target.target}${config}`,
+        (0, serializer_overrides_1.serializeOverrides)(task),
+    ].join(' ');
+}
+//# sourceMappingURL=process-task.js.map

package/lib/core/runners/distributed-execution/process-task.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-task.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-execution/process-task.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gEAAiE;AACjE,kFAA6E;AAG7E,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AAE5D,SAAsB,WAAW,CAC/B,kBAAsC,EACtC,KAAa,EACb,aAA4D;;QAE5D,IAAI,6BAAe,EAAE;YACnB,MAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,mBAAmB,aAAa,CAAC,MAAM,EAAE;aACjD,CAAC,CAAC;SACJ;QACD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,uBAAuB,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;SAChE;QAED,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC,kBAAkB,CAChE,aAAa,CAAC,IAAI,EAClB,aAAa,CAAC,GAAG,CAClB,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACrC,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAChC,CAAC;CAAA;AAvBD,kCAuBC;AAED,SAAS,UAAU,CAAC,IAAU;IAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa;QACtC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACjC,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,KAAK;QACL,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE;QACvD,IAAA,yCAAkB,EAAC,IAAI,CAAC;KACzB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC"}

package/lib/core/runners/distributed-execution/process-tasks.d.ts

@@ -0,0 +1,7 @@
+import { DistributedExecutionApi } from './distributed-execution.api';
+import { Task } from '../../models/run-context.model';
+import { DteArtifactStorage } from '../../../utilities/dte-artifact-storage';
+export declare function processTasks(api: DistributedExecutionApi, dteArtifactStorage: DteArtifactStorage, executionId: string, tasks: Task[]): Promise<{
+    commandStatus: any;
+    runUrl: any;
+}>;

package/lib/core/runners/distributed-execution/process-tasks.js

@@ -0,0 +1,67 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processTasks = void 0;
+const create_unchanged_value_timeout_1 = require("../../../utilities/create-unchanged-value-timeout");
+const environment_1 = require("../../../utilities/environment");
+const waiter_1 = require("../../../utilities/waiter");
+const process_task_1 = require("./process-task");
+const { output } = require('../../../utilities/nx-imports');
+function processTasks(api, dteArtifactStorage, executionId, tasks) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const processedTasks = {};
+        const failIfNumberOfCompletedTasksDoesNotChangeAfterTimeout = (0, create_unchanged_value_timeout_1.createUnchangedValueTimeout)({
+            title: `No new completed tasks after ${environment_1.NO_COMPLETED_TASKS_TIMEOUT / 1000} seconds.`,
+            timeout: environment_1.NO_COMPLETED_TASKS_TIMEOUT,
+        });
+        const waiter = new waiter_1.Waiter();
+        while (true) {
+            if (environment_1.VERBOSE_LOGGING) {
+                output.note({
+                    title: 'Waiting...',
+                });
+            }
+            yield waiter.wait();
+            const r = yield api.status(executionId);
+            if (environment_1.VERBOSE_LOGGING) {
+                output.note({
+                    title: `Status update`,
+                    bodyLines: [
+                        `executionId: ${executionId}`,
+                        `executionStatus: ${r.executionStatus}`,
+                        `number of completed tasks: ${r.completedTasks.length}`,
+                        `error: ${r.criticalErrorMessage}`,
+                    ],
+                });
+            }
+            if (r.criticalErrorMessage) {
+                output.error({
+                    title: 'Distributed Execution Terminated',
+                    bodyLines: ['Error:', r.criticalErrorMessage],
+                });
+                process.exit(1);
+            }
+            failIfNumberOfCompletedTasksDoesNotChangeAfterTimeout(r.completedTasks.length);
+            for (const t of r.completedTasks) {
+                if (processedTasks[t.taskId])
+                    continue;
+                yield (0, process_task_1.processTask)(dteArtifactStorage, tasks, t);
+                waiter.reset();
+                processedTasks[t.taskId] = true;
+            }
+            if (r.executionStatus === 'COMPLETED') {
+                return { commandStatus: r.commandStatus, runUrl: r.runUrl };
+            }
+        }
+    });
+}
+exports.processTasks = processTasks;
+//# sourceMappingURL=process-tasks.js.map

package/lib/core/runners/distributed-execution/process-tasks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-tasks.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-execution/process-tasks.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,sGAAgG;AAChG,gEAGwC;AACxC,sDAAmD;AACnD,iDAA6C;AAG7C,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AAE5D,SAAsB,YAAY,CAChC,GAA4B,EAC5B,kBAAsC,EACtC,WAAmB,EACnB,KAAa;;QAEb,MAAM,cAAc,GAAG,EAAE,CAAC;QAC1B,MAAM,qDAAqD,GACzD,IAAA,4DAA2B,EAAC;YAC1B,KAAK,EAAE,gCACL,wCAA0B,GAAG,IAC/B,WAAW;YACX,OAAO,EAAE,wCAA0B;SACpC,CAAC,CAAC;QACL,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;QAC5B,OAAO,IAAI,EAAE;YACX,IAAI,6BAAe,EAAE;gBACnB,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,YAAY;iBACpB,CAAC,CAAC;aACJ;YAED,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAExC,IAAI,6BAAe,EAAE;gBACnB,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,eAAe;oBACtB,SAAS,EAAE;wBACT,gBAAgB,WAAW,EAAE;wBAC7B,oBAAoB,CAAC,CAAC,eAAe,EAAE;wBACvC,8BAA8B,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE;wBACvD,UAAU,CAAC,CAAC,oBAAoB,EAAE;qBACnC;iBACF,CAAC,CAAC;aACJ;YAED,IAAI,CAAC,CAAC,oBAAoB,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,kCAAkC;oBACzC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,oBAAoB,CAAC;iBAC9C,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YAED,qDAAqD,CACnD,CAAC,CAAC,cAAc,CAAC,MAAM,CACxB,CAAC;YAEF,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE;gBAChC,IAAI,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;oBAAE,SAAS;gBACvC,MAAM,IAAA,0BAAW,EAAC,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBAChD,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;aACjC;YACD,IAAI,CAAC,CAAC,eAAe,KAAK,WAAW,EAAE;gBACrC,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;aAC7D;SACF;IACH,CAAC;CAAA;AA3DD,oCA2DC"}

package/lib/core/runners/distributed-execution/split-task-graph-into-stages.js

@@ -1 +1,37 @@
-const a9_0x13f3=['has','tasks','splitTasksIntoStages','defineProperty','values','dependencies','size','push'];(function(_0x1c8bff,_0x13f324){const _0xce7e24=function(_0x33651a){while(--_0x33651a){_0x1c8bff['push'](_0x1c8bff['shift']());}};_0xce7e24(++_0x13f324);}(a9_0x13f3,0xdc));const a9_0xce7e=function(_0x1c8bff,_0x13f324){_0x1c8bff=_0x1c8bff-0x0;let _0xce7e24=a9_0x13f3[_0x1c8bff];return _0xce7e24;};'use strict';Object[a9_0xce7e('0x7')](exports,'__esModule',{'value':!![]});exports[a9_0xce7e('0x6')]=void 0x0;function splitTasksIntoStages(_0x489f4d){const _0x2f40b=[];const _0x557b20=new Set(Object[a9_0xce7e('0x0')](_0x489f4d[a9_0xce7e('0x5')])['map'](_0x34db0c=>_0x34db0c['id']));let _0xbdf4da=0x0;while(_0x557b20[a9_0xce7e('0x2')]>0x0){const _0xe624f7=_0x2f40b[_0xbdf4da]=[];for(const _0x526f68 of _0x557b20){let _0x1864d3=!![];for(const _0x11fc11 of _0x489f4d[a9_0xce7e('0x1')][_0x526f68]){if(_0x557b20[a9_0xce7e('0x4')](_0x11fc11)){_0x1864d3=![];break;}}if(!_0x1864d3){continue;}const _0x25dc68=_0x489f4d[a9_0xce7e('0x5')][_0x526f68];_0xe624f7[a9_0xce7e('0x3')](_0x25dc68);}for(const _0x45e14d of _0xe624f7){_0x557b20['delete'](_0x45e14d['id']);}_0xbdf4da++;}return _0x2f40b;}exports[a9_0xce7e('0x6')]=splitTasksIntoStages;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitTasksIntoStages = void 0;
+function splitTasksIntoStages(taskGraph) {
+    const stages = [];
+    const notStagedTaskIds = new Set(Object.values(taskGraph.tasks).map((t) => t.id));
+    let stageIndex = 0;
+    // Loop through tasks and try to stage them. As tasks are staged, they are removed from the loop
+    while (notStagedTaskIds.size > 0) {
+        const currentStage = (stages[stageIndex] = []);
+        for (const taskId of notStagedTaskIds) {
+            let ready = true;
+            for (const dependency of taskGraph.dependencies[taskId]) {
+                if (notStagedTaskIds.has(dependency)) {
+                    // dependency has not been staged yet, this task is not ready to be staged.
+                    ready = false;
+                    break;
+                }
+            }
+            // Some dependency still has not been staged, skip it for now, it will be processed again
+            if (!ready) {
+                continue;
+            }
+            // All the dependencies have been staged, let's stage it.
+            const task = taskGraph.tasks[taskId];
+            currentStage.push(task);
+        }
+        // Remove the entire new stage of tasks from the list
+        for (const task of currentStage) {
+            notStagedTaskIds.delete(task.id);
+        }
+        stageIndex++;
+    }
+    return stages;
+}
+exports.splitTasksIntoStages = splitTasksIntoStages;
+//# sourceMappingURL=split-task-graph-into-stages.js.map

package/lib/core/runners/distributed-execution/task-graph-creator.d.ts

@@ -1,4 +1,6 @@
 import { ProjectGraph, Task, TaskGraph } from '../../models/run-context.model';
+import { CloudTaskRunnerOptions } from '../../models/cloud-task-runner-options';
+export declare function createTaskGraphCompat(options: CloudTaskRunnerOptions, projectGraph: ProjectGraph, tasks: Task[]): TaskGraph;
 /**
  * This is only used for versions of Nx prior to 14 where the task graph
  * wasn't part of the context so we have to recreate it

package/lib/core/runners/distributed-execution/task-graph-creator.js

@@ -1 +1,100 @@
-const a10_0x5f1a=['keys','filter','push','__esModule','dependencies','addTaskToGraph','createTaskGraph','project','target','self','findTask','projects','tasks','length','indexOf','has','../../../utilities/nx-imports','map','addTaskDependencies','defaultTargetDependencies','addDependencies','add','TaskGraphCreator'];(function(_0x323eec,_0x5f1a32){const _0x4bdcf4=function(_0x54a0cd){while(--_0x54a0cd){_0x323eec['push'](_0x323eec['shift']());}};_0x4bdcf4(++_0x5f1a32);}(a10_0x5f1a,0x137));const a10_0x4bdc=function(_0x323eec,_0x5f1a32){_0x323eec=_0x323eec-0x0;let _0x4bdcf4=a10_0x5f1a[_0x323eec];return _0x4bdcf4;};'use strict';Object['defineProperty'](exports,a10_0x4bdc('0xe'),{'value':!![]});exports[a10_0x4bdc('0xa')]=void 0x0;const {getDependencyConfigs}=require(a10_0x4bdc('0x4'));class TaskGraphCreator{constructor(_0x9fd488,_0x2ba92c){this['projectGraph']=_0x9fd488;this['defaultTargetDependencies']=_0x2ba92c;}[a10_0x4bdc('0x11')](_0x37c6e8){const _0x1fa428={'roots':[],'tasks':{},'dependencies':{}};for(const _0x307cbd of _0x37c6e8){this[a10_0x4bdc('0x10')](_0x307cbd,_0x1fa428);const _0x1b125b=getDependencyConfigs(_0x307cbd[a10_0x4bdc('0x13')],this[a10_0x4bdc('0x7')],this['projectGraph']);if(!_0x1b125b){continue;}this[a10_0x4bdc('0x6')](_0x307cbd,_0x1b125b,_0x37c6e8,_0x1fa428);}_0x1fa428['roots']=Object[a10_0x4bdc('0xb')](_0x1fa428['dependencies'])[a10_0x4bdc('0xc')](_0x5a628b=>_0x1fa428[a10_0x4bdc('0xf')][_0x5a628b][a10_0x4bdc('0x1')]===0x0);return _0x1fa428;}[a10_0x4bdc('0x6')](_0x38b10c,_0x57defb,_0x2c2762,_0x449b41){for(const _0x286311 of _0x57defb){if(_0x286311[a10_0x4bdc('0x16')]===a10_0x4bdc('0x14')){for(const _0x25f48a of _0x2c2762){if(_0x25f48a['target']['project']===_0x38b10c['target'][a10_0x4bdc('0x12')]&&_0x25f48a[a10_0x4bdc('0x13')]['target']===_0x286311['target']){_0x449b41[a10_0x4bdc('0xf')][_0x38b10c['id']][a10_0x4bdc('0xd')](_0x25f48a['id']);}}}else if(_0x286311[a10_0x4bdc('0x16')]===a10_0x4bdc('0xf')){const _0x39f58c=new Set();this[a10_0x4bdc('0x8')](_0x38b10c['target'][a10_0x4bdc('0x12')],_0x286311[a10_0x4bdc('0x13')],_0x2c2762,_0x449b41,_0x38b10c['id'],_0x39f58c);}}}[a10_0x4bdc('0x8')](_0x7ca7ab,_0x117ce6,_0x4f399c,_0x5cadb9,_0x5c6077,_0x236910){_0x236910[a10_0x4bdc('0x9')](_0x7ca7ab);const _0x1be6da=this['projectGraph'][a10_0x4bdc('0xf')][_0x7ca7ab];if(_0x1be6da){const _0x187ecf=_0x1be6da[a10_0x4bdc('0x5')](_0x142b2d=>_0x142b2d[a10_0x4bdc('0x13')]);for(const _0xe00feb of _0x187ecf){if(_0x236910[a10_0x4bdc('0x3')](_0xe00feb)){continue;}const _0x2f228b=this[a10_0x4bdc('0x15')]({'project':_0xe00feb,'target':_0x117ce6},_0x4f399c);if(_0x2f228b){if(_0x5cadb9[a10_0x4bdc('0xf')][_0x5c6077][a10_0x4bdc('0x2')](_0x2f228b['id'])===-0x1){_0x5cadb9['dependencies'][_0x5c6077][a10_0x4bdc('0xd')](_0x2f228b['id']);}}else{this[a10_0x4bdc('0x8')](_0xe00feb,_0x117ce6,_0x4f399c,_0x5cadb9,_0x5c6077,_0x236910);}}}}['findTask']({project,target},_0x25d0c6){return _0x25d0c6['find'](_0x53bcbd=>_0x53bcbd['target'][a10_0x4bdc('0x12')]===project&&_0x53bcbd[a10_0x4bdc('0x13')][a10_0x4bdc('0x13')]===target);}[a10_0x4bdc('0x10')](_0x2b7ee1,_0x9f2754){_0x9f2754[a10_0x4bdc('0x0')][_0x2b7ee1['id']]=_0x2b7ee1;_0x9f2754[a10_0x4bdc('0xf')][_0x2b7ee1['id']]=[];}}exports[a10_0x4bdc('0xa')]=TaskGraphCreator;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskGraphCreator = exports.createTaskGraphCompat = void 0;
+const stripJsonComments = require("strip-json-comments");
+const fs_1 = require("fs");
+const { getDependencyConfigs, workspaceRoot, } = require('../../../utilities/nx-imports');
+function createTaskGraphCompat(options, projectGraph, tasks) {
+    const nxjson = JSON.parse(stripJsonComments((0, fs_1.readFileSync)(`${workspaceRoot}/nx.json`).toString()));
+    return new TaskGraphCreator(projectGraph, getDefaultDependencyConfigs(nxjson, options)).createTaskGraph(tasks);
+}
+exports.createTaskGraphCompat = createTaskGraphCompat;
+function getDefaultDependencyConfigs(nxJson, runnerOptions) {
+    var _a, _b;
+    const defaults = (_a = nxJson.targetDependencies) !== null && _a !== void 0 ? _a : {};
+    const strictlyOrderedTargets = runnerOptions
+        ? (_b = runnerOptions.strictlyOrderedTargets) !== null && _b !== void 0 ? _b : ['build']
+        : [];
+    // Strictly Ordered Targets depend on their dependencies
+    for (const target of strictlyOrderedTargets) {
+        defaults[target] = defaults[target] || [];
+        defaults[target].push({
+            target,
+            projects: 'dependencies',
+        });
+    }
+    return defaults;
+}
+/**
+ * This is only used for versions of Nx prior to 14 where the task graph
+ * wasn't part of the context so we have to recreate it
+ */
+class TaskGraphCreator {
+    constructor(projectGraph, defaultTargetDependencies) {
+        this.projectGraph = projectGraph;
+        this.defaultTargetDependencies = defaultTargetDependencies;
+    }
+    createTaskGraph(tasks) {
+        const graph = {
+            roots: [],
+            tasks: {},
+            dependencies: {},
+        };
+        for (const task of tasks) {
+            this.addTaskToGraph(task, graph);
+            const dependencyConfigs = getDependencyConfigs(task.target, this.defaultTargetDependencies, this.projectGraph);
+            if (!dependencyConfigs) {
+                continue;
+            }
+            this.addTaskDependencies(task, dependencyConfigs, tasks, graph);
+        }
+        graph.roots = Object.keys(graph.dependencies).filter((k) => graph.dependencies[k].length === 0);
+        return graph;
+    }
+    addTaskDependencies(task, dependencyConfigs, tasks, graph) {
+        for (const dependencyConfig of dependencyConfigs) {
+            if (dependencyConfig.projects === 'self') {
+                for (const t of tasks) {
+                    if (t.target.project === task.target.project &&
+                        t.target.target === dependencyConfig.target) {
+                        graph.dependencies[task.id].push(t.id);
+                    }
+                }
+            }
+            else if (dependencyConfig.projects === 'dependencies') {
+                const seen = new Set();
+                this.addDependencies(task.target.project, dependencyConfig.target, tasks, graph, task.id, seen);
+            }
+        }
+    }
+    addDependencies(project, target, tasks, graph, taskId, seen) {
+        seen.add(project);
+        const dependencies = this.projectGraph.dependencies[project];
+        if (dependencies) {
+            const projectDependencies = dependencies.map((dependency) => dependency.target);
+            for (const projectDependency of projectDependencies) {
+                if (seen.has(projectDependency)) {
+                    continue;
+                }
+                const dependency = this.findTask({ project: projectDependency, target }, tasks);
+                if (dependency) {
+                    if (graph.dependencies[taskId].indexOf(dependency.id) === -1) {
+                        graph.dependencies[taskId].push(dependency.id);
+                    }
+                }
+                else {
+                    this.addDependencies(projectDependency, target, tasks, graph, taskId, seen);
+                }
+            }
+        }
+    }
+    findTask({ project, target }, tasks) {
+        return tasks.find((t) => t.target.project === project && t.target.target === target);
+    }
+    addTaskToGraph(task, graph) {
+        graph.tasks[task.id] = task;
+        graph.dependencies[task.id] = [];
+    }
+}
+exports.TaskGraphCreator = TaskGraphCreator;
+//# sourceMappingURL=task-graph-creator.js.map

package/lib/core/runners/distributed-execution/task-graph-creator.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-graph-creator.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-execution/task-graph-creator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-graph-creator.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-execution/task-graph-creator.ts"],"names":[],"mappings":"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"}

package/lib/daemon/process-run-end.js

@@ -16,21 +16,20 @@ const e2e_encryption_1 = require("../core/file-storage/e2e-encryption");
 const environment_1 = require("../utilities/environment");
 const message_reporter_1 = require("../core/terminal-output/message-reporter");
 const metric_logger_1 = require("../utilities/metric-logger");
-const { Cache } = require('../utilities/nx-imports');
 function processRunEnd(data, logger) {
     return __awaiter(this, void 0, void 0, function* () {
         const encryption = new e2e_encryption_1.E2EEncryption(data.encryptionKey);
         const errorApi = new error_reporter_api_1.ErrorReporterApi(data.runnerOptions);
         const fileStorage = new file_storage_1.FileStorage(encryption, errorApi, false, false);
+        const cachePath = (0, environment_1.getNxCacheDirectory)(data.runnerOptions);
         const reporter = new message_reporter_1.MessageReporter(data.runnerOptions);
         const runContext = {};
         const machineInfo = (0, environment_1.getMachineInfo)(data.runnerOptions);
         const api = new cloud_run_api_1.CloudRunApi(reporter, runContext, data.runnerOptions, machineInfo);
-        const cache = new Cache(data.runnerOptions);
         setTimeout(() => __awaiter(this, void 0, void 0, function* () {
             logger.log('Uploading file artifacts');
             try {
-                yield Promise.all(data.uploads.map((t) => fileStorage.store(t.hash, t.url, cache.cachePath)));
+                yield Promise.all(data.uploads.map((t) => fileStorage.store(t.hash, t.url, cachePath)));
                 logger.log('Done uploading file artifacts');
             }
             catch (e) {

package/lib/daemon/process-run-end.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-run-end.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/daemon/process-run-end.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,oEAAgE;AAChE,+EAA0E;AAC1E,uEAAkE;AAClE,wEAAoE;AACpE,0DAA0D;AAC1D,+EAA2E;AAC3E,8DAA8D;AAE9D,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAErD,SAA8B,aAAa,CACzC,IAAS,EACT,MAAsC;;QAEtC,MAAM,UAAU,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,qCAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAI,0BAAW,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAExE,MAAM,QAAQ,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,EAAS,CAAC;QAC7B,MAAM,WAAW,GAAG,IAAA,4BAAc,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,IAAI,2BAAW,CACzB,QAAQ,EACR,UAAU,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,CACZ,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAE5C,UAAU,CAAC,GAAS,EAAE;YACpB,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACvC,IAAI;gBACF,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACrB,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAClD,CACF,CAAC;gBACF,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;aAC7C;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAClD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACf,OAAO;aACR;YAED,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YACrC,yBAAyB;YACzB,IAAI;gBACF,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,MAAM,CAC1B,IAAI,CAAC,MAAM,CAAC,OAAO,EACnB,IAAI,CAAC,MAAM,CAAC,cAAc,EAC1B,IAAI,CAAC,MAAM,CAAC,MAAM,CACnB,CAAC;gBACF,IAAI,CAAC,GAAG,EAAE;oBACR,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAU,CAAC,CAAC;iBACtC;gBACD,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;aAC3C;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAChB;YACD,MAAM,IAAA,gCAAgB,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC,CAAA,EAAE,CAAC,CAAC,CAAC;QAEN,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAvDD,gCAuDC"}
+{"version":3,"file":"process-run-end.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/daemon/process-run-end.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,oEAAgE;AAChE,+EAA0E;AAC1E,uEAAkE;AAClE,wEAAoE;AACpE,0DAA+E;AAC/E,+EAA2E;AAC3E,8DAA8D;AAE9D,SAA8B,aAAa,CACzC,IAAS,EACT,MAAsC;;QAEtC,MAAM,UAAU,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,qCAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAI,0BAAW,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAExE,MAAM,SAAS,GAAG,IAAA,iCAAmB,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,EAAS,CAAC;QAC7B,MAAM,WAAW,GAAG,IAAA,4BAAc,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,IAAI,2BAAW,CACzB,QAAQ,EACR,UAAU,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,CACZ,CAAC;QAEF,UAAU,CAAC,GAAS,EAAE;YACpB,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACvC,IAAI;gBACF,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CACrE,CAAC;gBACF,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;aAC7C;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAClD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACf,OAAO;aACR;YAED,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YACrC,yBAAyB;YACzB,IAAI;gBACF,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,MAAM,CAC1B,IAAI,CAAC,MAAM,CAAC,OAAO,EACnB,IAAI,CAAC,MAAM,CAAC,cAAc,EAC1B,IAAI,CAAC,MAAM,CAAC,MAAM,CACnB,CAAC;gBACF,IAAI,CAAC,GAAG,EAAE;oBACR,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAU,CAAC,CAAC;iBACtC;gBACD,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;aAC3C;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAChB;YACD,MAAM,IAAA,gCAAgB,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC,CAAA,EAAE,CAAC,CAAC,CAAC;QAEN,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AApDD,gCAoDC"}

package/lib/utilities/dte-artifact-storage.d.ts

@@ -0,0 +1,7 @@
+import { FileStorage } from '../core/file-storage/file-storage';
+export declare class DteArtifactStorage {
+    private readonly fileStorage;
+    private readonly cacheDirectory;
+    constructor(fileStorage: FileStorage, cacheDirectory: string);
+    retrieveAndExtract(hash: string, url: string): Promise<string>;
+}

package/lib/utilities/dte-artifact-storage.js

@@ -0,0 +1,42 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DteArtifactStorage = void 0;
+const environment_1 = require("./environment");
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const { output, workspaceRoot } = require('./nx-imports');
+class DteArtifactStorage {
+    constructor(fileStorage, cacheDirectory) {
+        this.fileStorage = fileStorage;
+        this.cacheDirectory = cacheDirectory;
+    }
+    retrieveAndExtract(hash, url) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (environment_1.VERBOSE_LOGGING) {
+                output.note({
+                    title: `Retrieving artifacts from ${url}`,
+                });
+            }
+            yield this.fileStorage.retrieve(hash, url, this.cacheDirectory);
+            if (environment_1.VERBOSE_LOGGING) {
+                output.note({
+                    title: `Extracting artifacts`,
+                });
+            }
+            const outputs = (0, path_1.join)(this.cacheDirectory, hash, 'outputs');
+            yield (0, fs_extra_1.copy)(outputs, workspaceRoot);
+            return (yield (0, fs_extra_1.readFile)((0, path_1.join)(this.cacheDirectory, hash, 'terminalOutput'))).toString();
+        });
+    }
+}
+exports.DteArtifactStorage = DteArtifactStorage;
+//# sourceMappingURL=dte-artifact-storage.js.map

package/lib/utilities/dte-artifact-storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dte-artifact-storage.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/dte-artifact-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+CAAgD;AAChD,uCAA0C;AAC1C,+BAA4B;AAE5B,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE1D,MAAa,kBAAkB;IAC7B,YACmB,WAAwB,EACxB,cAAsB;QADtB,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAQ;IACtC,CAAC;IAEE,kBAAkB,CAAC,IAAY,EAAE,GAAW;;YAChD,IAAI,6BAAe,EAAE;gBACnB,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,6BAA6B,GAAG,EAAE;iBAC1C,CAAC,CAAC;aACJ;YAED,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAEhE,IAAI,6BAAe,EAAE;gBACnB,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,sBAAsB;iBAC9B,CAAC,CAAC;aACJ;YACD,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YAC3D,MAAM,IAAA,eAAI,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACnC,OAAO,CACL,MAAM,IAAA,mBAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAClE,CAAC,QAAQ,EAAE,CAAC;QACf,CAAC;KAAA;CACF;AA1BD,gDA0BC"}

package/lib/utilities/nx-imports.js

@@ -9,8 +9,7 @@ try {
         catch (_a) {
             workspaceRoot = require('nx/src/utils/workspace-root').workspaceRoot;
         }
-        const { getDependencyConfigs, getOutputs, } = require('nx/src/tasks-runner/utils');
-        const { Cache } = require('nx/src/tasks-runner/cache');
+        const { getDependencyConfigs } = require('nx/src/tasks-runner/utils');
         const tasksRunner = require('nx/tasks-runners/default').default;
         const { CompositeLifeCycle } = require('nx/src/tasks-runner/life-cycle');
         exports.runnerReturnsPromise = true;
@@ -19,8 +18,6 @@ try {
         exports.tasksRunner = tasksRunner;
         exports.CompositeLifeCycle = CompositeLifeCycle;
         exports.getDependencyConfigs = getDependencyConfigs;
-        exports.getOutputs = getOutputs;
-        exports.Cache = Cache;
     }
     catch (_b) {
         const { output } = require('@nrwl/workspace/src/utilities/output');
@@ -33,15 +30,12 @@ try {
                 require('@nrwl/workspace/src/tasks-runner/life-cycle').CompositeLifeCycle;
         }
         catch (e) { }
-        const { Cache } = require('@nrwl/workspace/src/tasks-runner/cache');
         exports.runnerReturnsPromise = false;
         exports.output = output;
         exports.workspaceRoot = appRootPath;
         exports.tasksRunner = tasksRunnerV2;
         exports.CompositeLifeCycle = CompositeLifeCycle;
         exports.getDependencyConfigs = getDependencyConfigs;
-        exports.getOutputs = getOutputs;
-        exports.Cache = Cache;
     }
 }
 catch (e) {

package/lib/utilities/nx-imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"nx-imports.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/nx-imports.ts"],"names":[],"mappings":";AAAA,IAAI;IACF,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAClD,IAAI,aAAa,CAAC;QAClB,IAAI;YACF,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,aAAa,CAAC;SAChE;QAAC,OAAO,EAAE,EAAE;YACX,aAAa,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC,aAAa,CAAC;SACtE;QACD,MAAM,EACJ,oBAAoB,EACpB,UAAU,GACX,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACzC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC;QAChE,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAEzE,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACpC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QACxB,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;QAClC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAChD,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACpD,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;QAChC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;KACvB;IAAC,WAAM;QACN,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;QACnE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;QAChE,MAAM,EACJ,oBAAoB,EACpB,UAAU,GACX,GAAG,OAAO,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,EACJ,aAAa,GACd,GAAG,OAAO,CAAC,kDAAkD,CAAC,CAAC;QAEhE,IAAI,kBAAkB,CAAC;QACvB,IAAI;YACF,kBAAkB;gBAChB,OAAO,CAAC,6CAA6C,CAAC,CAAC,kBAAkB,CAAC;SAC7E;QAAC,OAAO,CAAC,EAAE,GAAE;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,wCAAwC,CAAC,CAAC;QAEpE,OAAO,CAAC,oBAAoB,GAAG,KAAK,CAAC;QACrC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QACxB,OAAO,CAAC,aAAa,GAAG,WAAW,CAAC;QACpC,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC;QACpC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAChD,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACpD,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;QAChC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;KACvB;CACF;AAAC,OAAO,CAAC,EAAE;IACV,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;QAC7C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAChB;IACD,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAChC,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACzD,OAAO,CAAC,KAAK,CACX,uFAAuF,CACxF,CAAC;IACF,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClB,OAAO,CAAC,KAAK,CACX,qGAAqG,CACtG,CAAC;IACF,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB"}
+{"version":3,"file":"nx-imports.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/nx-imports.ts"],"names":[],"mappings":";AAAA,IAAI;IACF,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAClD,IAAI,aAAa,CAAC;QAClB,IAAI;YACF,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,aAAa,CAAC;SAChE;QAAC,OAAO,EAAE,EAAE;YACX,aAAa,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC,aAAa,CAAC;SACtE;QACD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC;QAChE,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAEzE,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACpC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QACxB,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;QAClC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAChD,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;KACrD;IAAC,WAAM;QACN,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;QACnE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;QAChE,MAAM,EACJ,oBAAoB,EACpB,UAAU,GACX,GAAG,OAAO,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,EACJ,aAAa,GACd,GAAG,OAAO,CAAC,kDAAkD,CAAC,CAAC;QAEhE,IAAI,kBAAkB,CAAC;QACvB,IAAI;YACF,kBAAkB;gBAChB,OAAO,CAAC,6CAA6C,CAAC,CAAC,kBAAkB,CAAC;SAC7E;QAAC,OAAO,CAAC,EAAE,GAAE;QAEd,OAAO,CAAC,oBAAoB,GAAG,KAAK,CAAC;QACrC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QACxB,OAAO,CAAC,aAAa,GAAG,WAAW,CAAC;QACpC,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC;QACpC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAChD,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;KACrD;CACF;AAAC,OAAO,CAAC,EAAE;IACV,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;QAC7C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAChB;IACD,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAChC,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACzD,OAAO,CAAC,KAAK,CACX,uFAAuF,CACxF,CAAC;IACF,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClB,OAAO,CAAC,KAAK,CACX,qGAAqG,CACtG,CAAC;IACF,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/nx-cloud",
-  "version": "15.1.0",
+  "version": "15.2.0-beta.1",
   "description": "Nx Cloud plugin for Nx",
   "keywords": [
     "Monorepo",