@catladder/cli 0.0.0-further-refactor-deploy-1e5928e9 → 0.0.0-further-refactor-deploy-79fbaf60

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.
@@ -39138,7 +39138,7 @@ exports.RUNNER_BUILD_RESOURCE_VARIABLES = {
39138
39138
 
39139
39139
  /***/ }),
39140
39140
 
39141
- /***/ 5669:
39141
+ /***/ 7267:
39142
39142
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
39143
39143
 
39144
39144
  "use strict";
@@ -39154,6 +39154,14 @@ var __assign = this && this.__assign || function () {
39154
39154
  };
39155
39155
  return __assign.apply(this, arguments);
39156
39156
  };
39157
+ var __rest = this && this.__rest || function (s, e) {
39158
+ var t = {};
39159
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
39160
+ if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
39161
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
39162
+ }
39163
+ return t;
39164
+ };
39157
39165
  var __read = this && this.__read || function (o, n) {
39158
39166
  var m = typeof Symbol === "function" && o[Symbol.iterator];
39159
39167
  if (!m) return o;
@@ -39186,29 +39194,44 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
39186
39194
  return to.concat(ar || Array.prototype.slice.call(from));
39187
39195
  };
39188
39196
  exports.__esModule = true;
39189
- exports.createArtifactsConfig = void 0;
39197
+ exports.createAppBuildJob = void 0;
39198
+ var lodash_1 = __nccwpck_require__(3255);
39190
39199
  var path_1 = __nccwpck_require__(1017);
39191
- var createArtifactsConfig = function (rootPath, artifactsReports, artifacts) {
39192
- var _a, _b, _c, _d;
39193
- return artifactsReports || artifacts ? {
39194
- artifacts: __assign(__assign({
39195
- paths: []
39196
- }, artifacts), {
39197
- reports: __assign(__assign({}, artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports), {
39198
- junit: [artifactsReports === null || artifactsReports === void 0 ? void 0 : artifactsReports.junit, Array.isArray((_a = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _a === void 0 ? void 0 : _a.junit) && ((_b = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _b === void 0 ? void 0 : _b.junit), typeof ((_c = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _c === void 0 ? void 0 : _c.junit) === "string" && [(_d = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _d === void 0 ? void 0 : _d.junit]].filter(Array.isArray).reduce(function (acc, curr) {
39199
- return __spreadArray(__spreadArray([], __read(acc), false), __read(curr.map(function (p) {
39200
- return (0, path_1.join)(rootPath, p);
39201
- })), false);
39202
- }, [])
39203
- })
39204
- })
39205
- } : undefined;
39200
+ var __1 = __nccwpck_require__(5355);
39201
+ var utils_1 = __nccwpck_require__(7461);
39202
+ var yarn_1 = __nccwpck_require__(464);
39203
+ var constants_1 = __nccwpck_require__(1542);
39204
+ var writeBuildInfo_1 = __nccwpck_require__(1754);
39205
+ var writeDotEnv_1 = __nccwpck_require__(1298);
39206
+ var createAppBuildJob = function (context, _a) {
39207
+ var _b, _c, _d, _e;
39208
+ var script = _a.script,
39209
+ variables = _a.variables,
39210
+ def = __rest(_a, ["script", "variables"]);
39211
+ return (0, lodash_1.merge)({
39212
+ name: constants_1.APP_BUILD_JOB_NAME,
39213
+ envMode: "jobPerEnv",
39214
+ stage: "build",
39215
+ image: (0, __1.getRunnerImage)("jobs-default"),
39216
+ needs: [],
39217
+ cache: [],
39218
+ variables: __assign(__assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
39219
+ script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(context.componentConfig.dotEnv ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
39220
+ artifacts: {
39221
+ paths: [(0, path_1.join)(context.componentConfig.dir, "__build_info.json")],
39222
+ reports: {
39223
+ junit: (_e = (_d = context.componentConfig.build.artifactsReports) === null || _d === void 0 ? void 0 : _d.junit) === null || _e === void 0 ? void 0 : _e.map(function (p) {
39224
+ return (0, path_1.join)(context.componentConfig.dir, p);
39225
+ })
39226
+ }
39227
+ }
39228
+ }, def);
39206
39229
  };
39207
- exports.createArtifactsConfig = createArtifactsConfig;
39230
+ exports.createAppBuildJob = createAppBuildJob;
39208
39231
 
39209
39232
  /***/ }),
39210
39233
 
39211
- /***/ 8063:
39234
+ /***/ 5669:
39212
39235
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
39213
39236
 
39214
39237
  "use strict";
@@ -39224,14 +39247,6 @@ var __assign = this && this.__assign || function () {
39224
39247
  };
39225
39248
  return __assign.apply(this, arguments);
39226
39249
  };
39227
- var __rest = this && this.__rest || function (s, e) {
39228
- var t = {};
39229
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
39230
- if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
39231
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
39232
- }
39233
- return t;
39234
- };
39235
39250
  var __read = this && this.__read || function (o, n) {
39236
39251
  var m = typeof Symbol === "function" && o[Symbol.iterator];
39237
39252
  if (!m) return o;
@@ -39264,40 +39279,25 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
39264
39279
  return to.concat(ar || Array.prototype.slice.call(from));
39265
39280
  };
39266
39281
  exports.__esModule = true;
39267
- exports.createBuildJob = void 0;
39268
- var lodash_1 = __nccwpck_require__(3255);
39282
+ exports.createArtifactsConfig = void 0;
39269
39283
  var path_1 = __nccwpck_require__(1017);
39270
- var __1 = __nccwpck_require__(5355);
39271
- var utils_1 = __nccwpck_require__(7461);
39272
- var yarn_1 = __nccwpck_require__(464);
39273
- var constants_1 = __nccwpck_require__(1542);
39274
- var writeBuildInfo_1 = __nccwpck_require__(1754);
39275
- var writeDotEnv_1 = __nccwpck_require__(1298);
39276
- var createBuildJob = function (context, _a) {
39277
- var _b, _c, _d, _e;
39278
- var script = _a.script,
39279
- variables = _a.variables,
39280
- def = __rest(_a, ["script", "variables"]);
39281
- return (0, lodash_1.merge)({
39282
- name: constants_1.APP_BUILD_JOB_NAME,
39283
- envMode: "jobPerEnv",
39284
- stage: "build",
39285
- image: (0, __1.getRunnerImage)("jobs-default"),
39286
- needs: [],
39287
- cache: [],
39288
- variables: __assign(__assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
39289
- script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(context.componentConfig.dotEnv ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
39290
- artifacts: {
39291
- paths: [(0, path_1.join)(context.componentConfig.dir, "__build_info.json")],
39292
- reports: {
39293
- junit: (_e = (_d = context.componentConfig.build.artifactsReports) === null || _d === void 0 ? void 0 : _d.junit) === null || _e === void 0 ? void 0 : _e.map(function (p) {
39294
- return (0, path_1.join)(context.componentConfig.dir, p);
39295
- })
39296
- }
39297
- }
39298
- }, def);
39284
+ var createArtifactsConfig = function (rootPath, artifactsReports, artifacts) {
39285
+ var _a, _b, _c, _d;
39286
+ return artifactsReports || artifacts ? {
39287
+ artifacts: __assign(__assign({
39288
+ paths: []
39289
+ }, artifacts), {
39290
+ reports: __assign(__assign({}, artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports), {
39291
+ junit: [artifactsReports === null || artifactsReports === void 0 ? void 0 : artifactsReports.junit, Array.isArray((_a = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _a === void 0 ? void 0 : _a.junit) && ((_b = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _b === void 0 ? void 0 : _b.junit), typeof ((_c = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _c === void 0 ? void 0 : _c.junit) === "string" && [(_d = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _d === void 0 ? void 0 : _d.junit]].filter(Array.isArray).reduce(function (acc, curr) {
39292
+ return __spreadArray(__spreadArray([], __read(acc), false), __read(curr.map(function (p) {
39293
+ return (0, path_1.join)(rootPath, p);
39294
+ })), false);
39295
+ }, [])
39296
+ })
39297
+ })
39298
+ } : undefined;
39299
39299
  };
39300
- exports.createBuildJob = createBuildJob;
39300
+ exports.createArtifactsConfig = createArtifactsConfig;
39301
39301
 
39302
39302
  /***/ }),
39303
39303
 
@@ -39354,10 +39354,10 @@ var sbom_1 = __nccwpck_require__(5928);
39354
39354
  var docker_1 = __nccwpck_require__(3219);
39355
39355
  var sbom_2 = __nccwpck_require__(9927);
39356
39356
  var constants_1 = __nccwpck_require__(1542);
39357
- var createBuildJob_1 = __nccwpck_require__(8063);
39357
+ var createAppBuildJob_1 = __nccwpck_require__(7267);
39358
39358
  var createBuildJobs = function (context, definitions) {
39359
39359
  var _a;
39360
- return __spreadArray(__spreadArray(__spreadArray([], __read(definitions.appBuild ? [(0, createBuildJob_1.createBuildJob)(context, definitions.appBuild)] : []), false), __read(definitions.dockerBuild ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
39360
+ return __spreadArray(__spreadArray(__spreadArray([], __read(definitions.appBuild ? [(0, createAppBuildJob_1.createAppBuildJob)(context, definitions.appBuild)] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
39361
39361
  needs: __spreadArray(__spreadArray([], __read((_a = definitions.dockerBuild.needs) !== null && _a !== void 0 ? _a : []), false), __read(definitions.appBuild ? [constants_1.APP_BUILD_JOB_NAME] : []), false)
39362
39362
  }))] : []), false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
39363
39363
  };
@@ -39511,10 +39511,10 @@ var createCustomBuildJobs = function (context) {
39511
39511
  expire_in: "1 day"
39512
39512
  }
39513
39513
  } : undefined,
39514
- dockerBuild: (0, docker_1.requiresDockerBuild)(context) ? {
39514
+ dockerBuild: {
39515
39515
  script: (0, docker_1.getDockerBuildDefaultScript)(((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
39516
39516
  variables: {}
39517
- } : undefined
39517
+ }
39518
39518
  });
39519
39519
  };
39520
39520
  exports.createCustomBuildJobs = createCustomBuildJobs;
@@ -39943,7 +39943,7 @@ var createNodeBuildJobs = function (context) {
39943
39943
  },
39944
39944
  jobTags: buildConfig.jobTags
39945
39945
  } : undefined,
39946
- dockerBuild: (0, docker_1.requiresDockerBuild)(context) ? {
39946
+ dockerBuild: {
39947
39947
  script: (0, docker_1.getDockerBuildDefaultScript)(buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"),
39948
39948
  cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
39949
39949
  variables: {
@@ -39953,7 +39953,7 @@ var createNodeBuildJobs = function (context) {
39953
39953
  return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
39954
39954
  })) === null || _g === void 0 ? void 0 : _g.join("\n")
39955
39955
  }
39956
- } : undefined
39956
+ }
39957
39957
  });
39958
39958
  };
39959
39959
  exports.createNodeBuildJobs = createNodeBuildJobs;
@@ -40845,7 +40845,7 @@ exports.readConfigSync = readConfigSync;
40845
40845
 
40846
40846
  exports.__esModule = true;
40847
40847
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40848
- exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-1e5928e9" || 0;
40848
+ exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-79fbaf60" || 0;
40849
40849
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40850
40850
 
40851
40851
  /***/ }),
@@ -350203,7 +350203,7 @@ exports.RUNNER_BUILD_RESOURCE_VARIABLES = {
350203
350203
 
350204
350204
  /***/ }),
350205
350205
 
350206
- /***/ 5669:
350206
+ /***/ 57267:
350207
350207
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
350208
350208
 
350209
350209
  "use strict";
@@ -350219,6 +350219,14 @@ var __assign = this && this.__assign || function () {
350219
350219
  };
350220
350220
  return __assign.apply(this, arguments);
350221
350221
  };
350222
+ var __rest = this && this.__rest || function (s, e) {
350223
+ var t = {};
350224
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
350225
+ if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
350226
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
350227
+ }
350228
+ return t;
350229
+ };
350222
350230
  var __read = this && this.__read || function (o, n) {
350223
350231
  var m = typeof Symbol === "function" && o[Symbol.iterator];
350224
350232
  if (!m) return o;
@@ -350251,29 +350259,44 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
350251
350259
  return to.concat(ar || Array.prototype.slice.call(from));
350252
350260
  };
350253
350261
  exports.__esModule = true;
350254
- exports.createArtifactsConfig = void 0;
350262
+ exports.createAppBuildJob = void 0;
350263
+ var lodash_1 = __nccwpck_require__(23255);
350255
350264
  var path_1 = __nccwpck_require__(71017);
350256
- var createArtifactsConfig = function (rootPath, artifactsReports, artifacts) {
350257
- var _a, _b, _c, _d;
350258
- return artifactsReports || artifacts ? {
350259
- artifacts: __assign(__assign({
350260
- paths: []
350261
- }, artifacts), {
350262
- reports: __assign(__assign({}, artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports), {
350263
- junit: [artifactsReports === null || artifactsReports === void 0 ? void 0 : artifactsReports.junit, Array.isArray((_a = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _a === void 0 ? void 0 : _a.junit) && ((_b = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _b === void 0 ? void 0 : _b.junit), typeof ((_c = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _c === void 0 ? void 0 : _c.junit) === "string" && [(_d = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _d === void 0 ? void 0 : _d.junit]].filter(Array.isArray).reduce(function (acc, curr) {
350264
- return __spreadArray(__spreadArray([], __read(acc), false), __read(curr.map(function (p) {
350265
- return (0, path_1.join)(rootPath, p);
350266
- })), false);
350267
- }, [])
350268
- })
350269
- })
350270
- } : undefined;
350265
+ var __1 = __nccwpck_require__(25355);
350266
+ var utils_1 = __nccwpck_require__(37461);
350267
+ var yarn_1 = __nccwpck_require__(10464);
350268
+ var constants_1 = __nccwpck_require__(11542);
350269
+ var writeBuildInfo_1 = __nccwpck_require__(51754);
350270
+ var writeDotEnv_1 = __nccwpck_require__(71298);
350271
+ var createAppBuildJob = function (context, _a) {
350272
+ var _b, _c, _d, _e;
350273
+ var script = _a.script,
350274
+ variables = _a.variables,
350275
+ def = __rest(_a, ["script", "variables"]);
350276
+ return (0, lodash_1.merge)({
350277
+ name: constants_1.APP_BUILD_JOB_NAME,
350278
+ envMode: "jobPerEnv",
350279
+ stage: "build",
350280
+ image: (0, __1.getRunnerImage)("jobs-default"),
350281
+ needs: [],
350282
+ cache: [],
350283
+ variables: __assign(__assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
350284
+ script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(context.componentConfig.dotEnv ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
350285
+ artifacts: {
350286
+ paths: [(0, path_1.join)(context.componentConfig.dir, "__build_info.json")],
350287
+ reports: {
350288
+ junit: (_e = (_d = context.componentConfig.build.artifactsReports) === null || _d === void 0 ? void 0 : _d.junit) === null || _e === void 0 ? void 0 : _e.map(function (p) {
350289
+ return (0, path_1.join)(context.componentConfig.dir, p);
350290
+ })
350291
+ }
350292
+ }
350293
+ }, def);
350271
350294
  };
350272
- exports.createArtifactsConfig = createArtifactsConfig;
350295
+ exports.createAppBuildJob = createAppBuildJob;
350273
350296
 
350274
350297
  /***/ }),
350275
350298
 
350276
- /***/ 58063:
350299
+ /***/ 5669:
350277
350300
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
350278
350301
 
350279
350302
  "use strict";
@@ -350289,14 +350312,6 @@ var __assign = this && this.__assign || function () {
350289
350312
  };
350290
350313
  return __assign.apply(this, arguments);
350291
350314
  };
350292
- var __rest = this && this.__rest || function (s, e) {
350293
- var t = {};
350294
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
350295
- if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
350296
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
350297
- }
350298
- return t;
350299
- };
350300
350315
  var __read = this && this.__read || function (o, n) {
350301
350316
  var m = typeof Symbol === "function" && o[Symbol.iterator];
350302
350317
  if (!m) return o;
@@ -350329,40 +350344,25 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
350329
350344
  return to.concat(ar || Array.prototype.slice.call(from));
350330
350345
  };
350331
350346
  exports.__esModule = true;
350332
- exports.createBuildJob = void 0;
350333
- var lodash_1 = __nccwpck_require__(23255);
350347
+ exports.createArtifactsConfig = void 0;
350334
350348
  var path_1 = __nccwpck_require__(71017);
350335
- var __1 = __nccwpck_require__(25355);
350336
- var utils_1 = __nccwpck_require__(37461);
350337
- var yarn_1 = __nccwpck_require__(10464);
350338
- var constants_1 = __nccwpck_require__(11542);
350339
- var writeBuildInfo_1 = __nccwpck_require__(51754);
350340
- var writeDotEnv_1 = __nccwpck_require__(71298);
350341
- var createBuildJob = function (context, _a) {
350342
- var _b, _c, _d, _e;
350343
- var script = _a.script,
350344
- variables = _a.variables,
350345
- def = __rest(_a, ["script", "variables"]);
350346
- return (0, lodash_1.merge)({
350347
- name: constants_1.APP_BUILD_JOB_NAME,
350348
- envMode: "jobPerEnv",
350349
- stage: "build",
350350
- image: (0, __1.getRunnerImage)("jobs-default"),
350351
- needs: [],
350352
- cache: [],
350353
- variables: __assign(__assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
350354
- script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(context.componentConfig.dotEnv ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
350355
- artifacts: {
350356
- paths: [(0, path_1.join)(context.componentConfig.dir, "__build_info.json")],
350357
- reports: {
350358
- junit: (_e = (_d = context.componentConfig.build.artifactsReports) === null || _d === void 0 ? void 0 : _d.junit) === null || _e === void 0 ? void 0 : _e.map(function (p) {
350359
- return (0, path_1.join)(context.componentConfig.dir, p);
350360
- })
350361
- }
350362
- }
350363
- }, def);
350349
+ var createArtifactsConfig = function (rootPath, artifactsReports, artifacts) {
350350
+ var _a, _b, _c, _d;
350351
+ return artifactsReports || artifacts ? {
350352
+ artifacts: __assign(__assign({
350353
+ paths: []
350354
+ }, artifacts), {
350355
+ reports: __assign(__assign({}, artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports), {
350356
+ junit: [artifactsReports === null || artifactsReports === void 0 ? void 0 : artifactsReports.junit, Array.isArray((_a = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _a === void 0 ? void 0 : _a.junit) && ((_b = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _b === void 0 ? void 0 : _b.junit), typeof ((_c = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _c === void 0 ? void 0 : _c.junit) === "string" && [(_d = artifacts === null || artifacts === void 0 ? void 0 : artifacts.reports) === null || _d === void 0 ? void 0 : _d.junit]].filter(Array.isArray).reduce(function (acc, curr) {
350357
+ return __spreadArray(__spreadArray([], __read(acc), false), __read(curr.map(function (p) {
350358
+ return (0, path_1.join)(rootPath, p);
350359
+ })), false);
350360
+ }, [])
350361
+ })
350362
+ })
350363
+ } : undefined;
350364
350364
  };
350365
- exports.createBuildJob = createBuildJob;
350365
+ exports.createArtifactsConfig = createArtifactsConfig;
350366
350366
 
350367
350367
  /***/ }),
350368
350368
 
@@ -350419,10 +350419,10 @@ var sbom_1 = __nccwpck_require__(65928);
350419
350419
  var docker_1 = __nccwpck_require__(33219);
350420
350420
  var sbom_2 = __nccwpck_require__(9927);
350421
350421
  var constants_1 = __nccwpck_require__(11542);
350422
- var createBuildJob_1 = __nccwpck_require__(58063);
350422
+ var createAppBuildJob_1 = __nccwpck_require__(57267);
350423
350423
  var createBuildJobs = function (context, definitions) {
350424
350424
  var _a;
350425
- return __spreadArray(__spreadArray(__spreadArray([], __read(definitions.appBuild ? [(0, createBuildJob_1.createBuildJob)(context, definitions.appBuild)] : []), false), __read(definitions.dockerBuild ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
350425
+ return __spreadArray(__spreadArray(__spreadArray([], __read(definitions.appBuild ? [(0, createAppBuildJob_1.createAppBuildJob)(context, definitions.appBuild)] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
350426
350426
  needs: __spreadArray(__spreadArray([], __read((_a = definitions.dockerBuild.needs) !== null && _a !== void 0 ? _a : []), false), __read(definitions.appBuild ? [constants_1.APP_BUILD_JOB_NAME] : []), false)
350427
350427
  }))] : []), false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
350428
350428
  };
@@ -350576,10 +350576,10 @@ var createCustomBuildJobs = function (context) {
350576
350576
  expire_in: "1 day"
350577
350577
  }
350578
350578
  } : undefined,
350579
- dockerBuild: (0, docker_1.requiresDockerBuild)(context) ? {
350579
+ dockerBuild: {
350580
350580
  script: (0, docker_1.getDockerBuildDefaultScript)(((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
350581
350581
  variables: {}
350582
- } : undefined
350582
+ }
350583
350583
  });
350584
350584
  };
350585
350585
  exports.createCustomBuildJobs = createCustomBuildJobs;
@@ -351008,7 +351008,7 @@ var createNodeBuildJobs = function (context) {
351008
351008
  },
351009
351009
  jobTags: buildConfig.jobTags
351010
351010
  } : undefined,
351011
- dockerBuild: (0, docker_1.requiresDockerBuild)(context) ? {
351011
+ dockerBuild: {
351012
351012
  script: (0, docker_1.getDockerBuildDefaultScript)(buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"),
351013
351013
  cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
351014
351014
  variables: {
@@ -351018,7 +351018,7 @@ var createNodeBuildJobs = function (context) {
351018
351018
  return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
351019
351019
  })) === null || _g === void 0 ? void 0 : _g.join("\n")
351020
351020
  }
351021
- } : undefined
351021
+ }
351022
351022
  });
351023
351023
  };
351024
351024
  exports.createNodeBuildJobs = createNodeBuildJobs;
@@ -351910,7 +351910,7 @@ exports.readConfigSync = readConfigSync;
351910
351910
 
351911
351911
  exports.__esModule = true;
351912
351912
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351913
- exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-1e5928e9" || 0;
351913
+ exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-79fbaf60" || 0;
351914
351914
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351915
351915
 
351916
351916
  /***/ }),
package/package.json CHANGED
@@ -24,7 +24,7 @@
24
24
  "node": ">=12.0.0"
25
25
  },
26
26
  "devDependencies": {
27
- "@catladder/pipeline": "0.0.0-further-refactor-deploy-1e5928e9",
27
+ "@catladder/pipeline": "0.0.0-further-refactor-deploy-79fbaf60",
28
28
  "@kubernetes/client-node": "^0.16.2",
29
29
  "@tsconfig/node14": "^1.0.1",
30
30
  "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
57
57
  "typescript": "^4.5.4",
58
58
  "vorpal": "^1.12.0"
59
59
  },
60
- "version": "0.0.0-further-refactor-deploy-1e5928e9",
60
+ "version": "0.0.0-further-refactor-deploy-79fbaf60",
61
61
  "stableVersion": "0.0.0"
62
62
  }