@catladder/cli 0.0.0-main-d05b00fd → 0.0.0-main-9e468869

package/dist/bundles/cli/index.js

@@ -4225,19 +4225,20 @@ const lodash_1 = __nccwpck_require__(23255);
 const __1 = __nccwpck_require__(10603);
 const utils_1 = __nccwpck_require__(32497);
 const createBuildJobArtifact_1 = __nccwpck_require__(43397);
+const createJobCache_1 = __nccwpck_require__(10340);
 const yarn_1 = __nccwpck_require__(45043);
 const constants_1 = __nccwpck_require__(82786);
 const writeBuildInfo_1 = __nccwpck_require__(99578);
 const writeDotEnv_1 = __nccwpck_require__(48052);
-const createAppBuildJob = (context, { script, variables, runnerVariables, ...def }) => {
-    var _a, _b, _c;
+const createAppBuildJob = (context, { script, variables, runnerVariables, cache, ...def }) => {
+    var _a, _b;
     return (0, lodash_1.merge)({
         name: constants_1.APP_BUILD_JOB_NAME,
         envMode: "jobPerEnv",
         stage: "build",
         image: (0, __1.getRunnerImage)("jobs-default"),
         needs: [],
-        cache: [],
+        cache: cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, cache) : undefined,
         variables: {
             ...(variables !== null && variables !== void 0 ? variables : {}),
             ...(context.type === "component"
@@ -4266,7 +4267,7 @@ const createAppBuildJob = (context, { script, variables, runnerVariables, ...def
             ...(context.type === "component" ? (0, writeBuildInfo_1.writeBuildInfo)(context) : []),
             ...(0, yarn_1.ensureNodeVersion)(context), // in pure node repos, we might want to have the nvmrc file in top-level
             `cd ${context.build.dir}`,
-            ...((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []),
+            ...(0, utils_1.ensureArray)(script),
         ],
         artifacts: (0, createBuildJobArtifact_1.createBuildJobArtifacts)(context),
     }, def);
@@ -4313,6 +4314,43 @@ exports.createArtifactsConfig = createArtifactsConfig;
 
 /***/ }),
 
+/***/ 56354:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.createBuildJobDefinition = void 0;
+const runner_1 = __nccwpck_require__(4058);
+const utils_1 = __nccwpck_require__(32497);
+const getAllCacheConfigsFromConfig_1 = __nccwpck_require__(30673);
+const constants_1 = __nccwpck_require__(31765);
+const createBuildJobDefinition = (context, buildConfig, customize = {}) => {
+    var _a, _b, _c, _d;
+    if (buildConfig.buildCommand === null)
+        return undefined;
+    const defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
+    return {
+        image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
+        runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
+        cache: [
+            ...((_b = customize.cache) !== null && _b !== void 0 ? _b : []),
+            ...(0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig),
+        ],
+        services: "jobServices" in buildConfig ? buildConfig.jobServices : undefined,
+        script: [
+            ...((_c = customize.prescript) !== null && _c !== void 0 ? _c : []),
+            ...(0, utils_1.ensureArray)(buildConfig.buildCommand),
+            ...((_d = customize.postscript) !== null && _d !== void 0 ? _d : []),
+        ],
+        jobTags: buildConfig.jobTags,
+    };
+};
+exports.createBuildJobDefinition = createBuildJobDefinition;
+//# sourceMappingURL=createBuildJobDefinition.js.map
+
+/***/ }),
+
 /***/ 9366:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -4426,6 +4464,129 @@ exports.componentContextNeedsBuildTimeDotEnv = componentContextNeedsBuildTimeDot
 
 /***/ }),
 
+/***/ 10340:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.createJobCacheFromConfig = exports.createJobCacheFromCacheConfigs = void 0;
+const path_1 = __nccwpck_require__(71017);
+const getAllCacheConfigsFromConfig_1 = __nccwpck_require__(30673);
+const createJobCacheFromCacheConfigs = (context, caches) => {
+    if (caches.length === 0)
+        return undefined;
+    const simpleCacheDefs = caches.filter((c) => !("key" in c));
+    const advancedCacheDefs = caches.filter((c) => "key" in c);
+    // simple caches are merged together into one. This is because e.g. gitlab has a limit of 4 caches, see https://gitlab.com/gitlab-org/gitlab/-/issues/421962
+    const simpleCaches = simpleCacheDefs.length > 0
+        ? [
+            {
+                key: context.name + "-default",
+                policy: "pull-push",
+                paths: simpleCacheDefs.flatMap((c) => c.paths.map((p) => {
+                    var _a;
+                    const baseDir = c.pathMode === "absolute"
+                        ? ""
+                        : (_a = c.baseDir) !== null && _a !== void 0 ? _a : context.build.dir;
+                    return (0, path_1.join)(baseDir, p);
+                })),
+            },
+        ]
+        : [];
+    const advancedCaches = advancedCacheDefs.map(({ key, paths, policy, scope, pathMode, buildDir, ...rest }) => {
+        var _a;
+        const baseDir = pathMode === "absolute" ? "" : buildDir !== null && buildDir !== void 0 ? buildDir : context.build.dir;
+        const transformedKey = scope === "global"
+            ? key
+            : typeof key === "string"
+                ? (scope === "buildDir" // really edge case...
+                    ? baseDir
+                    : context.name) +
+                    "-" +
+                    key
+                : {
+                    ...key,
+                    files: (_a = key.files) === null || _a === void 0 ? void 0 : _a.map((f) => pathMode === "absolute" ? f : (0, path_1.join)(baseDir, f)),
+                };
+        return {
+            key: transformedKey,
+            policy: policy !== null && policy !== void 0 ? policy : "pull-push",
+            paths: pathMode === "absolute" ? paths : paths === null || paths === void 0 ? void 0 : paths.map((p) => (0, path_1.join)(baseDir, p)),
+            ...rest,
+        };
+    });
+    return [...advancedCaches, ...simpleCaches];
+};
+exports.createJobCacheFromCacheConfigs = createJobCacheFromCacheConfigs;
+/** shortcut, used in some build types */
+const createJobCacheFromConfig = (context, buildConfig) => {
+    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig));
+};
+exports.createJobCacheFromConfig = createJobCacheFromConfig;
+//# sourceMappingURL=createJobCache.js.map
+
+/***/ }),
+
+/***/ 30673:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getAllCacheConfigsFromConfig = void 0;
+const index_1 = __nccwpck_require__(32497);
+const transformLegacyJobCache_1 = __nccwpck_require__(96673);
+const getAllCacheConfigsFromConfig = (context, buildConfig) => {
+    return [
+        ...("jobCache" in buildConfig
+            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(buildConfig.jobCache)
+            : []),
+        ...(0, index_1.ensureArray)(buildConfig.cache).map((c) => ({
+            ...c,
+            context,
+        })),
+        ...(context.type === "workspace"
+            ? // also add cache configs of the components of that workspace
+                context.components.flatMap((componentContext) => {
+                    var _a;
+                    return (_a = (0, index_1.ensureArray)(componentContext.build.config.cache).map((c) => ({
+                        ...c,
+                        baseDir: componentContext.build.dir,
+                    }))) !== null && _a !== void 0 ? _a : [];
+                })
+            : []),
+    ];
+};
+exports.getAllCacheConfigsFromConfig = getAllCacheConfigsFromConfig;
+//# sourceMappingURL=getAllCacheConfigsFromConfig.js.map
+
+/***/ }),
+
+/***/ 96673:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.transformLegacyJobCache = void 0;
+const utils_1 = __nccwpck_require__(32497);
+function transformLegacyJobCache(jobCache) {
+    return (0, utils_1.ensureArray)(jobCache).map((cache) => {
+        var _a, _b;
+        return ({
+            pathMode: "absolute",
+            ...cache,
+            key: (_a = cache.key) !== null && _a !== void 0 ? _a : "default",
+            paths: (_b = cache.paths) !== null && _b !== void 0 ? _b : [],
+        });
+    });
+}
+exports.transformLegacyJobCache = transformLegacyJobCache;
+//# sourceMappingURL=transformLegacyJobCache.js.map
+
+/***/ }),
+
 /***/ 31637:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -4433,30 +4594,18 @@ exports.componentContextNeedsBuildTimeDotEnv = componentContextNeedsBuildTimeDot
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createCustomBuildJobs = void 0;
-const utils_1 = __nccwpck_require__(32497);
 const docker_1 = __nccwpck_require__(9641);
 const types_1 = __nccwpck_require__(84466);
 const base_1 = __nccwpck_require__(9366);
-const RUNNER_BUILD_VARIABLES = {
-    KUBERNETES_CPU_REQUEST: "0.45",
-    KUBERNETES_MEMORY_REQUEST: "1Gi",
-    KUBERNETES_MEMORY_LIMIT: "4Gi",
-};
+const createBuildJobDefinition_1 = __nccwpck_require__(56354);
 const createCustomBuildJobs = (context) => {
-    var _a;
     const buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
         throw new Error("deploy config is not custom");
     }
     return (0, base_1.createComponentBuildJobs)(context, {
         appBuild: buildConfig.buildCommand !== null
-            ? {
-                image: buildConfig.jobImage,
-                runnerVariables: RUNNER_BUILD_VARIABLES,
-                cache: buildConfig.jobCache,
-                services: buildConfig.jobServices,
-                script: [...((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : [])],
-            }
+            ? (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig)
             : undefined,
         dockerBuild: {
             script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context),
@@ -4494,15 +4643,16 @@ exports.createCustomJobs = createCustomJobs;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createCustomTestJobs = void 0;
 const utils_1 = __nccwpck_require__(32497);
-const types_1 = __nccwpck_require__(84466);
 const createArtifactsConfig_1 = __nccwpck_require__(12820);
+const createJobCache_1 = __nccwpck_require__(10340);
+const types_1 = __nccwpck_require__(84466);
 const RUNNER_CUSTOM_TEST_VARIABLES = {
     KUBERNETES_CPU_REQUEST: "0.45",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
     KUBERNETES_MEMORY_LIMIT: "4Gi",
 };
 const createCustomTestJobs = (context) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     // don't run tests after release
     // TODO: this will be replaced by using rules
     if (context.trigger === "taggedRelease") {
@@ -4520,7 +4670,7 @@ const createCustomTestJobs = (context) => {
         },
         runnerVariables: RUNNER_CUSTOM_TEST_VARIABLES,
         services: buildConfig.jobServices,
-        cache: buildConfig.jobCache,
+        cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
         stage: "test",
         needs: [],
         envMode: "none",
@@ -4531,27 +4681,27 @@ const createCustomTestJobs = (context) => {
             ...base,
             image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage,
             cache: undefined,
-            script: [...((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [])],
+            script: [...(0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)],
             allow_failure: true,
-            ...(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),
+            ...(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;
     const lintJob = buildConfig.lint
         ? {
             name: "👮 lint",
             ...base,
-            image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : buildConfig.jobImage,
-            script: [...((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [])],
-            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifacts),
+            image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage,
+            script: [...(0, utils_1.ensureArray)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)],
+            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.artifactsReports, (_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.artifacts),
         }
         : null;
     const testJob = buildConfig.test
         ? {
             name: "🧪 test",
             ...base,
-            image: (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : buildConfig.jobImage,
-            script: [...((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : [])],
-            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts),
+            image: (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage,
+            script: [...(0, utils_1.ensureArray)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)],
+            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.artifactsReports, (_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.artifacts),
         }
         : null;
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
@@ -4579,6 +4729,7 @@ const artifactsRegistry_1 = __nccwpck_require__(44963);
 const gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(46320);
 const runner_1 = __nccwpck_require__(4058);
 const gitlab_1 = __nccwpck_require__(38490);
+const createJobCache_1 = __nccwpck_require__(10340);
 const DOCKER_BUILD_RUNNER_REQUESTS = {
     KUBERNETES_CPU_REQUEST: "0.45",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
@@ -4668,11 +4819,12 @@ const getDockerJobBaseProps = () => {
     };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
-const createDockerBuildJobBase = (context, { script, ...def }) => {
+const createDockerBuildJobBase = (context, { script, cache, ...def }) => {
     return (0, lodash_1.merge)({
         name: exports.DOCKER_BUILD_JOB_NAME,
         envMode: "jobPerEnv",
         stage: "build",
+        cache: cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, cache) : undefined,
         ...(0, exports.getDockerJobBaseProps)(),
         script: script || [],
     }, {
@@ -4826,14 +4978,11 @@ exports.WORKSPACE_BUILD_TYPES = {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createNodeDockerJobDefinition = exports.createNodeBuildJobDefinition = exports.createNodeBuildJobs = void 0;
-const runner_1 = __nccwpck_require__(4058);
 const context_1 = __nccwpck_require__(61724);
-const utils_1 = __nccwpck_require__(32497);
 const base_1 = __nccwpck_require__(9366);
+const createBuildJobDefinition_1 = __nccwpck_require__(56354);
 const docker_1 = __nccwpck_require__(9641);
-const types_1 = __nccwpck_require__(84466);
 const cache_1 = __nccwpck_require__(72026);
-const constants_1 = __nccwpck_require__(31765);
 const yarn_1 = __nccwpck_require__(45043);
 const createNodeBuildJobs = (context) => {
     if (context.type === "workspace") {
@@ -4850,26 +4999,12 @@ const createNodeBuildJobs = (context) => {
 };
 exports.createNodeBuildJobs = createNodeBuildJobs;
 const createNodeBuildJobDefinition = (context) => {
-    var _a, _b, _c;
     const buildConfig = context.build.config;
-    if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
-        throw new Error("deploy config is not node, node-static or storybook");
-    }
-    if (buildConfig.buildCommand === null)
-        return undefined;
-    const defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
     const yarnInstall = (0, yarn_1.getYarnInstall)(context);
-    return {
-        image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
-        runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
-        cache: [
-            ...((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []),
-            ...(0, cache_1.getNodeCache)(context),
-            ...(0, cache_1.getNextCache)(context),
-        ],
-        script: [...yarnInstall, ...((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : [])],
-        jobTags: buildConfig.jobTags,
-    };
+    return (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig, {
+        prescript: yarnInstall,
+        cache: [...(0, cache_1.getNodeCache)(context), ...(0, cache_1.getNextCache)(context)],
+    });
 };
 exports.createNodeBuildJobDefinition = createNodeBuildJobDefinition;
 const createNodeDockerJobDefinition = (context) => {
@@ -4911,17 +5046,12 @@ const getYarnCache = (context, policy = "pull-push") => {
     const componentIsInWorkspace = context.type === "component" &&
         context.packageManagerInfo.componentIsInWorkspace;
     return [
-        componentIsInWorkspace
-            ? {
-                key: "yarn",
-                policy,
-                paths: [".yarn"],
-            }
-            : {
-                key: (0, slugify_1.default)(context.build.dir) + "-yarn",
-                policy,
-                paths: [(0, path_1.join)(context.build.dir, ".yarn")],
-            },
+        {
+            scope: componentIsInWorkspace ? "global" : "buildDir",
+            key: "yarn",
+            policy,
+            paths: [".yarn"],
+        },
     ];
 };
 exports.getYarnCache = getYarnCache;
@@ -4933,6 +5063,8 @@ const getNodeModulesCache = (context, policy = "pull-push") => {
     // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
     return [
         {
+            scope: "global",
+            pathMode: "absolute",
             // if component is in a shared workspace, use workspace cache. use individual cache else
             key: componentIsInWorkspace
                 ? "node-modules-workspace"
@@ -4959,13 +5091,13 @@ const getNodeCache = (context, policy = "pull-push") => {
 };
 exports.getNodeCache = getNodeCache;
 const getNextCache = (context) => {
-    const key = context.name + "-next-cache";
     const paths = context.build
         .getComponentDirs("direct")
         .map((c) => (0, path_1.join)(c, ".next/cache"));
     return [
         {
-            key,
+            pathMode: "absolute",
+            key: "next-cache",
             policy: "pull-push",
             paths,
         },
@@ -4976,9 +5108,9 @@ const getWorkspaceDefaultCaches = (context) => {
     return [
         {
             // turbo repo
-            key: context.name + "-turbo",
+            key: "turbo",
             policy: "pull-push",
-            paths: [(0, path_1.join)(context.build.dir, ".turbo")],
+            paths: [".turbo"],
         },
     ];
 };
@@ -5036,7 +5168,6 @@ exports.createMeteorJobs = createMeteorJobs;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createMeteorBuildJobs = void 0;
-const path_1 = __nccwpck_require__(71017);
 const runner_1 = __nccwpck_require__(4058);
 const base_1 = __nccwpck_require__(9366);
 const docker_1 = __nccwpck_require__(9641);
@@ -5045,13 +5176,13 @@ const cache_1 = __nccwpck_require__(72026);
 const yarn_1 = __nccwpck_require__(45043);
 const getMeteorCache = (context) => [
     {
-        key: context.name + "-meteor-build-cache",
+        key: "meteor-build-cache",
         policy: "pull-push",
         paths: [
-            (0, path_1.join)(context.build.dir, ".meteor/local/resolver-result-cache.json"),
-            (0, path_1.join)(context.build.dir, ".meteor/local/plugin-cache"),
-            (0, path_1.join)(context.build.dir, ".meteor/local/isopacks"),
-            (0, path_1.join)(context.build.dir, ".meteor/local/bundler-cache/scanner"),
+            ".meteor/local/resolver-result-cache.json",
+            ".meteor/local/plugin-cache",
+            ".meteor/local/isopacks",
+            ".meteor/local/bundler-cache/scanner",
         ],
     },
 ];
@@ -5106,6 +5237,7 @@ const createArtifactsConfig_1 = __nccwpck_require__(12820);
 const cache_1 = __nccwpck_require__(72026);
 const constants_1 = __nccwpck_require__(31765);
 const yarn_1 = __nccwpck_require__(45043);
+const createJobCache_1 = __nccwpck_require__(10340);
 const createNodeTestJobs = (context) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     // don't run tests after release
@@ -5144,7 +5276,7 @@ const createNodeTestJobs = (context) => {
             cache: undefined, // audit does not need yarn install and no cache
             script: [
                 `cd ${context.build.dir}`,
-                ...((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [
+                ...((_e = (0, utils_1.ensureArrayOrNull)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [
                     context.packageManagerInfo.isClassic
                         ? "yarn audit"
                         : "yarn npm audit --environment production", // yarn 2
@@ -5159,12 +5291,12 @@ const createNodeTestJobs = (context) => {
             name: "👮 lint",
             ...base,
             image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : defaultImage,
-            cache: (0, cache_1.getNodeCache)(context),
+            cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (0, cache_1.getNodeCache)(context)),
             script: [
                 ...(0, yarn_1.ensureNodeVersion)(context),
                 `cd ${context.build.dir}`,
                 ...yarnInstall,
-                ...((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["yarn lint"]),
+                ...((_l = (0, utils_1.ensureArrayOrNull)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["yarn lint"]),
             ],
             ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifacts),
         }
@@ -5174,12 +5306,12 @@ const createNodeTestJobs = (context) => {
             name: "🧪 test",
             ...base,
             image: (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
-            cache: (0, cache_1.getNodeCache)(context),
+            cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (0, cache_1.getNodeCache)(context)),
             script: [
                 ...(0, yarn_1.ensureNodeVersion)(context),
                 `cd ${context.build.dir}`,
                 ...yarnInstall,
-                ...((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : ["yarn test"]),
+                ...((_s = (0, utils_1.ensureArrayOrNull)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : ["yarn test"]),
             ],
             ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts),
         }
@@ -5216,7 +5348,6 @@ const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodein
 ]);
 exports.ensureNodeVersion = ensureNodeVersion;
 const getYarnInstall = (context, options) => {
-    var _a;
     const postInstall = context.type !== "workspace" && "postInstall" in context.build.config
         ? context.build.config.postInstall
         : null;
@@ -5224,7 +5355,7 @@ const getYarnInstall = (context, options) => {
         ...(0, exports.ensureNodeVersion)(context),
         ...(0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)]),
         ...(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall)
-            ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((_a = (0, utils_1.ensureArray)(postInstall)) !== null && _a !== void 0 ? _a : [])
+            ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((0, utils_1.ensureArray)(postInstall))
             : []),
     ];
 };
@@ -5387,7 +5518,7 @@ const createRailsTestJobs = (context) => {
             image: (_d = (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage) !== null && _d !== void 0 ? _d : defaultImage,
             script: [
                 `cd ${context.build.dir}`,
-                ...((_f = (0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : [
+                ...((_f = (0, utils_1.ensureArrayOrNull)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : [
                     "gem install bundler-audit",
                     "bundle audit check",
                 ]),
@@ -5404,7 +5535,7 @@ const createRailsTestJobs = (context) => {
             script: [
                 `cd ${context.build.dir}`,
                 ...bundlerInstall,
-                ...((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [
+                ...((_l = (0, utils_1.ensureArrayOrNull)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [
                     "bundle exec rubocop",
                 ]),
             ],
@@ -5419,7 +5550,7 @@ const createRailsTestJobs = (context) => {
             script: [
                 `cd ${context.build.dir}`,
                 ...bundlerInstall,
-                ...((_r = (0, utils_1.ensureArray)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : [
+                ...((_r = (0, utils_1.ensureArrayOrNull)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : [
                     "bundle exec rspec",
                 ]),
             ],
@@ -5460,7 +5591,7 @@ const createSbomBuildJob = (context) => {
     const script = (0, _1.isStandaloneBuildConfig)(buildConfig) &&
         buildConfig.type === "custom" &&
         buildConfig.sbom !== false
-        ? (_d = (0, utils_1.ensureArray)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : defaultScript
+        ? (_d = (0, utils_1.ensureArrayOrNull)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : defaultScript
         : defaultScript;
     return {
         name: exports.SBOM_BUILD_JOB_NAME,
@@ -9473,11 +9604,22 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__nccwpck_require__(47770), exports);
 __exportStar(__nccwpck_require__(30688), exports);
 __exportStar(__nccwpck_require__(61724), exports);
+__exportStar(__nccwpck_require__(28207), exports);
 __exportStar(__nccwpck_require__(32074), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
 
+/***/ 28207:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=jobDefinition.js.map
+
+/***/ }),
+
 /***/ 17432:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -9551,13 +9693,15 @@ exports.collapseableSection = collapseableSection;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.mergeWithMergingArrays = exports.ensureArray = exports.notNil = void 0;
+exports.mergeWithMergingArrays = exports.ensureArray = exports.ensureArrayOrNull = exports.notNil = void 0;
 const lodash_1 = __nccwpck_require__(23255);
 function notNil(value) {
     return value !== null && value !== undefined;
 }
 exports.notNil = notNil;
-const ensureArray = (s) => (0, lodash_1.isNil)(s) ? null : Array.isArray(s) ? s : [s];
+const ensureArrayOrNull = (s) => (0, lodash_1.isNil)(s) ? null : Array.isArray(s) ? s : [s];
+exports.ensureArrayOrNull = ensureArrayOrNull;
+const ensureArray = (s) => { var _a; return (_a = (0, exports.ensureArrayOrNull)(s)) !== null && _a !== void 0 ? _a : []; };
 exports.ensureArray = ensureArray;
 // see https://github.com/lodash/lodash/issues/5384
 const mergeWithMergingArrays = (obj1, obj2) => {

package/dist/pipeline/src/build/base/createAppBuildJob.d.ts

@@ -1,4 +1,5 @@
 import type { BuildContextStandalone, ComponentContext, WorkspaceContext } from "../..";
+import type { JobDefintion } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-export type AppBuildJobDefinition = Partial<Omit<CatladderJob, "artifacts">>;
-export declare const createAppBuildJob: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext, { script, variables, runnerVariables, ...def }: AppBuildJobDefinition) => CatladderJob;
+export type AppBuildJobDefinition = JobDefintion;
+export declare const createAppBuildJob: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext, { script, variables, runnerVariables, cache, ...def }: AppBuildJobDefinition) => CatladderJob;

package/dist/pipeline/src/build/base/createAppBuildJob.js

@@ -5,19 +5,20 @@ const lodash_1 = require("lodash");
 const __1 = require("../..");
 const utils_1 = require("../../utils");
 const createBuildJobArtifact_1 = require("../artifacts/createBuildJobArtifact");
+const createJobCache_1 = require("../cache/createJobCache");
 const yarn_1 = require("../node/yarn");
 const constants_1 = require("./constants");
 const writeBuildInfo_1 = require("./writeBuildInfo");
 const writeDotEnv_1 = require("./writeDotEnv");
-const createAppBuildJob = (context, { script, variables, runnerVariables, ...def }) => {
-    var _a, _b, _c;
+const createAppBuildJob = (context, { script, variables, runnerVariables, cache, ...def }) => {
+    var _a, _b;
     return (0, lodash_1.merge)({
         name: constants_1.APP_BUILD_JOB_NAME,
         envMode: "jobPerEnv",
         stage: "build",
         image: (0, __1.getRunnerImage)("jobs-default"),
         needs: [],
-        cache: [],
+        cache: cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, cache) : undefined,
         variables: {
             ...(variables !== null && variables !== void 0 ? variables : {}),
             ...(context.type === "component"
@@ -46,7 +47,7 @@ const createAppBuildJob = (context, { script, variables, runnerVariables, ...def
             ...(context.type === "component" ? (0, writeBuildInfo_1.writeBuildInfo)(context) : []),
             ...(0, yarn_1.ensureNodeVersion)(context), // in pure node repos, we might want to have the nvmrc file in top-level
             `cd ${context.build.dir}`,
-            ...((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []),
+            ...(0, utils_1.ensureArray)(script),
         ],
         artifacts: (0, createBuildJobArtifact_1.createBuildJobArtifacts)(context),
     }, def);

package/dist/pipeline/src/build/base/createAppBuildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAM/B,6BAAuC;AAEvC,uCAA0C;AAC1C,gFAA8E;AAC9E,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAGhB,MAAM,iBAAiB,GAAG,CAC/B,OAAoE,EACpE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,GAAG,EAAyB,EACvD,EAAE;;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,EAAE;QACT,SAAS,EAAE;YACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;oBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;oBAChD,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;iBAC1C;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,eAAe,EAAE;YACf,GAAG,2CAA+B;YAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;SAChD;QAED,MAAM,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;oBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;yBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;yBACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;YACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACzB,GAAG,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAM,CAAC,mCAAI,EAAE,CAAC;SAC/B;QACD,SAAS,EAAE,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAC5C,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,iBAAiB,qBA+C5B"}
+{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAM/B,6BAAuC;AAGvC,uCAA0C;AAC1C,gFAA8E;AAC9E,4DAAyE;AACzE,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAGhB,MAAM,iBAAiB,GAAG,CAC/B,OAAoE,EACpE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,GAAG,EAAyB,EAC9D,EAAE;;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,SAAS,EAAE;YACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;oBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;oBAChD,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;iBAC1C;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,eAAe,EAAE;YACf,GAAG,2CAA+B;YAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;SAChD;QAED,MAAM,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;oBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;yBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;yBACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;YACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;SACvB;QACD,SAAS,EAAE,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAC5C,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,iBAAiB,qBA+C5B"}

package/dist/pipeline/src/build/base/createBuildJobDefinition.d.ts

@@ -0,0 +1,7 @@
+import type { BuildConfigStandalone, WorkspaceBuildConfig } from "..";
+import type { Context } from "../../types";
+import type { JobDefintion } from "../../types/jobDefinition";
+export declare const createBuildJobDefinition: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig, customize?: Pick<JobDefintion, "cache"> & {
+    prescript?: string[];
+    postscript?: string[];
+}) => JobDefintion | undefined;