@catladder/cli 1.165.1 → 1.166.0

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;

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

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBuildJobDefinition = void 0;
+const runner_1 = require("../../runner");
+const utils_1 = require("../../utils");
+const getAllCacheConfigsFromConfig_1 = require("../cache/getAllCacheConfigsFromConfig");
+const constants_1 = require("../node/constants");
+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

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

@@ -0,0 +1 @@
+{"version":3,"file":"createBuildJobDefinition.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createBuildJobDefinition.ts"],"names":[],"mappings":";;;AACA,yCAA8C;AAG9C,uCAA0C;AAC1C,wFAAqF;AACrF,iDAAgE;AAEzD,MAAM,wBAAwB,GAAG,CACtC,OAAgB,EAChB,WAAyD,EACzD,YAGI,EAAE,EACoB,EAAE;;IAC5B,IAAI,WAAW,CAAC,YAAY,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAExD,MAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IAEpD,OAAO;QACL,KAAK,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,YAAY;QAC3C,eAAe,EAAE,uCAA2B;QAC5C,KAAK,EAAE;YACL,GAAG,CAAC,MAAA,SAAS,CAAC,KAAK,mCAAI,EAAE,CAAC;YAC1B,GAAG,IAAA,2DAA4B,EAAC,OAAO,EAAE,WAAW,CAAC;SACtD;QACD,QAAQ,EACN,aAAa,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QACpE,MAAM,EAAE;YACN,GAAG,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE,CAAC;YAC9B,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC;YACxC,GAAG,CAAC,MAAA,SAAS,CAAC,UAAU,mCAAI,EAAE,CAAC;SAChC;QAED,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}

package/dist/pipeline/src/build/cache/createJobCache.d.ts

@@ -0,0 +1,6 @@
+import type { BuildConfigStandalone, CacheConfig, WorkspaceBuildConfig } from "..";
+import type { Context } from "../../types";
+import type { CatladderJobCache } from "../../types/jobs";
+export declare const createJobCacheFromCacheConfigs: (context: Context, caches: CacheConfig[]) => CatladderJobCache[] | undefined;
+/** shortcut, used in some build types */
+export declare const createJobCacheFromConfig: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig) => import("../../types").GitlabJobCache[];

package/dist/pipeline/src/build/cache/createJobCache.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createJobCacheFromConfig = exports.createJobCacheFromCacheConfigs = void 0;
+const path_1 = require("path");
+const getAllCacheConfigsFromConfig_1 = require("./getAllCacheConfigsFromConfig");
+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

package/dist/pipeline/src/build/cache/createJobCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createJobCache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/cache/createJobCache.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from "../../types";
+import type { BuildConfigStandalone, CacheConfig, WorkspaceBuildConfig } from "../types";
+export declare const getAllCacheConfigsFromConfig: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig) => CacheConfig[];

package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllCacheConfigsFromConfig = void 0;
+const index_1 = require("../../utils/index");
+const transformLegacyJobCache_1 = require("./transformLegacyJobCache");
+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

package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAllCacheConfigsFromConfig.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/cache/getAllCacheConfigsFromConfig.ts"],"names":[],"mappings":";;;AACA,6CAAgD;AAMhD,uEAAoE;AAE7D,MAAM,4BAA4B,GAAG,CAC1C,OAAgB,EAChB,WAAyD,EAC1C,EAAE;IACjB,OAAO;QACL,GAAG,CAAC,UAAU,IAAI,WAAW;YAC3B,CAAC,CAAC,IAAA,iDAAuB,EAAC,WAAW,CAAC,QAAQ,CAAC;YAC/C,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5C,GAAG,CAAC;YACJ,OAAO;SACR,CAAC,CAAC;QACH,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;YAC9B,CAAC,CAAC,6DAA6D;gBAC7D,OAAO,CAAC,UAAU,CAAC,OAAO,CACxB,CAAC,gBAAgB,EAAE,EAAE;;oBACnB,OAAA,MAAA,IAAA,mBAAW,EAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC3D,GAAG,CAAC;wBACJ,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG;qBACpC,CAAC,CAAC,mCAAI,EAAE,CAAA;iBAAA,CACZ;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,4BAA4B,gCAuBvC"}

package/dist/pipeline/src/build/cache/transformLegacyJobCache.d.ts

@@ -0,0 +1,3 @@
+import type { CacheConfigAdvanced } from "..";
+import type { CatladderJobCache } from "../../types/jobs";
+export declare function transformLegacyJobCache(jobCache: CatladderJobCache | CatladderJobCache[] | undefined): CacheConfigAdvanced[];

package/dist/pipeline/src/build/cache/transformLegacyJobCache.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformLegacyJobCache = void 0;
+const utils_1 = require("../../utils");
+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

package/dist/pipeline/src/build/cache/transformLegacyJobCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transformLegacyJobCache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/cache/transformLegacyJobCache.ts"],"names":[],"mappings":";;;AAEA,uCAA0C;AAE1C,SAAgB,uBAAuB,CACrC,QAA6D;IAE7D,OAAO,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;QAAC,OAAA,CAAC;YAC3C,QAAQ,EAAE,UAAU;YACpB,GAAG,KAAK;YACR,GAAG,EAAE,MAAA,KAAK,CAAC,GAAG,mCAAI,SAAS;YAC3B,KAAK,EAAE,MAAA,KAAK,CAAC,KAAK,mCAAI,EAAE;SACzB,CAAC,CAAA;KAAA,CAAC,CAAC;AACN,CAAC;AATD,0DASC"}

package/dist/pipeline/src/build/custom/buildJob.js

@@ -1,30 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCustomBuildJobs = void 0;
-const utils_1 = require("../../utils");
 const docker_1 = require("../docker");
 const types_1 = require("../types");
 const base_1 = require("../base");
-const RUNNER_BUILD_VARIABLES = {
-    KUBERNETES_CPU_REQUEST: "0.45",
-    KUBERNETES_MEMORY_REQUEST: "1Gi",
-    KUBERNETES_MEMORY_LIMIT: "4Gi",
-};
+const createBuildJobDefinition_1 = require("../base/createBuildJobDefinition");
 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),

package/dist/pipeline/src/build/custom/buildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAC1C,sCAAsE;AACtE,oCAAyC;AAGzC,kCAAmD;AAEnD,MAAM,sBAAsB,GAAG;IAC7B,sBAAsB,EAAE,MAAM;IAC9B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,MAAM,qBAAqB,GAAG,CACnC,OAAyB,EACT,EAAE;;IAClB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,eAAe,EAAE,sBAAsB;gBACvC,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,WAAW;gBACjC,MAAM,EAAE,CAAC,GAAG,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,CAAC;aAC3D;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,CAAC;YAE1D,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA1BW,QAAA,qBAAqB,yBA0BhC"}
+{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;AACA,sCAAsE;AACtE,oCAAyC;AAGzC,kCAAmD;AACnD,+EAA4E;AAErE,MAAM,qBAAqB,GAAG,CACnC,OAAyB,EACT,EAAE;IAClB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC,IAAA,mDAAwB,EAAC,OAAO,EAAE,WAAW,CAAC;YAChD,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,CAAC;YAE1D,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AApBW,QAAA,qBAAqB,yBAoBhC"}

package/dist/pipeline/src/build/custom/testJob.d.ts

@@ -1,6 +1,6 @@
+import type { Artifacts } from "../../types";
 import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-import type { Artifacts } from "../../types";
 export declare const createCustomTestJobs: (context: ComponentContext) => CatladderJob[];
 export type OptionalArtifacts = {
     artifacts: Artifacts;

package/dist/pipeline/src/build/custom/testJob.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCustomTestJobs = void 0;
 const utils_1 = require("../../utils");
-const types_1 = require("../types");
 const createArtifactsConfig_1 = require("../base/createArtifactsConfig");
+const createJobCache_1 = require("../cache/createJobCache");
+const types_1 = require("../types");
 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") {
@@ -28,7 +29,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",
@@ -39,27 +40,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);

package/dist/pipeline/src/build/custom/testJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/docker.d.ts

@@ -1,5 +1,5 @@
 import type { BuildConfigDocker } from ".";
-import type { ComponentContext } from "../types";
+import type { ComponentContext, JobDefintion } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
     DOCKER_IMAGE_TAG: string;
@@ -58,8 +58,8 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
 export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
-export type DockerBuildJobDefinition = Partial<CatladderJob>;
-export declare const createDockerBuildJobBase: (context: ComponentContext, { script, ...def }: Partial<CatladderJob>) => CatladderJob;
+export type DockerBuildJobDefinition = JobDefintion;
+export declare const createDockerBuildJobBase: (context: ComponentContext, { script, cache, ...def }: JobDefintion) => CatladderJob;
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
 export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => string[];
 export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => string[];

package/dist/pipeline/src/build/docker.js

@@ -12,6 +12,7 @@ const artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
 const gcloudServiceAccountLoginCommands_1 = require("../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands");
 const runner_1 = require("../runner");
 const gitlab_1 = require("../utils/gitlab");
+const createJobCache_1 = require("./cache/createJobCache");
 const DOCKER_BUILD_RUNNER_REQUESTS = {
     KUBERNETES_CPU_REQUEST: "0.45",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
@@ -101,11 +102,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 || [],
     }, {

package/dist/pipeline/src/build/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/node/buildJob.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodeDockerJobDefinition = exports.createNodeBuildJobDefinition = exports.createNodeBuildJobs = void 0;
-const runner_1 = require("../../runner");
 const context_1 = require("../../types/context");
-const utils_1 = require("../../utils");
 const base_1 = require("../base");
+const createBuildJobDefinition_1 = require("../base/createBuildJobDefinition");
 const docker_1 = require("../docker");
-const types_1 = require("../types");
 const cache_1 = require("./cache");
-const constants_1 = require("./constants");
 const yarn_1 = require("./yarn");
 const createNodeBuildJobs = (context) => {
     if (context.type === "workspace") {
@@ -25,26 +22,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) => {

package/dist/pipeline/src/build/node/buildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;AAIA,iDAG6B;AAE7B,kCAA6E;AAE7E,+EAA4E;AAE5E,sCAAsE;AAEtE,mCAAmE;AACnE,iCAAwE;AAEjE,MAAM,mBAAmB,GAAG,CACjC,OAA4C,EAC5B,EAAE;IAClB,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,IAAA,oCAA4B,EAAC,OAAO,CAAC;SAChD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,IAAA,2CAAiC,EAAC,OAAO,CAAC;YAClD,CAAC,CAAC,IAAA,oCAA4B,EAAC,OAAO,CAAC;YACvC,CAAC,CAAC,SAAS;QAEb,WAAW,EAAE,IAAA,qCAA6B,EAAC,OAAO,CAAC;KACpD,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,MAAM,4BAA4B,GAAG,CAC1C,OAAoE,EACjC,EAAE;IACrC,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,IAAA,mDAAwB,EAAC,OAAO,EAAE,WAAW,EAAE;QACpD,SAAS,EAAE,WAAW;QACtB,KAAK,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,EAAE,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;KAC5D,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,4BAA4B,gCAUvC;AAEK,MAAM,6BAA6B,GAAG,CAC3C,OAAyB,EACC,EAAE;;IAC5B,+DAA+D;IAC/D,MAAM,oBAAoB,GACxB,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,aAAa;QACzC,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,WAAW;QACrC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,CAAC;IAEb,OAAO;QACL,MAAM,EAAE,IAAA,kDAAyC,EAC/C,OAAO,EACP,oBAAoB,CACrB;QACD,KAAK,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACzC,SAAS,EAAE;YACT,+BAA+B;YAC/B,2BAA2B,EAAE,IAAA,qCAA8B,EAAC,OAAO,CAAC;YACpE,2BAA2B,EACzB,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,mBAAmB,CAC5C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,0BAA0B,GAAG,SAAS,GAAG,EAAE,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;SACjB;KACF,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,6BAA6B,iCAyBxC"}

package/dist/pipeline/src/build/node/cache.d.ts

@@ -1,7 +1,7 @@
 import type { Context, WorkspaceContext } from "../../types/context";
-import type { GitlabJobCache } from "../../types/gitlab-types";
-export declare const getYarnCache: (context: Context, policy?: string) => GitlabJobCache[];
-export declare const getNodeModulesCache: (context: Context, policy?: string) => GitlabJobCache[];
-export declare const getNodeCache: (context: Context, policy?: string) => GitlabJobCache[];
-export declare const getNextCache: (context: Context) => GitlabJobCache[];
-export declare const getWorkspaceDefaultCaches: (context: WorkspaceContext) => GitlabJobCache[];
+import type { CacheConfig } from "../types";
+export declare const getYarnCache: (context: Context, policy?: string) => CacheConfig[];
+export declare const getNodeModulesCache: (context: Context, policy?: string) => CacheConfig[];
+export declare const getNodeCache: (context: Context, policy?: string) => CacheConfig[];
+export declare const getNextCache: (context: Context) => CacheConfig[];
+export declare const getWorkspaceDefaultCaches: (context: WorkspaceContext) => CacheConfig[];

package/dist/pipeline/src/build/node/cache.js

@@ -11,17 +11,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;
@@ -33,6 +28,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"
@@ -59,13 +56,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,
         },
@@ -76,9 +73,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"],
         },
     ];
 };

package/dist/pipeline/src/build/node/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":"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"}