@catladder/cli 1.149.4 → 1.150.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/dist/bundles/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +1 -1
- package/dist/pipeline/src/context/createComponentContext.js +1 -1
- package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
- package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts +8 -0
- package/dist/pipeline/src/pipeline/createAllJobs.js +33 -64
- package/dist/pipeline/src/pipeline/createAllJobs.js.map +1 -1
- package/dist/pipeline/src/pipeline/packageManager.d.ts +2 -2
- package/dist/pipeline/src/pipeline/packageManager.js +3 -3
- package/dist/pipeline/src/pipeline/packageManager.js.map +1 -1
- package/dist/pipeline/src/pipeline/yarn/yarnUtils.d.ts +2 -2
- package/dist/pipeline/src/types/context.d.ts +8 -7
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -63,7 +63,7 @@ var createComponentContext = function (ctx) { return __awaiter(void 0, void 0, v
|
|
|
63
63
|
if (!/^[a-z0-9-]+$/.test(ctx.componentName)) {
|
|
64
64
|
throw new Error("componentName may only contain lower case letters, numbers and -");
|
|
65
65
|
}
|
|
66
|
-
return [4 /*yield*/, (0, packageManager_1.
|
|
66
|
+
return [4 /*yield*/, (0, packageManager_1.getPackageManagerInfoForComponent)(ctx.config, ctx.componentName)];
|
|
67
67
|
case 1:
|
|
68
68
|
packageManagerInfo = _a.sent();
|
|
69
69
|
envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAoC;AACpC,kCAAuC;AAEvC,oCAAyC;AAMzC,kCAAkD;AAClD,mDAAkD;AAClD,iEAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAoC;AACpC,kCAAuC;AAEvC,oCAAyC;AAMzC,kCAAkD;AAClD,mDAAkD;AAClD,iEAAgE;AAChE,6DAA+E;AAUxE,IAAM,sBAAsB,GAAG,UACpC,GAAkC;;;;;gBAElC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;gBACJ,CAAC;gBAE0B,qBAAM,IAAA,kDAAiC,EAChE,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,aAAa,CAClB,EAAA;;gBAHK,kBAAkB,GAAG,SAG1B;gBAEK,UAAU,GAAG,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;gBAExC,8BAA8B,GAAG,UAAU,CAAC,YAAY,CAAC;gBACzD,QAAQ,GAGV,8BAA8B,CAAC,MAAM;oBACvC,CAAC,CAAC;wBACE,KAAK,EACH,mBAAW,CACT,8BAA8B,CAAC,KAAK,CAAC,IAAuB,CAC7D,CAAC,QAAQ,CAAC,UAAU,CAAC;wBACxB,MAAM,EAAE,qBAAY,CAClB,8BAA8B,CAAC,MAAM,CAAC,IAAwB,CAC/D,CAAC,QAAQ,CAAC,UAAiB,CAAC;qBAC9B;oBACH,CAAC,CAAC;wBACE,KAAK,EAAE,EAAE;wBACT,MAAM,EAAE,EAAE;qBACX,CAAC;gBACA,eAAe,GAAG,IAAA,8BAAsB,EAC5C,QAAQ,EACR,8BAA8B,CAC/B,CAAC;gBAEkB,qBAAM,IAAA,+BAAc,EAAC,GAAG,CAAC,EAAA;;gBAAvC,WAAW,GAAG,SAAyB;gBACrC,MAAM,GAA6B,eAAe,OAA5C,EAAE,KAAK,GAAsB,eAAe,MAArC,EAAE,UAAU,GAAU,eAAe,WAAzB,EAAE,GAAG,GAAK,eAAe,IAApB,CAAqB;gBACrD,OAAO,GAAyC;oBACpD,UAAU,EAAE,GAAG,CAAC,MAAM;oBACtB,eAAe,iBAAA;oBAEf,KAAK,EAAE;wBACL,GAAG,EAAE,GAAG;wBACR,kBAAkB,EAAE,kBAAkB;wBACtC,MAAM,EAAE,KAAK;qBACd;oBACD,MAAM,EAAE,MAAM;wBACZ,CAAC,CAAC;4BACE,MAAM,EAAE,MAAM;yBACf;wBACH,CAAC,CAAC,IAAI;oBACR,aAAa,EAAE,GAAG,CAAC,aAAa;oBAChC,WAAW,aAAA;oBACX,kBAAkB,EAAE,kBAAkB;oBACtC,YAAY,EAAE,GAAG,CAAC,YAAY;oBAC9B,OAAO,EAAE,GAAG,CAAC,OAAO;iBACrB,CAAC;gBACI,kBAAkB,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC;oBAC/C,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;oBACrB,CAAC,CAAC,UAAU,CAAC;gBACf,4CACK,OAAO,KACV,UAAU,EAAE,kBAAkB,KAC9B;;;KACH,CAAC;AApEW,QAAA,sBAAsB,0BAoEjC;AAEF;;GAEG;AACU,QAAA,aAAa,GAAG,8BAAsB,CAAC"}
|
|
@@ -59,7 +59,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
|
|
|
59
59
|
var fullServiceName = serviceName.concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
|
|
60
60
|
var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({
|
|
61
61
|
// command as empty string resets it to default (uses the image's entrypoint)
|
|
62
|
-
command: commandArray ? '"' + commandArray.join(",") + '"' : '""' }, commonDeployArgs), { labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), { "cloud-run-service-name": fullServiceName })), "env-vars-file": constants_1.ENV_VARS_FILENAME, "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0, "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100, "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true, cpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.cpu, memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory, "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true, ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all", "cpu-boost": true, "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment })], __read((0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service")), false));
|
|
62
|
+
command: commandArray ? '"' + commandArray.join(",") + '"' : '""' }, commonDeployArgs), { labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), { "cloud-run-service-name": fullServiceName })), "env-vars-file": constants_1.ENV_VARS_FILENAME, "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0, "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100, "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true, cpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.cpu, memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory, timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout, "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true, ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all", "cpu-boost": true, "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment })], __read((0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service")), false));
|
|
63
63
|
// volumes require beta
|
|
64
64
|
var requiresBeta = (customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes) && Object.keys(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes).length > 0;
|
|
65
65
|
return "".concat((0, common_1.gcloudRunCmd)(requiresBeta ? "beta" : undefined), " deploy ").concat(fullServiceName, " ").concat(argsString);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAuD;AAIvD,8DAA6D;AAC7D,0DAAyD;AACzD,mCAKkB;AAClB,yCAAgD;AAChD,qCAA+C;AAExC,IAAM,sBAAsB,GAAG,UACpC,OAAyB,EACzB,OAAuD,EACvD,UAAmB;;IAEnB,IAAM,gBAAgB,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAEtD,IAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,IAAM,YAAY,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5D,IAAM,OAAO,GACX,OAAO,KAAK,IAAI;QACd,CAAC,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,mCAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY;QACvD,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAM,YAAY,GAAG,OAAO;QAC1B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YACtB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;QACtB,CAAC,CAAC,SAAS,CAAC;IACd,IAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC;IAC7D,IAAM,UAAU,GAAG,mCAAgB;YAE/B,6EAA6E;YAC7E,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,IAC9D,gBAAgB,KACnB,MAAM,EAAE,IAAA,wBAAe,wBAClB,IAAA,qBAAS,EAAC,OAAO,CAAC,KACrB,wBAAwB,EAAE,eAAe,IACzC,EACF,eAAe,EAAE,6BAAiB,EAClC,eAAe,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,CAAC,EAChD,eAAe,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,GAAG,EAClD,gBAAgB,EAAE,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,eAAe,MAAK,IAAI,EACxD,GAAG,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,EACtB,MAAM,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAC5B,uBAAuB,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,oBAAoB,mCAAI,IAAI,EACnE,OAAO,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,mCAAI,KAAK,EACvC,WAAW,EAAE,IAAI,EACjB,uBAAuB,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,oBAAoB,aAE1D,IAAA,4BAAkB,EAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,EAAE,SAAS,CAAC,UACxD,CAAC;IACF,uBAAuB;IACvB,IAAM,YAAY,GAChB,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,KAAI,MAAM,CAAC,IAAI,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAEzE,OAAO,UAAG,IAAA,qBAAY,EACpB,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAClC,qBAAW,eAAe,cAAI,UAAU,CAAE,CAAC;AAC9C,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,6 +89,14 @@ export type DeployConfigCloudRunService = {
|
|
|
89
89
|
* memory limit. Defaults to 512MB
|
|
90
90
|
*/
|
|
91
91
|
memory?: Memory;
|
|
92
|
+
/**
|
|
93
|
+
* timeout of the service, defaults to 5 minutes.
|
|
94
|
+
*
|
|
95
|
+
* you can specify something like 10m30s. if its just a number, it will be interpreted as seconds
|
|
96
|
+
*
|
|
97
|
+
* max supported is 60min
|
|
98
|
+
*/
|
|
99
|
+
timeout?: string;
|
|
92
100
|
/**
|
|
93
101
|
*
|
|
94
102
|
* set the execution environment.
|
|
@@ -46,66 +46,40 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
50
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
51
|
-
if (!m) return o;
|
|
52
|
-
var i = m.call(o), r, ar = [], e;
|
|
53
|
-
try {
|
|
54
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
55
|
-
}
|
|
56
|
-
catch (error) { e = { error: error }; }
|
|
57
|
-
finally {
|
|
58
|
-
try {
|
|
59
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
60
|
-
}
|
|
61
|
-
finally { if (e) throw e.error; }
|
|
62
|
-
}
|
|
63
|
-
return ar;
|
|
64
|
-
};
|
|
65
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
66
50
|
exports.createAllJobs = void 0;
|
|
67
51
|
var config_1 = require("../config");
|
|
68
52
|
var context_1 = require("../context");
|
|
69
53
|
var createJobsForComponent_1 = require("./createJobsForComponent");
|
|
70
54
|
var createAllComponentContext = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
71
|
-
var _c, _d;
|
|
72
55
|
var config = _b.config, trigger = _b.trigger, pipelineType = _b.pipelineType;
|
|
73
|
-
return __generator(this, function (
|
|
74
|
-
switch (
|
|
75
|
-
case 0:
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
var
|
|
79
|
-
return __generator(this, function (
|
|
80
|
-
switch (
|
|
81
|
-
case 0:
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
})];
|
|
96
|
-
case 1:
|
|
97
|
-
context = _a.sent();
|
|
98
|
-
return [2 /*return*/, [env, context]];
|
|
99
|
-
}
|
|
100
|
-
});
|
|
101
|
-
}); }))];
|
|
102
|
-
case 1: return [2 /*return*/, _a.concat([
|
|
103
|
-
_c.apply(_b, [_d.sent()])
|
|
104
|
-
])];
|
|
56
|
+
return __generator(this, function (_c) {
|
|
57
|
+
switch (_c.label) {
|
|
58
|
+
case 0: return [4 /*yield*/, Promise.all(Object.keys(config.components).flatMap(function (componentName) {
|
|
59
|
+
var envs = (0, config_1.getAllEnvsByTrigger)(config, componentName, trigger);
|
|
60
|
+
return envs.map(function (env) { return __awaiter(void 0, void 0, void 0, function () {
|
|
61
|
+
var context;
|
|
62
|
+
return __generator(this, function (_a) {
|
|
63
|
+
switch (_a.label) {
|
|
64
|
+
case 0: return [4 /*yield*/, (0, context_1.createComponentContext)({
|
|
65
|
+
config: config,
|
|
66
|
+
componentName: componentName,
|
|
67
|
+
env: env,
|
|
68
|
+
trigger: trigger,
|
|
69
|
+
pipelineType: pipelineType,
|
|
70
|
+
})];
|
|
71
|
+
case 1:
|
|
72
|
+
context = _a.sent();
|
|
73
|
+
return [2 /*return*/, {
|
|
74
|
+
env: env,
|
|
75
|
+
componentName: componentName,
|
|
76
|
+
context: context,
|
|
77
|
+
}];
|
|
105
78
|
}
|
|
106
79
|
});
|
|
107
|
-
}); })
|
|
108
|
-
|
|
80
|
+
}); });
|
|
81
|
+
}))];
|
|
82
|
+
case 1: return [2 /*return*/, _c.sent()];
|
|
109
83
|
}
|
|
110
84
|
});
|
|
111
85
|
}); };
|
|
@@ -121,19 +95,14 @@ var createAllJobs = function (_a) { return __awaiter(void 0, [_a], void 0, funct
|
|
|
121
95
|
})];
|
|
122
96
|
case 1:
|
|
123
97
|
allComponentContext = _c.sent();
|
|
124
|
-
return [2 /*return*/,
|
|
125
|
-
var
|
|
126
|
-
|
|
127
|
-
componentName
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
(0, createJobsForComponent_1.createJobsForComponentContext)(context).map(function (job) { return (__assign(__assign({}, job), { context: context })); }),
|
|
133
|
-
];
|
|
134
|
-
})),
|
|
135
|
-
];
|
|
136
|
-
}))];
|
|
98
|
+
return [2 /*return*/, allComponentContext.reduce(function (acc, _a) {
|
|
99
|
+
var componentName = _a.componentName, env = _a.env, context = _a.context;
|
|
100
|
+
if (!acc[componentName]) {
|
|
101
|
+
acc[componentName] = {};
|
|
102
|
+
}
|
|
103
|
+
acc[componentName][env] = (0, createJobsForComponent_1.createJobsForComponentContext)(context).map(function (job) { return (__assign(__assign({}, job), { context: context })); });
|
|
104
|
+
return acc;
|
|
105
|
+
}, {})];
|
|
137
106
|
}
|
|
138
107
|
});
|
|
139
108
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAllJobs.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createAllJobs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createAllJobs.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createAllJobs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAgD;AAChD,sCAAoD;AAQpD,mEAAyE;AAczE,IAAM,yBAAyB,GAAG,iEAAO,EAIxB;QAHf,MAAM,YAAA,EACN,OAAO,aAAA,EACP,YAAY,kBAAA;;;oBAQL,qBAAM,OAAO,CAAC,GAAG,CACtB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAC,aAAa;oBACnD,IAAM,IAAI,GAAG,IAAA,4BAAmB,EAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;oBACjE,OAAO,IAAI,CAAC,GAAG,CAAC,UAAO,GAAG;;;;wCACR,qBAAM,IAAA,gCAAsB,EAAC;wCAC3C,MAAM,QAAA;wCACN,aAAa,eAAA;wCACb,GAAG,KAAA;wCACH,OAAO,SAAA;wCACP,YAAY,cAAA;qCACb,CAAC,EAAA;;oCANI,OAAO,GAAG,SAMd;oCAEF,sBAAO;4CACL,GAAG,KAAA;4CACH,aAAa,eAAA;4CACb,OAAO,SAAA;yCACR,EAAC;;;yBACH,CAAC,CAAC;gBACL,CAAC,CAAC,CACH,EAAA;oBAnBD,sBAAO,SAmBN,EAAC;;;KACH,CAAC;AAEK,IAAM,aAAa,GAAG,iEAAO,EAInB;;QAHf,MAAM,YAAA,EACN,OAAO,aAAA,EACP,YAAY,kBAAA;;;oBAEgB,qBAAM,yBAAyB,CAAC;oBAC1D,MAAM,QAAA;oBACN,OAAO,SAAA;oBACP,YAAY,cAAA;iBACb,CAAC,EAAA;;gBAJI,mBAAmB,GAAG,SAI1B;gBAEF,sBAAO,mBAAmB,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,EAA+B;4BAA7B,aAAa,mBAAA,EAAE,GAAG,SAAA,EAAE,OAAO,aAAA;wBACnE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;4BACxB,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;wBAC1B,CAAC;wBACD,GAAG,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,GAAG,IAAA,sDAA6B,EAAC,OAAO,CAAC,CAAC,GAAG,CAClE,UAAC,GAAG,IAAK,OAAA,uBACJ,GAAG,KACN,OAAO,SAAA,IACP,EAHO,CAGP,CACH,CAAC;wBAEF,OAAO,GAAG,CAAC;oBACb,CAAC,EAAE,EAAsB,CAAC,EAAC;;;KAC5B,CAAC;AAxBW,QAAA,aAAa,iBAwBxB"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type { Config,
|
|
2
|
-
export declare const
|
|
1
|
+
import type { Config, PackageManagerInfoComponent } from "../types";
|
|
2
|
+
export declare const getPackageManagerInfoForComponent: (config: Config, componentName: string) => Promise<PackageManagerInfoComponent>;
|
|
@@ -61,12 +61,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
61
61
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
62
62
|
};
|
|
63
63
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
64
|
-
exports.
|
|
64
|
+
exports.getPackageManagerInfoForComponent = void 0;
|
|
65
65
|
var fs_1 = require("fs");
|
|
66
66
|
var path_1 = require("path");
|
|
67
67
|
var path_equal_1 = require("path-equal");
|
|
68
68
|
var yarnUtils_1 = require("./yarn/yarnUtils");
|
|
69
|
-
var
|
|
69
|
+
var getPackageManagerInfoForComponent = function (config, componentName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
70
70
|
var version, isClassic, component, workspaces, currentWorkspace, componentIsInWorkspace, workspaceRoot, packageJson, workspacePackageJson, lockFile, configFiles, configFilePaths, currentWorkspaceDependencies, pathsToCopyInDocker;
|
|
71
71
|
return __generator(this, function (_a) {
|
|
72
72
|
switch (_a.label) {
|
|
@@ -115,5 +115,5 @@ var getPackageManagerInfo = function (config, componentName) { return __awaiter(
|
|
|
115
115
|
}
|
|
116
116
|
});
|
|
117
117
|
}); };
|
|
118
|
-
exports.
|
|
118
|
+
exports.getPackageManagerInfoForComponent = getPackageManagerInfoForComponent;
|
|
119
119
|
//# sourceMappingURL=packageManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/packageManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAgC;AAChC,6BAA4B;AAC5B,yCAAuC;AAEvC,8CAI0B;AAEnB,IAAM,
|
|
1
|
+
{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/packageManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAgC;AAChC,6BAA4B;AAC5B,yCAAuC;AAEvC,8CAI0B;AAEnB,IAAM,iCAAiC,GAAG,UAC/C,MAAc,EACd,aAAqB;;;;oBAGL,qBAAM,IAAA,0BAAc,GAAE,EAAA;;gBAAhC,OAAO,GAAG,SAAsB;gBACtC,IAAI,CAAC,OAAO;oBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBACtD,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAEpC,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;gBAChC,qBAAM,IAAA,yBAAa,EAAC,SAAS,CAAC,EAAA;;gBAA3C,UAAU,GAAG,SAA8B;gBAC3C,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,UAAC,CAAC;oBACzC,OAAA,IAAA,sBAAS,EAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC;gBAApC,CAAoC,CACrC,CAAC;gBACI,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;gBACnD,aAAa,GAAG,GAAG,CAAC;gBACpB,WAAW,GAAG,IAAA,WAAI,EAAC,SAAS,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;gBAClD,oBAAoB,GAAG,sBAAsB;oBACjD,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,cAAc,CAAC;oBACrC,CAAC,CAAC,IAAI,CAAC;gBAEH,QAAQ,GAAG,sBAAsB;oBACrC,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,CAAC;oBAClC,CAAC,CAAC,IAAA,WAAI,EAAC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;gBAC/B,WAAW,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAG5D,eAAe,GAAG,uCACnB,WAAW,kBACX,WAAW,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,IAAA,WAAI,EAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAtB,CAAsB,CAAC,UACjD,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,IAAA,eAAU,EAAC,CAAC,CAAC,EAAb,CAAa,CAAC,CAAC;gBAIzB,4BAA4B,GAAG,gBAAgB;oBACnD,CAAC,CAAC,IAAA,oCAAwB,EAAC,gBAAgB,EAAE,UAAU,CAAC;oBACxD,CAAC,CAAC,EAAE,CAAC;gBAED,mBAAmB;oBACvB,WAAW;0BACR,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvD,QAAQ;kCACL,eAAe,kBACf,4BAA4B,SAChC,CAAC;gBACF,sBAAO;wBACL,IAAI,EAAE,MAAM;wBACZ,UAAU,YAAA;wBACV,OAAO,SAAA;wBACP,SAAS,WAAA;wBACT,gBAAgB,kBAAA;wBAChB,4BAA4B,8BAAA;wBAC5B,sBAAsB,wBAAA;wBACtB,mBAAmB,qBAAA;qBACpB,EAAC;;;KACH,CAAC;AAvDW,QAAA,iCAAiC,qCAuD5C"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import memoizee from "memoizee";
|
|
2
|
-
import type {
|
|
2
|
+
import type { YarnWorkspace } from "../../types";
|
|
3
3
|
export declare const getYarnVersion: (() => Promise<string>) & memoizee.Memoized<() => Promise<string>>;
|
|
4
|
-
export declare const getWorkspaces: ((isClassic: boolean) => Promise<
|
|
4
|
+
export declare const getWorkspaces: ((isClassic: boolean) => Promise<Array<YarnWorkspace>>) & memoizee.Memoized<(isClassic: boolean) => Promise<Array<YarnWorkspace>>>;
|
|
5
5
|
export declare const getWorkspaceDependencies: (ws: YarnWorkspace, allWorkspaces: YarnWorkspace[]) => string[];
|
|
@@ -49,7 +49,7 @@ export type YarnWorkspace = {
|
|
|
49
49
|
workspaceDependencies: string[];
|
|
50
50
|
mismatchedWorkspaceDependencies: string[];
|
|
51
51
|
};
|
|
52
|
-
export type
|
|
52
|
+
export type YarnPackageManagerInfoComponent = {
|
|
53
53
|
type: "yarn";
|
|
54
54
|
version: string;
|
|
55
55
|
workspaces: YarnWorkspace[];
|
|
@@ -59,17 +59,18 @@ export type YarnPackageManagerInfo = {
|
|
|
59
59
|
pathsToCopyInDocker: string[];
|
|
60
60
|
currentWorkspaceDependencies: string[];
|
|
61
61
|
};
|
|
62
|
-
export type
|
|
62
|
+
export type PackageManagerInfoComponent = YarnPackageManagerInfoComponent;
|
|
63
63
|
export type ContextBeforeConfig = {
|
|
64
64
|
componentName: string;
|
|
65
65
|
fullConfig: Config;
|
|
66
|
-
packageManagerInfo?:
|
|
66
|
+
packageManagerInfo?: PackageManagerInfoComponent;
|
|
67
67
|
};
|
|
68
|
-
export type
|
|
68
|
+
export type BuildContextComponent = {
|
|
69
69
|
dir: string;
|
|
70
|
-
packageManagerInfo:
|
|
70
|
+
packageManagerInfo: PackageManagerInfoComponent;
|
|
71
71
|
config: BuildConfig;
|
|
72
72
|
};
|
|
73
|
+
export type BuildContext = BuildContextComponent;
|
|
73
74
|
export type DeployContext = {
|
|
74
75
|
config: DeployConfig;
|
|
75
76
|
};
|
|
@@ -82,7 +83,7 @@ export type ComponentContext = {
|
|
|
82
83
|
*
|
|
83
84
|
*/
|
|
84
85
|
componentConfig: ComponentConfig;
|
|
85
|
-
build:
|
|
86
|
+
build: BuildContextComponent;
|
|
86
87
|
deploy?: DeployContext | null;
|
|
87
88
|
fullConfig: Config;
|
|
88
89
|
environment: Environment;
|
|
@@ -91,7 +92,7 @@ export type ComponentContext = {
|
|
|
91
92
|
/**
|
|
92
93
|
* @deprecated use buildContext.packageManagerInfo instead
|
|
93
94
|
*/
|
|
94
|
-
packageManagerInfo:
|
|
95
|
+
packageManagerInfo: PackageManagerInfoComponent;
|
|
95
96
|
customJobs?: CatladderJob[];
|
|
96
97
|
};
|
|
97
98
|
/**
|