@catladder/pipeline 0.0.0-remove-env-mode-none-9b62fbb1 → 0.0.0-remove-sbom-91cda0a4

package/dist/build/artifacts/createBuildJobArtifact.js

@@ -49,6 +49,11 @@ var path_1 = require("path");
 var types_1 = require("../../types");
 var lodash_1 = require("lodash");
 var writeDotEnv_1 = require("../base/writeDotEnv");
+var uniqueAndAlphabeticalSort = function (arr) {
+  return (0, lodash_1.uniq)(arr).sort(function (a, b) {
+    return a.localeCompare(b);
+  });
+};
 var createBuildJobArtifacts = function (context) {
   var _a, _b;
   var paths = context.type === "workspace" ? context.components.flatMap(function (c) {
@@ -58,11 +63,9 @@ var createBuildJobArtifacts = function (context) {
     return getAllArtifactExcludePathsForComponent(c);
   }) : getAllArtifactExcludePathsForComponent(context);
   return __assign(__assign({
-    paths: (0, lodash_1.uniq)(paths).sort(function (a, b) {
-      return a.localeCompare(b);
-    })
+    paths: uniqueAndAlphabeticalSort(paths)
   }, exclude.length > 0 ? {
-    exclude: exclude
+    exclude: uniqueAndAlphabeticalSort(exclude)
   } : {}), {
     expire_in: "1 day",
     when: "always",

package/dist/build/base/index.js

@@ -45,21 +45,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createWorkspaceBuildJobs = exports.createComponentBuildJobs = void 0;
-var sbom_1 = require("../../deploy/sbom");
 var context_1 = require("../../types/context");
 var docker_1 = require("../docker");
-var sbom_2 = require("../sbom");
 var constants_1 = require("./constants");
 var createAppBuildJob_1 = require("./createAppBuildJob");
 var createComponentBuildJobs = function (context, definitions) {
   var _a;
-  return __spreadArray(__spreadArray(__spreadArray([], __read(definitions.appBuild && (0, context_1.componentContextIsStandaloneBuild)(context) ? [(0, createAppBuildJob_1.createAppBuildJob)(context, definitions.appBuild)] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
+  return __spreadArray(__spreadArray([], __read(definitions.appBuild && (0, context_1.componentContextIsStandaloneBuild)(context) ? [(0, createAppBuildJob_1.createAppBuildJob)(context, definitions.appBuild)] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
     needs: __spreadArray(__spreadArray([], __read((_a = definitions.dockerBuild.needs) !== null && _a !== void 0 ? _a : []), false), __read(definitions.appBuild && (0, context_1.componentContextIsStandaloneBuild)(context) ? [constants_1.APP_BUILD_JOB_NAME] : (0, context_1.componentContextHasWorkspaceBuild)(context) ? [{
       job: constants_1.APP_BUILD_JOB_NAME,
       artifacts: true,
       workspaceName: context.build.workspaceName
     }] : []), false)
-  }))] : []), false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
+  }))] : []), false);
 };
 exports.createComponentBuildJobs = createComponentBuildJobs;
 var createWorkspaceBuildJobs = function (context, definitions) {

package/dist/build/custom/testJob.js

@@ -55,7 +55,7 @@ var RUNNER_CUSTOM_TEST_VARIABLES = {
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
 var createCustomTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {
@@ -69,7 +69,6 @@ var createCustomTestJobs = function (context) {
     variables: __assign({
       APP_PATH: context.build.dir
     }, context.environment.jobOnlyVars.build.envVars),
-    runnerVariables: RUNNER_CUSTOM_TEST_VARIABLES,
     services: buildConfig.jobServices,
     cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
     stage: "test",
@@ -78,23 +77,26 @@ var createCustomTestJobs = function (context) {
   var auditJob = buildConfig.audit ? __assign(__assign(__assign({
     name: "🛡 audit"
   }, base), {
-    image: (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage,
+    runnerVariables: __assign(__assign({}, RUNNER_CUSTOM_TEST_VARIABLES), (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.runnerVariables) !== null && _b !== void 0 ? _b : {}),
+    image: (_d = (_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.jobImage) !== null && _d !== void 0 ? _d : buildConfig.jobImage,
     cache: undefined,
-    script: __spreadArray([], __read((0, utils_1.ensureArray)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)), false),
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)), false),
     allow_failure: true
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.artifactsReports, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifactsReports, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifacts)) : null;
   var lintJob = buildConfig.lint ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
-    image: (_g = (_f = buildConfig.lint) === null || _f === void 0 ? void 0 : _f.jobImage) !== null && _g !== void 0 ? _g : buildConfig.jobImage,
-    script: __spreadArray([], __read((0, utils_1.ensureArray)((_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.command)), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.artifactsReports, (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.artifacts)) : null;
+    runnerVariables: __assign(__assign({}, RUNNER_CUSTOM_TEST_VARIABLES), (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.runnerVariables) !== null && _j !== void 0 ? _j : {}),
+    image: (_l = (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.jobImage) !== null && _l !== void 0 ? _l : buildConfig.jobImage,
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.command)), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifactsReports, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifacts)) : null;
   var testJob = buildConfig.test ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
-    image: (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage,
-    script: __spreadArray([], __read((0, utils_1.ensureArray)((_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.command)), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.artifactsReports, (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.artifacts)) : null;
+    runnerVariables: __assign(__assign({}, RUNNER_CUSTOM_TEST_VARIABLES), (_r = (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.runnerVariables) !== null && _r !== void 0 ? _r : {}),
+    image: (_t = (_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.jobImage) !== null && _t !== void 0 ? _t : buildConfig.jobImage,
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.command)), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifactsReports, (_w = buildConfig.test) === null || _w === void 0 ? void 0 : _w.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createCustomTestJobs = createCustomTestJobs;

package/dist/build/docker.d.ts

@@ -64,6 +64,6 @@ export declare const createDockerBuildJobBase: (context: ComponentContextWithBui
   ...def
 }: DockerBuildJobDefinition) => CatladderJob;
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
-export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContextWithBuild, defaultType?: BuildConfigDocker["type"]) => (string | undefined)[];
+export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContextWithBuild, fallbackType?: BuildConfigDocker["type"]) => (string | undefined)[];
 export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => (string | undefined)[];
 export declare const hasDockerfile: (context: ComponentContext) => boolean;

package/dist/build/docker.js

@@ -168,10 +168,22 @@ var BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
   nginx: "ensureNginxDockerfile",
   custom: null
 };
-var getDockerBuildScriptWithBuiltInDockerFile = function (context, defaultType) {
-  var _a;
-  var type = "docker" in context.build.config && context.build.config.docker && "type" in context.build.config.docker ? (_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.type : defaultType;
-  return (0, exports.getDockerBuildDefaultScript)(context, type ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[type] : null);
+var getEnsureDockerFileScript = function (context, fallbackType) {
+  var _a, _b, _c, _d, _e, _f;
+  if ("docker" in context.build.config && context.build.config.docker && "type" in context.build.config.docker) {
+    if (((_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.type) === "custom") {
+      if ((_b = context.build.config.docker) === null || _b === void 0 ? void 0 : _b.dockerfileContent) {
+        // we need to create a script that creates a Dockerfile in the current directory
+        return "\necho \"Creating Dockerfile\"\ncat >$APP_DIR/Dockerfile <<EOF\n".concat((_d = (_c = context.build.config.docker) === null || _c === void 0 ? void 0 : _c.dockerfileContent) === null || _d === void 0 ? void 0 : _d.join("\n"), "\nEOF");
+      }
+    }
+    var type = (_f = (_e = context.build.config.docker) === null || _e === void 0 ? void 0 : _e.type) !== null && _f !== void 0 ? _f : fallbackType;
+    return type ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[type] : null;
+  }
+  return fallbackType ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[fallbackType] : null;
+};
+var getDockerBuildScriptWithBuiltInDockerFile = function (context, fallbackType) {
+  return (0, exports.getDockerBuildDefaultScript)(context, getEnsureDockerFileScript(context, fallbackType));
 };
 exports.getDockerBuildScriptWithBuiltInDockerFile = getDockerBuildScriptWithBuiltInDockerFile;
 var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {

package/dist/build/node/cache.js

@@ -58,11 +58,12 @@ var getYarnCache = function (context, policy) {
 };
 exports.getYarnCache = getYarnCache;
 var getNodeModulesCache = function (context, policy) {
-  var _a;
+  var _a, _b;
   if (policy === void 0) {
     policy = "pull-push";
   }
   var componentIsInWorkspace = context.type === "component" && context.packageManagerInfo.componentIsInWorkspace;
+  var isClassic = context.packageManagerInfo.isClassic;
   // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
   // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
   return [{
@@ -72,9 +73,11 @@ var getNodeModulesCache = function (context, policy) {
     key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1.default)(context.build.dir) + "-node-modules",
     // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
     policy: policy,
-    paths: __spreadArray([], __read(componentIsInWorkspace ? (0, lodash_1.uniq)(__spreadArray(["node_modules"], __read((_a = context.packageManagerInfo.workspaces.map(function (w) {
+    paths: __spreadArray([], __read(componentIsInWorkspace ? (0, lodash_1.uniq)(__spreadArray(__spreadArray(["node_modules"], __read((_a = context.packageManagerInfo.workspaces.map(function (w) {
       return (0, path_1.join)(w.location, "node_modules");
-    })) !== null && _a !== void 0 ? _a : []), false)) : [(0, path_1.join)(context.build.dir, "node_modules")]), false)
+    })) !== null && _a !== void 0 ? _a : []), false), __read(!isClassic ? __spreadArray([".yarn/install-state.gz"], __read((_b = context.packageManagerInfo.workspaces.map(function (w) {
+      return (0, path_1.join)(w.location, ".yarn/install-state.gz");
+    })) !== null && _b !== void 0 ? _b : []), false) : []), false)) : __spreadArray([(0, path_1.join)(context.build.dir, "node_modules")], __read(!isClassic ? [(0, path_1.join)(context.build.dir, ".yarn/install-state.gz")] : []), false)), false)
   }];
 };
 exports.getNodeModulesCache = getNodeModulesCache;

package/dist/build/node/testJob.js

@@ -54,7 +54,7 @@ var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
 var createJobCache_1 = require("../cache/createJobCache");
 var createNodeTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {
@@ -69,7 +69,6 @@ var createNodeTestJobs = function (context) {
     variables: __assign({
       APP_PATH: context.build.dir
     }, context.type === "component" ? __assign({}, context.environment.jobOnlyVars.build.envVars) : {}),
-    runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
     stage: "test",
     needs: []
   };
@@ -78,26 +77,29 @@ var createNodeTestJobs = function (context) {
   var auditJob = buildConfig.audit !== false ? __assign(__assign(__assign({
     name: "🛡 audit"
   }, base), {
-    image: (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage,
+    runnerVariables: __assign(__assign({}, constants_1.NODE_RUNNER_BUILD_VARIABLES), (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.runnerVariables) !== null && _b !== void 0 ? _b : {}),
+    image: (_d = (_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.jobImage) !== null && _d !== void 0 ? _d : defaultImage,
     cache: undefined,
-    script: __spreadArray(["cd ".concat(context.build.dir)], __read((_d = (0, utils_1.ensureArrayOrNull)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : [context.packageManagerInfo.isClassic ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
+    script: __spreadArray(["cd ".concat(context.build.dir)], __read((_f = (0, utils_1.ensureArrayOrNull)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : [context.packageManagerInfo.isClassic ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
     ]), false),
     allow_failure: true
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifactsReports, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifactsReports, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifacts)) : null;
   var lintJob = buildConfig.lint !== false ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
-    image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : defaultImage,
+    runnerVariables: __assign(__assign({}, constants_1.NODE_RUNNER_BUILD_VARIABLES), (_k = (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.runnerVariables) !== null && _k !== void 0 ? _k : {}),
+    image: (_m = (_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : defaultImage,
     cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (0, cache_1.getNodeCache)(context)),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_k = (0, utils_1.ensureArrayOrNull)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)) !== null && _k !== void 0 ? _k : ["yarn lint"]), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.artifactsReports, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifacts)) : null;
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_p = (0, utils_1.ensureArrayOrNull)((_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.command)) !== null && _p !== void 0 ? _p : ["yarn lint"]), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_q = buildConfig.lint) === null || _q === void 0 ? void 0 : _q.artifactsReports, (_r = buildConfig.lint) === null || _r === void 0 ? void 0 : _r.artifacts)) : null;
   var testJob = buildConfig.test !== false ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
-    image: (_p = (_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.jobImage) !== null && _p !== void 0 ? _p : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
+    runnerVariables: __assign(__assign({}, constants_1.NODE_RUNNER_BUILD_VARIABLES), (_t = (_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.runnerVariables) !== null && _t !== void 0 ? _t : {}),
+    image: (_v = (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.jobImage) !== null && _v !== void 0 ? _v : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
     cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (0, cache_1.getNodeCache)(context)),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_r = (0, utils_1.ensureArrayOrNull)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : ["yarn test"]), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.artifactsReports, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifacts)) : null;
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_x = (0, utils_1.ensureArrayOrNull)((_w = buildConfig.test) === null || _w === void 0 ? void 0 : _w.command)) !== null && _x !== void 0 ? _x : ["yarn test"]), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_y = buildConfig.test) === null || _y === void 0 ? void 0 : _y.artifactsReports, (_z = buildConfig.test) === null || _z === void 0 ? void 0 : _z.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createNodeTestJobs = createNodeTestJobs;

package/dist/build/node/yarn.d.ts

@@ -1,7 +1,8 @@
 import { BashExpression } from "../../bash/BashExpression";
+import type { ComponentContextWithBuild } from "../../types";
 import { type Context } from "../../types";
 export declare const ensureNodeVersion: (context: Context) => string[];
 export declare const getYarnInstall: (context: Context, options?: {
   noCustomPostInstall: boolean;
 }) => string[];
-export declare const getDockerAppCopyAndBuildScript: (context: Context) => BashExpression;
+export declare const getDockerAppCopyAndBuildScript: (context: ComponentContextWithBuild) => BashExpression;

package/dist/build/node/yarn.js

@@ -39,13 +39,15 @@ var BashExpression_1 = require("../../bash/BashExpression");
 var utils_1 = require("../../utils");
 var gitlab_1 = require("../../utils/gitlab");
 var YARN_INSTALL_CLASSIC = "yarn install --frozen-lockfile";
+var YARN_BERRY_PROD_INSTALL = "yarn workspaces focus --production";
 // FIXME: check why and when rebuild is needed
-var YARN_BERRY_PROD_REBUILD = "yarn workspaces focus --production && yarn rebuild";
+var YARN_BERRY_PROD_REBUILD = "yarn rebuild";
 var getYarnInstallCommand = function (context) {
   if (context.packageManagerInfo.isClassic) {
     return YARN_INSTALL_CLASSIC;
   }
-  return "yarn install --immutable";
+  // inline builds make debugging easier as it prints it out in the logs, instead of writing it in temp files
+  return "yarn install --immutable --inline-builds";
 };
 var ensureNodeVersion = function (context) {
   return (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")(["if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi", "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi"]);
@@ -58,9 +60,12 @@ var getYarnInstall = function (context, options) {
 exports.getYarnInstall = getYarnInstall;
 var DOCKER_COPY_FILES = "COPY --chown=node:node $APP_DIR .";
 var getDockerAppCopyAndBuildScript = function (context) {
+  var _a, _b, _c;
   if (context.packageManagerInfo.isClassic) {
     return new BashExpression_1.BashExpression("\nRUN ".concat(YARN_INSTALL_CLASSIC, " --production --ignore-scripts\n").concat(DOCKER_COPY_FILES, "\nRUN ").concat(YARN_INSTALL_CLASSIC, " --production \n    ").trim());
   }
+  var yarnRebuildEnabledDefault = context.build.type === "fromWorkspace" ? (_b = (_a = context.build.workspaceBuildConfig.dockerDefaults) === null || _a === void 0 ? void 0 : _a.yarnRebuildEnabled) !== null && _b !== void 0 ? _b : true : true;
+  var yarnRebuildEnabled = "docker" in context.build.config && context.build.config.docker && "yarnRebuildEnabled" in context.build.config.docker ? (_c = context.build.config.docker.yarnRebuildEnabled) !== null && _c !== void 0 ? _c : yarnRebuildEnabledDefault : yarnRebuildEnabledDefault;
   // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
   // trying to import those fail on this version
   var doesNotShipWithBuiltInPlugins = ["2", "3"].some(function (v) {
@@ -69,6 +74,6 @@ var getDockerAppCopyAndBuildScript = function (context) {
   var maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins ? "RUN yarn plugin import workspace-tools" : "";
   // copy first everything and then install
   // rebuild first does not work as it will run postinstall and that might require files in the app
-  return new BashExpression_1.BashExpression("\n".concat(DOCKER_COPY_FILES, "\n").concat(maybeAddWorkspaceToolsCommand, "\nRUN ").concat(YARN_BERRY_PROD_REBUILD, "\n\n    ").trim());
+  return new BashExpression_1.BashExpression("\n    ENV YARN_ENABLE_INLINE_BUILDS=1\n".concat(DOCKER_COPY_FILES, "\n").concat(maybeAddWorkspaceToolsCommand, "\nRUN ").concat(YARN_BERRY_PROD_INSTALL, "\n").concat(yarnRebuildEnabled ? "RUN ".concat(YARN_BERRY_PROD_REBUILD) : "", "\n\n    ").trim());
 };
 exports.getDockerAppCopyAndBuildScript = getDockerAppCopyAndBuildScript;

package/dist/build/rails/index.js

@@ -36,8 +36,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createRailsJobs = void 0;
 var build_1 = require("./build");
-var test_1 = require("./test");
+var testJob_1 = require("./testJob");
 var createRailsJobs = function (context) {
-  return __spreadArray(__spreadArray([], __read((0, test_1.createRailsTestJobs)(context)), false), __read((0, build_1.createRailsBuildJobs)(context)), false);
+  return __spreadArray(__spreadArray([], __read((0, testJob_1.createRailsTestJobs)(context)), false), __read((0, build_1.createRailsBuildJobs)(context)), false);
 };
 exports.createRailsJobs = createRailsJobs;

package/dist/build/types.d.ts

@@ -62,6 +62,10 @@ export type TestJobCustom = {
    * {@link TestJobCustom.artifacts}.reports.junit is merged with {@link TestJobCustom.artifactsReports} in case both given.
    */
   artifacts?: Artifacts;
+  /**
+   * additional vars for this job runner
+   */
+  runnerVariables?: Record<string, string>;
 };
 export type BuildConfigBase = {
   /**
@@ -168,6 +172,12 @@ type BuildConfigDockerWithAdditions = {
 };
 type BuildConfigDockerBuiltInNode = {
   type: "node";
+  /**
+   * whether to run yarn rebuild after yarn install. Defaults to true.
+   *
+   * Future versions of catladder will default to false.
+   */
+  yarnRebuildEnabled?: boolean;
 } & BuildConfigDockerWithAdditions;
 type BuildConfigDockerBuiltInMeteor = {
   type: "meteor";
@@ -190,6 +200,15 @@ type BuildConfigDockerCustom = {
    * Depending on your Dockerfile you may want to change it to "component"
    */
   buildContextLocation?: "root" | "component";
+  /**
+   * EXPERIMENTAL: custom docker file content
+   *
+   * you can use some predefined variables:
+   * - $DOCKER_COPY_WORKSPACE_FILES
+   * - $DOCKER_COPY_AND_INSTALL_APP
+   * - and all default variables
+   */
+  dockerfileContent?: string[];
 };
 export type BuildConfigDocker = BuildConfigDockerBuiltIn | BuildConfigDockerCustom;
 export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit"> & {
@@ -212,16 +231,6 @@ export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit">
    * custom audit, disabled when not set
    */
   audit?: TestJobCustom;
-  /**
-   * custom sbom (software bill of materials), set false to disable
-   */
-  sbom?: false | {
-    /**
-     * needs to create a file at `/__sbom.json` in CycloneDX format
-     */
-    command: string | string[];
-    jobImage: GitlabJobImage;
-  };
 };
 export type BuildConfigRails = BuildConfigBase & {
   type: "rails";
@@ -323,7 +332,7 @@ export type WorkspaceBuildConfigBase = {
    */
   audit?: false | TestJobCustom;
   /**
-   * additional vars only for the runner.
+   * additional vars only for the build job.
    * Also if you use services: that require env vars, you need to set them here.
    *
    */
@@ -342,6 +351,11 @@ export type WorkspaceBuildConfigBase = {
 export type WorkspaceBuildConfigNode = {
   type: "node";
   buildCommand?: string | string[];
+  /**
+   * set docker config defaults for the node build type.
+   * Currently not all options are supported.
+   */
+  dockerDefaults?: Pick<BuildConfigDockerBuiltInNode, "yarnRebuildEnabled">;
 } & WorkspaceBuildConfigBase;
 export type WorkspaceBuildConfig = WorkspaceBuildConfigNode;
 export {};

package/dist/config/readConfig.js

@@ -151,13 +151,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.readConfig = void 0;
 var fs_1 = require("fs");
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 var tsx = require("tsx/cjs/api");
 var yaml_1 = require("yaml");
 // allows us to load ts files
 var fullPath = function (directory, ext) {
   return directory + "/catladder." + ext;
 };
-var readConfig = function () {
+var readConfigInternal = function () {
   var args_1 = [];
   for (var _i = 0; _i < arguments.length; _i++) {
     args_1[_i] = arguments[_i];
@@ -199,4 +200,32 @@ var readConfig = function () {
     });
   });
 };
+var readConfig = function () {
+  var args_1 = [];
+  for (var _i = 0; _i < arguments.length; _i++) {
+    args_1[_i] = arguments[_i];
+  }
+  return __awaiter(void 0, __spreadArray([], __read(args_1), false), void 0, function (directory) {
+    var error_1;
+    if (directory === void 0) {
+      directory = process.cwd();
+    }
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          _a.trys.push([0, 2,, 3]);
+          return [4 /*yield*/, readConfigInternal(directory)];
+        case 1:
+          return [2 /*return*/, _a.sent()];
+        case 2:
+          error_1 = _a.sent();
+          console.error("Error reading config in ".concat(directory, ":"), error_1);
+          console.error("\nThis may happen due to various reasons:\n  - Syntax errors in your catladder.ts file\n  - tsx (the TypeScript loader used by catladder) needs to understand the syntax in your project.\n    If your project uses newer TypeScript/JavaScript syntax, you may need to update catladder\n    to get a newer version of tsx that supports it.\n  - Missing or incorrect dependencies in your project\n  - TypeScript configuration issues in your tsconfig.json\n");
+          return [2 /*return*/, null];
+        case 3:
+          return [2 /*return*/];
+      }
+    });
+  });
+};
 exports.readConfig = readConfig;

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "remove-env-mode-none-9b62fbb1" || "latest";
+exports.PIPELINE_IMAGE_TAG = "remove-sbom-91cda0a4" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/context/getEnvironmentVariables.d.ts

@@ -13,10 +13,10 @@ declare const getBasePredefinedVariables: (ctx: EnvironmentContext) => {
 };
 type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
 export type PredefinedVariables = BasePredefinedVariables & {
-  HOSTNAME: StringOrBashExpression;
-  ROOT_URL: StringOrBashExpression;
-  HOSTNAME_INTERNAL: StringOrBashExpression;
-  ROOT_URL_INTERNAL: StringOrBashExpression;
+  HOSTNAME?: StringOrBashExpression;
+  ROOT_URL?: StringOrBashExpression;
+  HOSTNAME_INTERNAL?: StringOrBashExpression;
+  ROOT_URL_INTERNAL?: StringOrBashExpression;
 };
 export declare const getEnvironmentVariables: (ctx: CreateComponentContextContext, options?: {
   shouldResolveReferences?: boolean;

package/dist/context/getEnvironmentVariables.js

@@ -197,17 +197,22 @@ var getEnvironmentVariables = function (ctx_1) {
           basePredefinedVariables = getBasePredefinedVariables(environmentContext);
           if (envType === "local") {
             devLocalConfig = envConfigRaw;
-            port = (_d = devLocalConfig.port) !== null && _d !== void 0 ? _d : 3000;
-            host = "localhost:" + port.toString();
-            url = "http://" + host;
-            predefinedVariables = __assign(__assign({}, basePredefinedVariables), {
-              ENV_SHORT: "local",
-              ROOT_URL: url,
-              HOSTNAME: host,
-              HOSTNAME_INTERNAL: host,
-              ROOT_URL_INTERNAL: "http://" + host,
+            port = devLocalConfig.port !== false ? (_d = devLocalConfig.port) !== null && _d !== void 0 ? _d : 3000 : null;
+            host = port ? "localhost:" + port.toString() : null;
+            url = host ? "http://" + host : null;
+            predefinedVariables = __assign(__assign(__assign(__assign(__assign(__assign(__assign({}, basePredefinedVariables), {
+              ENV_SHORT: "local"
+            }), url ? {
+              ROOT_URL: url
+            } : {}), host ? {
+              HOSTNAME: host
+            } : {}), host ? {
+              HOSTNAME_INTERNAL: host
+            } : {}), host ? {
+              ROOT_URL_INTERNAL: "http://" + host
+            } : {}), port ? {
               PORT: port.toString()
-            });
+            } : {});
           } else {
             additionalEnvVars = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(environmentContext) : {};
             HOSTNAME_INTERNAL = (_e = additionalEnvVars.HOSTNAME_INTERNAL) !== null && _e !== void 0 ? _e : "unknown-host.example.com";

package/dist/defaults/index.js

@@ -5,6 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BASE_RETRY = void 0;
 exports.BASE_RETRY = {
-  max: 2,
-  when: ["runner_system_failure", "stuck_or_timeout_failure"]
+  max: 2
 };

package/dist/deploy/base/deploy.js

@@ -47,9 +47,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
 var createJobCache_1 = require("../../build/cache/createJobCache");
 var docker_1 = require("../../build/docker");
-var sbom_1 = require("../../build/sbom");
 var context_1 = require("../../types/context");
-var sbom_2 = require("../sbom");
 var utils_1 = require("../utils");
 var stop_1 = require("./stop");
 var variables_1 = require("./variables");
@@ -76,18 +74,16 @@ var createDeployJob = function (context, jobDefinition) {
     services: jobDefinition.services,
     envMode: "stagePerEnv",
     // makes it easier to run manual tasks er env
-    needs: __spreadArray(__spreadArray([], __read((0, sbom_2.sbomDeactivated)(context) ? [] : [{
-      job: sbom_1.SBOM_BUILD_JOB_NAME,
-      artifacts: true
-    }]), false), __read(deployConfig ? (_d = (_c = deployConfig.waitFor) === null || _c === void 0 ? void 0 : _c.map(function (c) {
+    needs: __spreadArray([], __read(deployConfig ? (_d = (_c = deployConfig.waitFor) === null || _c === void 0 ? void 0 : _c.map(function (c) {
       return {
         componentName: c,
         job: exports.DEPLOY_JOB_NAME,
         artifacts: false
       };
     })) !== null && _d !== void 0 ? _d : [] : []), false),
-    // we don't want to deploy when there is a broken test
-    needsStages: __spreadArray(__spreadArray([], __read((0, context_1.componentContextHasWorkspaceBuild)(context) ? hasDocker // docker build is per component,
+    needsStages:
+    // if the build is disabled, we don't need to wait for it
+    context.build.type !== "disabled" ? __spreadArray(__spreadArray([], __read((0, context_1.componentContextHasWorkspaceBuild)(context) ? hasDocker // docker build is per component,
     ? [
     // we don't need artifacts, but have to wait for the component build
     {
@@ -101,12 +97,14 @@ var createDeployJob = function (context, jobDefinition) {
     }] : [{
       stage: "build",
       artifacts: hasDocker ? false : true // we asume that no-docker deployments need build artifacts,
-    }]), false), [{
+    }]), false), [
+    // we don't want to deploy when there is a broken test
+    {
       stage: "test",
       artifacts: false,
       // use test from workspace build
       workspaceName: (0, context_1.componentContextHasWorkspaceBuild)(context) ? context.build.workspaceName : undefined
-    }], false),
+    }], false) : [],
     when: whenDeploy === "auto" ? "on_success" : "manual",
     allow_failure: whenDeploy === "manual" ? true : false,
     stage: "deploy",

package/dist/deploy/base/stop.js

@@ -27,11 +27,6 @@ var createStopJob = function (context, jobDefinition) {
     allow_failure: true,
     when: "manual",
     // stop is always manual
-    rules: [{
-      if: "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/",
-      // automatic on hotfix branches
-      when: "on_success"
-    }],
     variables: __assign(__assign({}, context.environment.jobOnlyVars.deploy.envVars), jobDefinition.variables),
     runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), {
       GIT_STRATEGY: "none"

package/dist/deploy/cloudRun/createJobs/cloudRunServices.js

@@ -84,6 +84,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
     "use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
     "allow-unauthenticated": (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _e !== void 0 ? _e : true,
     ingress: (_f = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _f !== void 0 ? _f : "all",
+    "session-affinity": customConfig === null || customConfig === void 0 ? void 0 : customConfig.sessionAffinity,
     "cpu-boost": true,
     "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment,
     gpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpu,