@nrwl/nx-cloud 15.2.0-beta.2 → 15.2.0-beta.4
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/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +12 -8
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.d.ts +2 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js +3 -2
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js.map +1 -1
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js +4 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js.map +1 -1
- package/lib/utilities/environment.d.ts +0 -1
- package/lib/utilities/environment.js +2 -3
- package/lib/utilities/environment.js.map +1 -1
- package/lib/utilities/nx-imports.js +1 -8
- package/lib/utilities/nx-imports.js.map +1 -1
- package/package.json +1 -1
|
@@ -21,9 +21,9 @@ const cloud_remote_cache_1 = require("./cloud-remote-cache");
|
|
|
21
21
|
const cloud_run_api_1 = require("./cloud-run.api");
|
|
22
22
|
const fs_1 = require("fs");
|
|
23
23
|
const path = require("path");
|
|
24
|
+
const path_1 = require("path");
|
|
24
25
|
const metric_logger_1 = require("../../../utilities/metric-logger");
|
|
25
26
|
const error_reporter_api_1 = require("../../api/error-reporter.api");
|
|
26
|
-
const path_1 = require("path");
|
|
27
27
|
const fs_extra_1 = require("fs-extra");
|
|
28
28
|
const id_generator_1 = require("./id-generator");
|
|
29
29
|
const { tasksRunner, output } = require('../../../utilities/nx-imports');
|
|
@@ -58,7 +58,7 @@ function storeLocalCacheHits(taskExecutions, remoteCache, nxCacheDirectory) {
|
|
|
58
58
|
.map((t) => t.hash);
|
|
59
59
|
hashes.forEach((hash) => remoteCache.store(hash, nxCacheDirectory));
|
|
60
60
|
}
|
|
61
|
-
function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions, versionOfNxBefore133, inner, encryptionKey, fileStorage, uploadInCurrentProcess, runContext, }) {
|
|
61
|
+
function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions, versionOfNxBefore133, inner, encryptionKey, fileStorage, uploadInCurrentProcess, distributedExecutionId, runContext, }) {
|
|
62
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
63
|
const runEndTime = new Date().toISOString();
|
|
64
64
|
const branch = (0, environment_1.getBranch)();
|
|
@@ -66,7 +66,7 @@ function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfusc
|
|
|
66
66
|
command: outputObfuscator.obfuscate((0, environment_1.parseCommand)()),
|
|
67
67
|
startTime: runStartTime,
|
|
68
68
|
endTime: runEndTime,
|
|
69
|
-
distributedExecutionId
|
|
69
|
+
distributedExecutionId,
|
|
70
70
|
branch: branch,
|
|
71
71
|
scan: true,
|
|
72
72
|
runGroup: (0, environment_1.getRunGroup)(),
|
|
@@ -78,7 +78,7 @@ function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfusc
|
|
|
78
78
|
if (uploadInCurrentProcess) {
|
|
79
79
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION) {
|
|
80
80
|
const nxCacheDirectory = (0, environment_1.getNxCacheDirectory)(options);
|
|
81
|
-
storeTaskHashes(taskExecutions, nxCacheDirectory,
|
|
81
|
+
storeTaskHashes(taskExecutions, nxCacheDirectory, distributedExecutionId);
|
|
82
82
|
storeLocalCacheHits(taskExecutions, remoteCache, nxCacheDirectory);
|
|
83
83
|
}
|
|
84
84
|
try {
|
|
@@ -157,7 +157,7 @@ function createLifeCycle(runContext, options, outputObfuscator, tasks) {
|
|
|
157
157
|
return cloudEnabledLifeCycle;
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
|
-
function fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options) {
|
|
160
|
+
function fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options, distributedExecutionId) {
|
|
161
161
|
return __awaiter(this, void 0, void 0, function* () {
|
|
162
162
|
let hashes = tasks.map((t) => t.hash).filter((h) => !!h);
|
|
163
163
|
const cachePath = (0, environment_1.getNxCacheDirectory)(options);
|
|
@@ -176,7 +176,7 @@ function fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options) {
|
|
|
176
176
|
hashes = missingHashes;
|
|
177
177
|
}
|
|
178
178
|
if (hashes.length > 0) {
|
|
179
|
-
const startRunRequest = api.startRun(
|
|
179
|
+
const startRunRequest = api.startRun(distributedExecutionId, hashes);
|
|
180
180
|
for (const hash of hashes) {
|
|
181
181
|
runContext.requests[hash] = startRunRequest;
|
|
182
182
|
}
|
|
@@ -196,6 +196,7 @@ function isConnectedToPrivateCloud(options) {
|
|
|
196
196
|
}
|
|
197
197
|
function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
198
198
|
var _a;
|
|
199
|
+
const distributedExecutionId = process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
199
200
|
const runContext = {
|
|
200
201
|
statuses: {},
|
|
201
202
|
scheduledTasks: [],
|
|
@@ -217,9 +218,9 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
217
218
|
!((_a = context.daemon) === null || _a === void 0 ? void 0 : _a.enabled()) ||
|
|
218
219
|
isConnectedToPrivateCloud(options);
|
|
219
220
|
const fileStorage = new file_storage_1.FileStorage(encryption, errorApi, false, uploadInCurrentProcess);
|
|
220
|
-
const remoteCache = new cloud_remote_cache_1.CloudRemoteCache(messages, api, runContext, fileStorage);
|
|
221
|
+
const remoteCache = new cloud_remote_cache_1.CloudRemoteCache(messages, api, runContext, fileStorage, distributedExecutionId);
|
|
221
222
|
// we don't await for it cause this step is optional
|
|
222
|
-
fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options);
|
|
223
|
+
fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options, distributedExecutionId);
|
|
223
224
|
// have to reset it so we don't capture inner tasks
|
|
224
225
|
delete process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
225
226
|
const res = tasksRunner(tasks, Object.assign(Object.assign({}, options), { remoteCache, lifeCycle }), context);
|
|
@@ -248,6 +249,7 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
248
249
|
fileStorage,
|
|
249
250
|
uploadInCurrentProcess,
|
|
250
251
|
runContext,
|
|
252
|
+
distributedExecutionId
|
|
251
253
|
});
|
|
252
254
|
wrappedRes.complete();
|
|
253
255
|
}),
|
|
@@ -275,6 +277,7 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
275
277
|
fileStorage,
|
|
276
278
|
uploadInCurrentProcess,
|
|
277
279
|
runContext,
|
|
280
|
+
distributedExecutionId
|
|
278
281
|
});
|
|
279
282
|
return r;
|
|
280
283
|
}))
|
|
@@ -296,6 +299,7 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
296
299
|
fileStorage,
|
|
297
300
|
uploadInCurrentProcess,
|
|
298
301
|
runContext,
|
|
302
|
+
distributedExecutionId
|
|
299
303
|
});
|
|
300
304
|
throw e;
|
|
301
305
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6EAAyE;AACzE,iFAA2E;AAC3E,+EAA2E;AAC3E,yEAAmE;AACnE,kEAA8D;AAC9D,sEAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,9 @@ export declare class CloudRemoteCache {
|
|
|
7
7
|
private readonly api;
|
|
8
8
|
private readonly runContext;
|
|
9
9
|
private readonly fileStorage;
|
|
10
|
+
private readonly distributedExecutionId;
|
|
10
11
|
private readonly storeRequests;
|
|
11
|
-
constructor(messages: MessageReporter, api: CloudRunApi, runContext: RunContext, fileStorage: FileStorage);
|
|
12
|
+
constructor(messages: MessageReporter, api: CloudRunApi, runContext: RunContext, fileStorage: FileStorage, distributedExecutionId: string | undefined);
|
|
12
13
|
retrieve(hash: string, cacheDirectory: string): Promise<boolean>;
|
|
13
14
|
store(hash: string, cacheDirectory: string): Promise<boolean>;
|
|
14
15
|
private hashUrls;
|
|
@@ -13,11 +13,12 @@ exports.CloudRemoteCache = void 0;
|
|
|
13
13
|
const environment_1 = require("../../../utilities/environment");
|
|
14
14
|
const { output } = require('../../../utilities/nx-imports');
|
|
15
15
|
class CloudRemoteCache {
|
|
16
|
-
constructor(messages, api, runContext, fileStorage) {
|
|
16
|
+
constructor(messages, api, runContext, fileStorage, distributedExecutionId) {
|
|
17
17
|
this.messages = messages;
|
|
18
18
|
this.api = api;
|
|
19
19
|
this.runContext = runContext;
|
|
20
20
|
this.fileStorage = fileStorage;
|
|
21
|
+
this.distributedExecutionId = distributedExecutionId;
|
|
21
22
|
this.storeRequests = [];
|
|
22
23
|
}
|
|
23
24
|
retrieve(hash, cacheDirectory) {
|
|
@@ -101,7 +102,7 @@ class CloudRemoteCache {
|
|
|
101
102
|
if (scheduledTaskHashesWithoutRequests.indexOf(hash) === -1) {
|
|
102
103
|
scheduledTaskHashesWithoutRequests.push(hash);
|
|
103
104
|
}
|
|
104
|
-
const request = this.api.startRun(
|
|
105
|
+
const request = this.api.startRun(this.distributedExecutionId, scheduledTaskHashesWithoutRequests);
|
|
105
106
|
scheduledTaskHashesWithoutRequests.forEach((taskHash) => {
|
|
106
107
|
this.runContext.requests[taskHash] = request;
|
|
107
108
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-remote-cache.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-remote-cache.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,
|
|
1
|
+
{"version":3,"file":"cloud-remote-cache.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-remote-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,10 @@ function invokeTasksUsingNxImperativeApi(options) {
|
|
|
34
34
|
overrides: Object.assign(Object.assign({}, params), { __overrides_unparsed__: (0, serializer_overrides_1.unparse)(params) }),
|
|
35
35
|
};
|
|
36
36
|
});
|
|
37
|
+
process.env.NX_CACHE_FAILURES = 'true'; // this is only requires because of how we do uploads
|
|
38
|
+
process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID = executionId;
|
|
39
|
+
process.env.NX_STREAM_OUTPUT = 'true';
|
|
40
|
+
process.env.NX_PREFIX_OUTPUT = 'true';
|
|
37
41
|
const r = yield tasksRunner.invoke({ tasks, parallel });
|
|
38
42
|
const completedTasks = Object.values(r.taskGraph.tasks);
|
|
39
43
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoke-tasks-using-nx-imperative-api.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACrE,uCAAuC;AACvC,kFAAkE;AAElE,SAAsB,+BAA+B,CACnD,OAA+B;;QAE/B,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,CACL,WAAmB,EACnB,cAA+B,EAC/B,QAAgB,EAIf,EAAE;YACH,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE;oBAC9B,aAAa,EAAE;wBACb,sBAAsB,EAAE,KAAK;wBAC7B,cAAc,EAAE,IAAI;qBACrB;iBACF,CAAC,CAAC;gBAEH,OAAO;oBACL,EAAE,EAAE,CAAC,CAAC,MAAM;oBACZ,MAAM,EAAE;wBACN,OAAO,EAAE,CAAC,CAAC,WAAW;wBACtB,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,aAAa,EAAE,CAAC,CAAC,aAAa;qBAC/B;oBACD,SAAS,kCACJ,MAAM,KACT,sBAAsB,EAAE,IAAA,8BAAO,EAAC,MAAM,CAAC,GACxC;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACxD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACxD,OAAO;gBACL,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;oBAC9C,MAAM,EAAE,CAAC,CAAC,EAAE;oBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;iBACb,CAAC,CAAC;gBACH,mBAAmB,EAAE,CAAC,CAAC,MAAM;aAC9B,CAAC;QACJ,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"invoke-tasks-using-nx-imperative-api.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACrE,uCAAuC;AACvC,kFAAkE;AAElE,SAAsB,+BAA+B,CACnD,OAA+B;;QAE/B,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,CACL,WAAmB,EACnB,cAA+B,EAC/B,QAAgB,EAIf,EAAE;YACH,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE;oBAC9B,aAAa,EAAE;wBACb,sBAAsB,EAAE,KAAK;wBAC7B,cAAc,EAAE,IAAI;qBACrB;iBACF,CAAC,CAAC;gBAEH,OAAO;oBACL,EAAE,EAAE,CAAC,CAAC,MAAM;oBACZ,MAAM,EAAE;wBACN,OAAO,EAAE,CAAC,CAAC,WAAW;wBACtB,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,aAAa,EAAE,CAAC,CAAC,aAAa;qBAC/B;oBACD,SAAS,kCACJ,MAAM,KACT,sBAAsB,EAAE,IAAA,8BAAO,EAAC,MAAM,CAAC,GACxC;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC,qDAAqD;YAC7F,OAAO,CAAC,GAAG,CAAC,iCAAiC,GAAG,WAAW,CAAC;YAC5D,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;YAEtC,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACxD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACxD,OAAO;gBACL,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;oBAC9C,MAAM,EAAE,CAAC,CAAC,EAAE;oBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;iBACb,CAAC,CAAC;gBACH,mBAAmB,EAAE,CAAC,CAAC,MAAM;aAC9B,CAAC;QACJ,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AAjDD,0EAiDC"}
|
|
@@ -9,7 +9,6 @@ export declare const NX_CLOUD_UNLIMITED_OUTPUT: boolean;
|
|
|
9
9
|
export declare const DEFAULT_FILE_SIZE_LIMIT: number;
|
|
10
10
|
export declare const DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE = 166;
|
|
11
11
|
export declare const NX_INVOKED_BY_RUNNER: boolean;
|
|
12
|
-
export declare const NX_CLOUD_DISTRIBUTED_EXECUTION_ID: string | undefined;
|
|
13
12
|
export declare const AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION: boolean;
|
|
14
13
|
export declare const NUMBER_OF_AXIOS_RETRIES: number;
|
|
15
14
|
export declare const NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT: number | null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNxCacheDirectory = exports.parseCommand = exports.getMachineInfo = exports.getBranch = exports.getRunGroup = exports.extractGitSha = exports.NX_CLOUD_NO_TIMEOUTS = exports.VERBOSE_LOGGING = exports.ENCRYPTION_KEY = exports.ACCESS_TOKEN = exports.NX_CLOUD_FORCE_METRICS = exports.NX_CLOUD_DISTRIBUTED_EXECUTION_STOP_AGENTS_ON_FAILURE = exports.NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT = exports.NUMBER_OF_AXIOS_RETRIES = exports.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION = exports.
|
|
3
|
+
exports.getNxCacheDirectory = exports.parseCommand = exports.getMachineInfo = exports.getBranch = exports.getRunGroup = exports.extractGitSha = exports.NX_CLOUD_NO_TIMEOUTS = exports.VERBOSE_LOGGING = exports.ENCRYPTION_KEY = exports.ACCESS_TOKEN = exports.NX_CLOUD_FORCE_METRICS = exports.NX_CLOUD_DISTRIBUTED_EXECUTION_STOP_AGENTS_ON_FAILURE = exports.NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT = exports.NUMBER_OF_AXIOS_RETRIES = exports.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION = exports.NX_INVOKED_BY_RUNNER = exports.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE = exports.DEFAULT_FILE_SIZE_LIMIT = exports.NX_CLOUD_UNLIMITED_OUTPUT = exports.UNLIMITED_FILE_SIZE = exports.NO_COMPLETED_TASKS_TIMEOUT = exports.NO_MESSAGES_TIMEOUT = exports.UNLIMITED_TIMEOUT = exports.NX_DEFAULT_CACHE_LOCATION = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const dotenv = require("dotenv");
|
|
6
6
|
const fs_1 = require("fs");
|
|
@@ -24,8 +24,7 @@ exports.DEFAULT_FILE_SIZE_LIMIT = 1000 * 1000 * 300;
|
|
|
24
24
|
exports.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE = 166;
|
|
25
25
|
exports.NX_INVOKED_BY_RUNNER = process.env.NX_INVOKED_BY_RUNNER === 'true' ||
|
|
26
26
|
process.env.NX_CLOUD === 'false';
|
|
27
|
-
exports.
|
|
28
|
-
exports.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION = !!exports.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
27
|
+
exports.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION = !!process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
29
28
|
exports.NUMBER_OF_AXIOS_RETRIES = process.env.NX_CLOUD_NUMBER_OF_RETRIES
|
|
30
29
|
? Number(process.env.NX_CLOUD_NUMBER_OF_RETRIES)
|
|
31
30
|
: (0, distributed_task_execution_detection_1.isDistributedExecutionEnabled)(undefined) ||
|
|
@@ -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;AAClC,qDAAgD;AAChD,+BAAmC;AAGnC,iGAAuF;AACvF,mCAA+B;AAE/B,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAErC,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,oBAAoB,GAC/B,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;IAC3C,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC;AACtB,QAAA,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,13 +16,7 @@ try {
|
|
|
16
16
|
try {
|
|
17
17
|
initTasksRunner = require('nx/src/index').initTasksRunner;
|
|
18
18
|
}
|
|
19
|
-
catch (e) {
|
|
20
|
-
console.log('JKJK');
|
|
21
|
-
console.log('JKJK');
|
|
22
|
-
console.log('JKJK');
|
|
23
|
-
console.log('JKJK');
|
|
24
|
-
console.log(e);
|
|
25
|
-
}
|
|
19
|
+
catch (e) { }
|
|
26
20
|
exports.runnerReturnsPromise = true;
|
|
27
21
|
exports.output = output;
|
|
28
22
|
exports.workspaceRoot = workspaceRoot;
|
|
@@ -32,7 +26,6 @@ try {
|
|
|
32
26
|
exports.initTasksRunner = initTasksRunner;
|
|
33
27
|
}
|
|
34
28
|
catch (e) {
|
|
35
|
-
console.log(e);
|
|
36
29
|
const { output } = require('@nrwl/workspace/src/utilities/output');
|
|
37
30
|
const { appRootPath } = require('@nrwl/tao/src/utils/app-root');
|
|
38
31
|
const { getDependencyConfigs, } = require('@nrwl/workspace/src/tasks-runner/utils');
|
|
@@ -1 +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,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;QACzE,IAAI,eAAe,GAAG,IAAI,CAAC;QAE3B,IAAI;YACF,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC;SAC3D;QAAC,OAAO,CAAC,EAAE
|
|
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,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;QACzE,IAAI,eAAe,GAAG,IAAI,CAAC;QAE3B,IAAI;YACF,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC;SAC3D;QAAC,OAAO,CAAC,EAAE,GAAE;QAEd,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,eAAe,GAAG,eAAe,CAAC;KAC3C;IAAC,OAAO,CAAC,EAAE;QACV,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,GACrB,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;QACpD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;KAChC;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"}
|