@nrwl/nx-cloud 15.2.0 → 15.3.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/core/api/error-reporter.api.js +36 -1
- package/lib/core/api/run-group.api.d.ts +2 -2
- package/lib/core/api/run-group.api.js +73 -1
- package/lib/core/api/run-group.api.js.map +1 -1
- package/lib/core/commands/record-output.js +7 -2
- package/lib/core/commands/record-output.js.map +1 -1
- package/lib/core/commands/start-ci-run.js +5 -6
- package/lib/core/commands/start-ci-run.js.map +1 -1
- package/lib/core/commands/stop-all-agents.js +6 -3
- package/lib/core/commands/stop-all-agents.js.map +1 -1
- package/lib/core/commands/upload-and-show-run-details.js +6 -1
- package/lib/core/commands/upload-and-show-run-details.js.map +1 -1
- package/lib/core/error/print-run-group-error.d.ts +1 -0
- package/lib/core/error/print-run-group-error.js +9 -5
- package/lib/core/error/print-run-group-error.js.map +1 -1
- package/lib/core/models/cloud-task-runner-options.d.ts +0 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +93 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +320 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js +133 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.d.ts +6 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js +168 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js.map +1 -1
- package/lib/core/runners/cloud-enabled/id-generator.js +16 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.d.ts +4 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.js +93 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.js.map +1 -1
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js +157 -1
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js.map +1 -1
- package/lib/core/runners/distributed-agent/execute-tasks.js +114 -1
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js +58 -1
- package/lib/core/runners/distributed-agent/invoke-tasks-using-run-many.js +97 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.d.ts +2 -2
- package/lib/core/runners/distributed-execution/distributed-execution.api.js +152 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.js.map +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js +118 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js.map +1 -1
- package/lib/core/runners/distributed-execution/process-task.js +45 -1
- package/lib/core/runners/distributed-execution/process-tasks.js +67 -1
- package/lib/core/runners/distributed-execution/split-task-graph-into-stages.js +37 -1
- package/lib/core/runners/distributed-execution/task-graph-creator.js +100 -1
- package/lib/utilities/environment.d.ts +3 -1
- package/lib/utilities/environment.js +23 -7
- package/lib/utilities/environment.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1,36 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
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.ErrorReporterApi = void 0;
|
|
13
|
+
const axios_1 = require("../../utilities/axios");
|
|
14
|
+
const { output } = require('../../utilities/nx-imports');
|
|
15
|
+
class ErrorReporterApi {
|
|
16
|
+
constructor(options) {
|
|
17
|
+
this.apiAxiosInstance = (0, axios_1.createApiAxiosInstance)(options);
|
|
18
|
+
}
|
|
19
|
+
reportError(message) {
|
|
20
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
try {
|
|
22
|
+
yield (0, axios_1.axiosMultipleTries)(() => this.apiAxiosInstance.post('/nx-cloud/report-client-error', {
|
|
23
|
+
message,
|
|
24
|
+
}));
|
|
25
|
+
}
|
|
26
|
+
catch (e) {
|
|
27
|
+
output.warn({
|
|
28
|
+
title: `Unable to record the following error: '${message}'`,
|
|
29
|
+
bodyLines: [e.message],
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
exports.ErrorReporterApi = ErrorReporterApi;
|
|
36
|
+
//# sourceMappingURL=error-reporter.api.js.map
|
|
@@ -2,6 +2,6 @@ import { CloudTaskRunnerOptions } from '../models/cloud-task-runner-options';
|
|
|
2
2
|
export declare class RunGroupApi {
|
|
3
3
|
private apiAxiosInstance;
|
|
4
4
|
constructor(options: CloudTaskRunnerOptions);
|
|
5
|
-
createRunGroup(branch: string | null, runGroup: string, stopAgentsOnFailure?: boolean, agentCount?: number, stopAgentsAfter?: string): Promise<void>;
|
|
6
|
-
completeRunGroup(runGroup: string): Promise<void>;
|
|
5
|
+
createRunGroup(branch: string | null, runGroup: string, ciExecutionId: string | null, ciExecutionEnv: string, stopAgentsOnFailure?: boolean, agentCount?: number, stopAgentsAfter?: string): Promise<void>;
|
|
6
|
+
completeRunGroup(branch: string | null, runGroup: string, ciExecutionId: string | null, ciExecutionEnv: string): Promise<void>;
|
|
7
7
|
}
|
|
@@ -1 +1,73 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
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.RunGroupApi = void 0;
|
|
13
|
+
const axios_1 = require("../../utilities/axios");
|
|
14
|
+
const metric_logger_1 = require("../../utilities/metric-logger");
|
|
15
|
+
const { output } = require('../../utilities/nx-imports');
|
|
16
|
+
class RunGroupApi {
|
|
17
|
+
constructor(options) {
|
|
18
|
+
this.apiAxiosInstance = (0, axios_1.createApiAxiosInstance)(options);
|
|
19
|
+
}
|
|
20
|
+
createRunGroup(branch, runGroup, ciExecutionId, ciExecutionEnv, stopAgentsOnFailure, agentCount, stopAgentsAfter) {
|
|
21
|
+
var _a;
|
|
22
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
+
const recorder = (0, metric_logger_1.createMetricRecorder)('createRunGroup');
|
|
24
|
+
try {
|
|
25
|
+
const resp = yield (0, axios_1.axiosMultipleTries)(() => this.apiAxiosInstance.post('/nx-cloud/executions/create-run-group', {
|
|
26
|
+
branch,
|
|
27
|
+
runGroup,
|
|
28
|
+
ciExecutionId,
|
|
29
|
+
ciExecutionEnv,
|
|
30
|
+
stopAgentsOnFailure,
|
|
31
|
+
agentCount,
|
|
32
|
+
stopAgentsAfter,
|
|
33
|
+
}));
|
|
34
|
+
recorder.recordMetric((0, metric_logger_1.mapRespToPerfEntry)(resp));
|
|
35
|
+
}
|
|
36
|
+
catch (e) {
|
|
37
|
+
recorder.recordMetric(((_a = e === null || e === void 0 ? void 0 : e.axiosException) === null || _a === void 0 ? void 0 : _a.response)
|
|
38
|
+
? (0, metric_logger_1.mapRespToPerfEntry)(e.axiosException.response)
|
|
39
|
+
: metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
40
|
+
output.error({
|
|
41
|
+
title: e.message,
|
|
42
|
+
});
|
|
43
|
+
process.exit(1);
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
completeRunGroup(branch, runGroup, ciExecutionId, ciExecutionEnv) {
|
|
48
|
+
var _a;
|
|
49
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
50
|
+
const recorder = (0, metric_logger_1.createMetricRecorder)('createRunGroup');
|
|
51
|
+
try {
|
|
52
|
+
const resp = yield (0, axios_1.axiosMultipleTries)(() => this.apiAxiosInstance.post('/nx-cloud/executions/complete-run-group', {
|
|
53
|
+
branch,
|
|
54
|
+
runGroup,
|
|
55
|
+
ciExecutionId,
|
|
56
|
+
ciExecutionEnv,
|
|
57
|
+
}));
|
|
58
|
+
recorder.recordMetric((0, metric_logger_1.mapRespToPerfEntry)(resp));
|
|
59
|
+
}
|
|
60
|
+
catch (e) {
|
|
61
|
+
recorder.recordMetric(((_a = e === null || e === void 0 ? void 0 : e.axiosException) === null || _a === void 0 ? void 0 : _a.response)
|
|
62
|
+
? (0, metric_logger_1.mapRespToPerfEntry)(e.axiosException.response)
|
|
63
|
+
: metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
|
|
64
|
+
output.error({
|
|
65
|
+
title: e.message,
|
|
66
|
+
});
|
|
67
|
+
process.exit(1);
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
exports.RunGroupApi = RunGroupApi;
|
|
73
|
+
//# sourceMappingURL=run-group.api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-group.api.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/api/run-group.api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAG+B;AAC/B,iEAIuC;AAGvC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,MAAa,WAAW;IAGtB,YAAY,OAA+B;QACzC,IAAI,CAAC,gBAAgB,GAAG,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAEK,cAAc,CAClB,MAAqB,EACrB,QAAgB,EAChB,mBAA6B,EAC7B,UAAmB,EACnB,eAAwB;;;YAExB,MAAM,QAAQ,GAAG,IAAA,oCAAoB,EAAC,gBAAgB,CAAC,CAAC;YACxD,IAAI;gBACF,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CACzC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,uCAAuC,EAAE;oBAClE,MAAM;oBACN,QAAQ;oBACR,mBAAmB;oBACnB,UAAU;oBACV,eAAe;iBAChB,CAAC,CACH,CAAC;gBACF,QAAQ,CAAC,YAAY,CAAC,IAAA,kCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;aACjD;YAAC,OAAO,CAAM,EAAE;gBACf,QAAQ,CAAC,YAAY,CACnB,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,0CAAE,QAAQ;oBACzB,CAAC,CAAC,IAAA,kCAAkB,EAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;oBAC/C,CAAC,CAAC,yCAAyB,CAC9B,CAAC;gBAEF,MAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,CAAC,CAAC,OAAO;iBACjB,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;;KACF;IAEK,gBAAgB,
|
|
1
|
+
{"version":3,"file":"run-group.api.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/api/run-group.api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAG+B;AAC/B,iEAIuC;AAGvC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,MAAa,WAAW;IAGtB,YAAY,OAA+B;QACzC,IAAI,CAAC,gBAAgB,GAAG,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAEK,cAAc,CAClB,MAAqB,EACrB,QAAgB,EAChB,aAA4B,EAC5B,cAAsB,EACtB,mBAA6B,EAC7B,UAAmB,EACnB,eAAwB;;;YAExB,MAAM,QAAQ,GAAG,IAAA,oCAAoB,EAAC,gBAAgB,CAAC,CAAC;YACxD,IAAI;gBACF,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CACzC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,uCAAuC,EAAE;oBAClE,MAAM;oBACN,QAAQ;oBACR,aAAa;oBACb,cAAc;oBACd,mBAAmB;oBACnB,UAAU;oBACV,eAAe;iBAChB,CAAC,CACH,CAAC;gBACF,QAAQ,CAAC,YAAY,CAAC,IAAA,kCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;aACjD;YAAC,OAAO,CAAM,EAAE;gBACf,QAAQ,CAAC,YAAY,CACnB,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,0CAAE,QAAQ;oBACzB,CAAC,CAAC,IAAA,kCAAkB,EAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;oBAC/C,CAAC,CAAC,yCAAyB,CAC9B,CAAC;gBAEF,MAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,CAAC,CAAC,OAAO;iBACjB,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;;KACF;IAEK,gBAAgB,CACpB,MAAqB,EACrB,QAAgB,EAChB,aAA4B,EAC5B,cAAsB;;;YAEtB,MAAM,QAAQ,GAAG,IAAA,oCAAoB,EAAC,gBAAgB,CAAC,CAAC;YAExD,IAAI;gBACF,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CACzC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,yCAAyC,EAAE;oBACpE,MAAM;oBACN,QAAQ;oBACR,aAAa;oBACb,cAAc;iBACf,CAAC,CACH,CAAC;gBACF,QAAQ,CAAC,YAAY,CAAC,IAAA,kCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;aACjD;YAAC,OAAO,CAAM,EAAE;gBACf,QAAQ,CAAC,YAAY,CACnB,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,0CAAE,QAAQ;oBACzB,CAAC,CAAC,IAAA,kCAAkB,EAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;oBAC/C,CAAC,CAAC,yCAAyB,CAC9B,CAAC;gBAEF,MAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,CAAC,CAAC,OAAO;iBACjB,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;;KACF;CACF;AA3ED,kCA2EC"}
|
|
@@ -28,6 +28,8 @@ function runCommandAndStoreInCloud() {
|
|
|
28
28
|
const outputObfuscator = new output_obfuscator_1.OutputObfuscator(taskRunnerOptions.maskedProperties);
|
|
29
29
|
const branch = (0, environment_1.getBranch)();
|
|
30
30
|
const runGroup = (0, environment_1.getRunGroup)();
|
|
31
|
+
const ciExecutionId = (0, environment_1.getCIExecutionId)();
|
|
32
|
+
const ciExecutionEnv = (0, environment_1.getCIExecutionEnv)();
|
|
31
33
|
const userCommandAndArgs = parseCommandAndFlags(process.argv);
|
|
32
34
|
const [userCommand, ...userArgs] = userCommandAndArgs;
|
|
33
35
|
const startTime = new Date().toISOString();
|
|
@@ -41,6 +43,8 @@ function runCommandAndStoreInCloud() {
|
|
|
41
43
|
endTime,
|
|
42
44
|
branch,
|
|
43
45
|
runGroup,
|
|
46
|
+
ciExecutionId,
|
|
47
|
+
ciExecutionEnv,
|
|
44
48
|
};
|
|
45
49
|
yield endRecordOutputRun(axios, outputObfuscator, taskRunnerOptions, endRecordOutputRunParams, dteApi);
|
|
46
50
|
process.exit(statusCode);
|
|
@@ -132,8 +136,9 @@ function endRecordOutputRun(axios, obfuscator, taskRunnerOptions, params, dteApi
|
|
|
132
136
|
startTime: params.startTime,
|
|
133
137
|
endTime: params.endTime,
|
|
134
138
|
branch: params.branch,
|
|
135
|
-
scan: true,
|
|
136
139
|
runGroup: params.runGroup,
|
|
140
|
+
ciExecutionId: params.ciExecutionId,
|
|
141
|
+
ciExecutionEnv: params.ciExecutionEnv,
|
|
137
142
|
// only set sha if branch is set because we invoke a separate process,
|
|
138
143
|
// which adds a few millis
|
|
139
144
|
sha: params.branch ? (0, environment_1.extractGitSha)() : undefined,
|
|
@@ -149,7 +154,7 @@ function endRecordOutputRun(axios, obfuscator, taskRunnerOptions, params, dteApi
|
|
|
149
154
|
printRecordOutputRunEndMessage(endRunResp.data.runUrl);
|
|
150
155
|
}
|
|
151
156
|
if (params.statusCode !== 0 && params.runGroup) {
|
|
152
|
-
yield dteApi.completeRunGroupWithError(params.runGroup, `Command "${params.userCommandAndArgsString}" failed.`);
|
|
157
|
+
yield dteApi.completeRunGroupWithError(params.branch, params.runGroup, params.ciExecutionId, params.ciExecutionEnv, `Command "${params.userCommandAndArgsString}" failed.`);
|
|
153
158
|
}
|
|
154
159
|
});
|
|
155
160
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-output.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/record-output.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"record-output.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/record-output.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,18 +30,17 @@ function startCiRun() {
|
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
31
|
const branch = (0, environment_1.getBranch)();
|
|
32
32
|
const runGroup = (0, environment_1.getRunGroup)();
|
|
33
|
-
|
|
33
|
+
const ciExecutionId = (0, environment_1.getCIExecutionId)();
|
|
34
|
+
const ciExecutionEnv = (0, environment_1.getCIExecutionEnv)();
|
|
35
|
+
if (!(0, print_run_group_error_1.canDetectRunGroup)(runGroup, ciExecutionId)) {
|
|
34
36
|
(0, print_run_group_error_1.printRunGroupError)();
|
|
35
37
|
process.exit(1);
|
|
36
38
|
}
|
|
37
39
|
if (environment_1.VERBOSE_LOGGING) {
|
|
38
40
|
output.note({
|
|
39
|
-
title: `Creating run group ${runGroup}`,
|
|
41
|
+
title: `Creating run group. branch: ${branch}, ciExecutionId: ${ciExecutionId}, ciExecutionEnv: ${ciExecutionEnv}, runGroup: ${runGroup}`,
|
|
40
42
|
});
|
|
41
43
|
}
|
|
42
|
-
if (args.agentCount) {
|
|
43
|
-
// TODO: vsavkin: warn here once we finalize our batching strategy
|
|
44
|
-
}
|
|
45
44
|
if (args.commandCount) {
|
|
46
45
|
output.error({
|
|
47
46
|
title: `--command-count is deprecated. Use --stop-agents-after instead.`,
|
|
@@ -51,7 +50,7 @@ function startCiRun() {
|
|
|
51
50
|
}
|
|
52
51
|
const options = JSON.parse(stripJsonComments((0, fs_1.readFileSync)(`${workspaceRoot}/nx.json`).toString())).tasksRunnerOptions.default.options;
|
|
53
52
|
const api = new run_group_api_1.RunGroupApi(options);
|
|
54
|
-
yield api.createRunGroup(branch, runGroup, args.stopAgentsOnFailure, args.agentCount, args.stopAgentsAfter);
|
|
53
|
+
yield api.createRunGroup(branch, runGroup, ciExecutionId, ciExecutionEnv, args.stopAgentsOnFailure, args.agentCount, args.stopAgentsAfter);
|
|
55
54
|
if (args.useDteByDefault) {
|
|
56
55
|
(0, distributed_task_execution_detection_1.storeDteMarker)();
|
|
57
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start-ci-run.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/start-ci-run.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"start-ci-run.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/start-ci-run.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,6DAMqC;AACrC,0EAGwC;AACxC,wDAAmD;AACnD,2BAAkC;AAClC,4CAA4C;AAC5C,+GAAsF;AAEtF,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACxE,MAAM,IAAI,GAAQ,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE;IAC1C,OAAO,EAAE,CAAC,wBAAwB,EAAE,oBAAoB,CAAC;IACzD,MAAM,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;IACxC,MAAM,EAAE,CAAC,mBAAmB,CAAC;IAC7B,OAAO,EAAE;QACP,eAAe,EAAE,IAAI;KACtB;CACF,CAAC,CAAC;AAEH,SAAsB,UAAU;;QAC9B,MAAM,MAAM,GAAG,IAAA,uBAAS,GAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAA,8BAAgB,GAAE,CAAC;QACzC,MAAM,cAAc,GAAG,IAAA,+BAAiB,GAAE,CAAC;QAE3C,IAAI,CAAC,IAAA,yCAAiB,EAAC,QAAQ,EAAE,aAAa,CAAC,EAAE;YAC/C,IAAA,0CAAkB,GAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,IAAI,6BAAe,EAAE;YACnB,MAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,+BAA+B,MAAM,oBAAoB,aAAa,qBAAqB,cAAc,eAAe,QAAQ,EAAE;aAC1I,CAAC,CAAC;SACJ;QAED,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,MAAM,CAAC,KAAK,CAAC;gBACX,KAAK,EAAE,iEAAiE;gBACxE,SAAS,EAAE,CAAC,2DAA2D,CAAC;aACzE,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,iBAAiB,CAAC,IAAA,iBAAY,EAAC,GAAG,aAAa,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC,CACvE,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC;QAErC,MAAM,GAAG,GAAG,IAAI,2BAAW,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,GAAG,CAAC,cAAc,CACtB,MAAM,EACN,QAAQ,EACR,aAAa,EACb,cAAc,EACd,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,eAAe,CACrB,CAAC;QAEF,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,IAAA,qDAAc,GAAE,CAAC;SAClB;IACH,CAAC;CAAA;AA3CD,gCA2CC"}
|
|
@@ -18,19 +18,22 @@ const fs_1 = require("fs");
|
|
|
18
18
|
const { output } = require('../../utilities/nx-imports');
|
|
19
19
|
function stopAllAgents() {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
const branch = (0, environment_1.getBranch)();
|
|
21
22
|
const runGroup = (0, environment_1.getRunGroup)();
|
|
22
|
-
|
|
23
|
+
const ciExecutionId = (0, environment_1.getCIExecutionId)();
|
|
24
|
+
const ciExecutionEnv = (0, environment_1.getCIExecutionEnv)();
|
|
25
|
+
if (!(0, print_run_group_error_1.canDetectRunGroup)(runGroup, ciExecutionId)) {
|
|
23
26
|
(0, print_run_group_error_1.printRunGroupError)();
|
|
24
27
|
process.exit(1);
|
|
25
28
|
}
|
|
26
29
|
if (environment_1.VERBOSE_LOGGING) {
|
|
27
30
|
output.note({
|
|
28
|
-
title: `Stopping all agents running tasks for run group ${runGroup}`,
|
|
31
|
+
title: `Stopping all agents running tasks for run group. branch: ${branch}, ciExecutionId: ${ciExecutionId}, ciExecutionEnv: ${ciExecutionEnv}, runGroup: ${runGroup}`,
|
|
29
32
|
});
|
|
30
33
|
}
|
|
31
34
|
const options = JSON.parse(stripJsonComments((0, fs_1.readFileSync)('nx.json').toString())).tasksRunnerOptions.default.options;
|
|
32
35
|
const api = new run_group_api_1.RunGroupApi(options);
|
|
33
|
-
yield api.completeRunGroup(runGroup);
|
|
36
|
+
yield api.completeRunGroup(branch, runGroup, ciExecutionId, ciExecutionEnv);
|
|
34
37
|
});
|
|
35
38
|
}
|
|
36
39
|
exports.stopAllAgents = stopAllAgents;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop-all-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/stop-all-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"stop-all-agents.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/stop-all-agents.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAyD;AACzD,6DAMqC;AACrC,0EAGwC;AACxC,wDAAmD;AACnD,2BAAkC;AAClC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,SAAsB,aAAa;;QACjC,MAAM,MAAM,GAAG,IAAA,uBAAS,GAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAA,8BAAgB,GAAE,CAAC;QACzC,MAAM,cAAc,GAAG,IAAA,+BAAiB,GAAE,CAAC;QAE3C,IAAI,CAAC,IAAA,yCAAiB,EAAC,QAAQ,EAAE,aAAa,CAAC,EAAE;YAC/C,IAAA,0CAAkB,GAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,IAAI,6BAAe,EAAE;YACnB,MAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,4DAA4D,MAAM,oBAAoB,aAAa,qBAAqB,cAAc,eAAe,QAAQ,EAAE;aACvK,CAAC,CAAC;SACJ;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,iBAAiB,CAAC,IAAA,iBAAY,EAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CACtD,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC;QAErC,MAAM,GAAG,GAAG,IAAI,2BAAW,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,GAAG,CAAC,gBAAgB,CAAC,MAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IAChF,CAAC;CAAA;AAtBD,sCAsBC"}
|
|
@@ -32,7 +32,12 @@ function uploadRunDetails(options) {
|
|
|
32
32
|
// we need to connect to cloud if not connected yet
|
|
33
33
|
const tasks = runInfo.tasks.map((t) => (Object.assign(Object.assign({}, t), { terminalOutput: (0, read_task_terminal_output_1.readTaskTerminalOutput)(directory, outputObfusactor, t.hash, t.cacheStatus, t.status) })));
|
|
34
34
|
const linkId = (0, id_generator_1.generateUniqueLinkId)();
|
|
35
|
-
yield api.endRun(runInfo.run, tasks,
|
|
35
|
+
yield api.endRun(runInfo.run, tasks, {
|
|
36
|
+
branch: null,
|
|
37
|
+
runGroup: null,
|
|
38
|
+
ciExecutionId: null,
|
|
39
|
+
ciExecutionEnv: null,
|
|
40
|
+
}, linkId);
|
|
36
41
|
return `${options.url || 'https://nx.app'}/runs/${linkId}`;
|
|
37
42
|
});
|
|
38
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-and-show-run-details.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/upload-and-show-run-details.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAAkC;AAClC,6BAA6B;AAC7B,+BAA4B;AAC5B,6DAGqC;AAErC,0EAAqE;AACrE,wEAA6E;AAC7E,0EAAsE;AACtE,4EAAwE;AACxE,4FAAsF;AAEtF,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAExE,SAAe,gBAAgB,CAAC,OAA+B;;QAC7D,MAAM,MAAM,GAAG,IAAI,kCAAe,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,EAAS,CAAC;QAC7B,MAAM,WAAW,GAAG,IAAA,4BAAc,EAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAI,2BAAW,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAEtE,MAAM,SAAS,GAAG,IAAA,iCAAmB,EAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAExE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CACrD,CAAC;QAEF,mDAAmD;QACnD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAClC,CAAC,KACJ,cAAc,EAAE,IAAA,kDAAsB,EACpC,SAAS,EACT,gBAAgB,EAChB,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,WAAW,EACb,CAAC,CAAC,MAAM,CACT,IACD,CAAC,CAAC;QAEJ,MAAM,MAAM,GAAG,IAAA,mCAAoB,GAAE,CAAC;QACtC,MAAM,GAAG,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"upload-and-show-run-details.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/commands/upload-and-show-run-details.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAAkC;AAClC,6BAA6B;AAC7B,+BAA4B;AAC5B,6DAGqC;AAErC,0EAAqE;AACrE,wEAA6E;AAC7E,0EAAsE;AACtE,4EAAwE;AACxE,4FAAsF;AAEtF,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAExE,SAAe,gBAAgB,CAAC,OAA+B;;QAC7D,MAAM,MAAM,GAAG,IAAI,kCAAe,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,EAAS,CAAC;QAC7B,MAAM,WAAW,GAAG,IAAA,4BAAc,EAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAI,2BAAW,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAEtE,MAAM,SAAS,GAAG,IAAA,iCAAmB,EAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAExE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CACrD,CAAC;QAEF,mDAAmD;QACnD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAClC,CAAC,KACJ,cAAc,EAAE,IAAA,kDAAsB,EACpC,SAAS,EACT,gBAAgB,EAChB,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,WAAW,EACb,CAAC,CAAC,MAAM,CACT,IACD,CAAC,CAAC;QAEJ,MAAM,MAAM,GAAG,IAAA,mCAAoB,GAAE,CAAC;QACtC,MAAM,GAAG,CAAC,MAAM,CACd,OAAO,CAAC,GAAG,EACX,KAAK,EACL;YACE,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,IAAI;YACd,aAAa,EAAE,IAAI;YACnB,cAAc,EAAE,IAAI;SACrB,EACD,MAAM,CACP,CAAC;QACF,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,gBAAgB,SAAS,MAAM,EAAE,CAAC;IAC7D,CAAC;CAAA;AAED,SAAsB,uBAAuB;;QAC3C,MAAM,OAAO,GAAG,WAAW,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC;YACb,KAAK,EAAE,uCAAuC;YAC9C,SAAS,EAAE,CAAC,uBAAuB,GAAG,EAAE,CAAC;SAC1C,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,CAAC;CAAA;AARD,0DAQC;AAED,SAAS,WAAW;;IAClB,IAAI;QACF,OAAO,MAAA,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,0CACtE,kBAAkB,0CAAE,OAAO,0CAAE,OAAO,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAA4B,CAAC;KACrC;AACH,CAAC"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.printRunGroupError = void 0;
|
|
3
|
+
exports.printRunGroupError = exports.canDetectRunGroup = void 0;
|
|
4
4
|
const { output } = require('../../utilities/nx-imports');
|
|
5
|
+
function canDetectRunGroup(runGroup, ciExecutionId) {
|
|
6
|
+
return !!runGroup || !!ciExecutionId;
|
|
7
|
+
}
|
|
8
|
+
exports.canDetectRunGroup = canDetectRunGroup;
|
|
5
9
|
function printRunGroupError() {
|
|
6
10
|
output.error({
|
|
7
|
-
title: `Unable to determine
|
|
11
|
+
title: `Unable to determine the context for running Nx in CI`,
|
|
8
12
|
bodyLines: [
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
13
|
+
"- Nx tried to determine the context automatically but wasn't able to do it.",
|
|
14
|
+
'- Use the NX_CI_EXECUTION_ID env variable to set it manually.',
|
|
15
|
+
`- NX_CI_EXECUTION_ID must be a unique value for every CI execution/run.`,
|
|
12
16
|
],
|
|
13
17
|
});
|
|
14
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print-run-group-error.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/error/print-run-group-error.ts"],"names":[],"mappings":";;;AAAA,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,SAAgB,kBAAkB;IAChC,MAAM,CAAC,KAAK,CAAC;QACX,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"print-run-group-error.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/error/print-run-group-error.ts"],"names":[],"mappings":";;;AAAA,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,SAAgB,iBAAiB,CAC/B,QAAuB,EACvB,aAA4B;IAE5B,OAAO,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,aAAa,CAAC;AACvC,CAAC;AALD,8CAKC;AAED,SAAgB,kBAAkB;IAChC,MAAM,CAAC,KAAK,CAAC;QACX,KAAK,EAAE,sDAAsD;QAC7D,SAAS,EAAE;YACT,6EAA6E;YAC7E,+DAA+D;YAC/D,yEAAyE;SAC1E;KACF,CAAC,CAAC;AACL,CAAC;AATD,gDASC"}
|
|
@@ -1 +1,93 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CloudEnabledLifeCycle = void 0;
|
|
4
|
+
const serializer_overrides_1 = require("../../../utilities/serializer-overrides");
|
|
5
|
+
const read_task_terminal_output_1 = require("../../terminal-output/read-task-terminal-output");
|
|
6
|
+
class CloudEnabledLifeCycle {
|
|
7
|
+
constructor(runContext, cacheDirectory, collectTerminalOutput, cacheableOperations, outputObfuscator, tasks) {
|
|
8
|
+
this.runContext = runContext;
|
|
9
|
+
this.cacheDirectory = cacheDirectory;
|
|
10
|
+
this.collectTerminalOutput = collectTerminalOutput;
|
|
11
|
+
this.cacheableOperations = cacheableOperations;
|
|
12
|
+
this.outputObfuscator = outputObfuscator;
|
|
13
|
+
this.tasks = tasks;
|
|
14
|
+
}
|
|
15
|
+
scheduleTask(task) {
|
|
16
|
+
this.runContext.scheduledTasks.push(task);
|
|
17
|
+
}
|
|
18
|
+
// this gets called for every tasks that starts.
|
|
19
|
+
startTask(task) {
|
|
20
|
+
this.tasks.push({
|
|
21
|
+
taskId: task.id,
|
|
22
|
+
startTime: new Date().toISOString(),
|
|
23
|
+
target: task.target.target,
|
|
24
|
+
projectName: task.target.project,
|
|
25
|
+
hash: task.hash,
|
|
26
|
+
hashDetails: this.cleanUpHashDetails(task.hashDetails),
|
|
27
|
+
params: (0, serializer_overrides_1.serializeOverrides)(task),
|
|
28
|
+
uploadedToStorage: false,
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
endTasks(tasks) {
|
|
32
|
+
// this can be called multiple times changing this time.
|
|
33
|
+
for (let t of tasks) {
|
|
34
|
+
let cacheStatus;
|
|
35
|
+
const taskIsRemoteCacheHit = t.status === 'remote-cache';
|
|
36
|
+
const taskIsLocalCacheHitPreNx135 = t.status === 'cache';
|
|
37
|
+
const taskIsLocalCacheHit = t.status === 'local-cache' ||
|
|
38
|
+
t.status === 'local-cache-kept-existing' ||
|
|
39
|
+
taskIsLocalCacheHitPreNx135;
|
|
40
|
+
if (this.runContext.statuses[t.task.hash]) {
|
|
41
|
+
cacheStatus = this.runContext.statuses[t.task.hash];
|
|
42
|
+
}
|
|
43
|
+
else if (taskIsRemoteCacheHit) {
|
|
44
|
+
cacheStatus = 'remote-cache-hit';
|
|
45
|
+
}
|
|
46
|
+
else if (taskIsLocalCacheHit) {
|
|
47
|
+
cacheStatus = 'local-cache-hit';
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
cacheStatus = 'cache-miss';
|
|
51
|
+
}
|
|
52
|
+
this.updateStartedTask(t, cacheStatus);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
endCommand() { }
|
|
56
|
+
updateStartedTask(result, cacheStatus) {
|
|
57
|
+
const startedTask = this.tasks.find((t) => t.taskId === result.task.id);
|
|
58
|
+
if (!startedTask) {
|
|
59
|
+
throw new Error(`Cannot find task ${result.task.id}`);
|
|
60
|
+
}
|
|
61
|
+
if ((result === null || result === void 0 ? void 0 : result.startTime) && (result === null || result === void 0 ? void 0 : result.endTime)) {
|
|
62
|
+
startedTask.startTime = new Date(result.startTime).toISOString();
|
|
63
|
+
startedTask.endTime = new Date(result.endTime).toISOString();
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
startedTask.endTime = new Date().toISOString();
|
|
67
|
+
}
|
|
68
|
+
startedTask.status = result.code;
|
|
69
|
+
startedTask.params = this.outputObfuscator.obfuscate(startedTask.params);
|
|
70
|
+
startedTask.cacheStatus = cacheStatus;
|
|
71
|
+
if (this.collectTerminalOutput) {
|
|
72
|
+
startedTask.terminalOutput = this.getTerminalOutput(result.task.hash, startedTask.cacheStatus, result.code);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
getTerminalOutput(hash, cacheStatus, code) {
|
|
76
|
+
return (0, read_task_terminal_output_1.readTaskTerminalOutput)(this.cacheDirectory, this.outputObfuscator, hash, cacheStatus, code);
|
|
77
|
+
}
|
|
78
|
+
cleanUpHashDetails(hashDetails) {
|
|
79
|
+
const nodes = {};
|
|
80
|
+
Object.keys(hashDetails.nodes)
|
|
81
|
+
.filter((k) => !k.startsWith('npm:'))
|
|
82
|
+
.forEach((k) => {
|
|
83
|
+
nodes[k] = hashDetails.nodes[k];
|
|
84
|
+
});
|
|
85
|
+
return {
|
|
86
|
+
nodes,
|
|
87
|
+
runtime: hashDetails.runtime,
|
|
88
|
+
implicitDeps: hashDetails.implicitDeps,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
exports.CloudEnabledLifeCycle = CloudEnabledLifeCycle;
|
|
93
|
+
//# sourceMappingURL=cloud-enabled-life-cycle.js.map
|