@catladder/cli 0.0.0-refactor-docker-c24f8608 → 0.0.0-refactor-cache-b38c122b

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

@@ -1,103 +1,63 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.getDockerBuildScriptWithBuiltInDockerFile = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
-var fs_1 = require("fs");
-var lodash_1 = require("lodash");
-var path_1 = __importDefault(require("path"));
-var deploy_1 = require("../deploy");
-var artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
-var gcloudServiceAccountLoginCommands_1 = require("../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands");
-var runner_1 = require("../runner");
-var gitlab_1 = require("../utils/gitlab");
-var DOCKER_BUILD_RUNNER_REQUESTS = {
-    KUBERNETES_CPU_REQUEST: "0.5",
+const fs_1 = require("fs");
+const lodash_1 = require("lodash");
+const path_1 = __importDefault(require("path"));
+const deploy_1 = require("../deploy");
+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",
     KUBERNETES_MEMORY_LIMIT: "2Gi",
 };
-var getDockerImageVariables = function (context) {
-    return __assign(__assign({}, ((0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")
-        ? {
-            DOCKER_REGISTRY: (0, artifactsRegistry_1.getArtifactsRegistryHost)(context),
-            DOCKER_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryImageName)(context),
-            DOCKER_CACHE_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryBuildCacheImage)(context),
-        }
-        : // gitlab registry:
-            {
-                DOCKER_REGISTRY: "$CI_REGISTRY",
-                DOCKER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.componentName,
-                // ONLY USED IN KUBERNETES
-                DOCKER_IMAGE_NAME: context.environment.shortName + "/" + context.componentName,
-                DOCKER_IMAGE: "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
-            })), { DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA" });
+const getDockerImageVariables = (context) => {
+    var _a;
+    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    return {
+        ...((0, deploy_1.isOfDeployType)(deployConfig, "google-cloudrun")
+            ? {
+                DOCKER_REGISTRY: (0, artifactsRegistry_1.getArtifactsRegistryHost)(context),
+                DOCKER_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryImageName)(context),
+                DOCKER_CACHE_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryBuildCacheImage)(context),
+            }
+            : // gitlab registry:
+                {
+                    DOCKER_REGISTRY: "$CI_REGISTRY",
+                    DOCKER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.name,
+                    // ONLY USED IN KUBERNETES
+                    DOCKER_IMAGE_NAME: context.env + "/" + context.name,
+                    DOCKER_IMAGE: "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
+                }),
+        DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA",
+    };
 };
 exports.getDockerImageVariables = getDockerImageVariables;
 /**
  * Weather the context requires a docker build
  */
-var requiresDockerBuild = function (_a) {
-    var deploy = _a.componentConfig.deploy;
-    return (0, deploy_1.isOfDeployType)(deploy, "kubernetes", "google-cloudrun", "dockerTag") ||
-        ((0, deploy_1.isOfDeployType)(deploy, "custom") && deploy.requiresDocker);
+const requiresDockerBuild = (context) => {
+    var _a;
+    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    return ((0, deploy_1.isOfDeployType)(deployConfig, "kubernetes", "google-cloudrun", "dockerTag") ||
+        ((0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker));
 };
 exports.requiresDockerBuild = requiresDockerBuild;
 // those need to be runner variables
-var getDockerBuildRunnerVariables = function () { return ({
+const getDockerBuildRunnerVariables = () => ({
     DOCKER_HOST: "tcp://0.0.0.0:2375",
     DOCKER_TLS_CERTDIR: "",
     DOCKER_DRIVER: "overlay2",
     DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
-}); };
-var getDockerAdditions = function (build) {
+});
+const getDockerAdditions = (build) => {
     var _a, _b;
     if (!("docker" in build))
         return {};
@@ -112,12 +72,23 @@ var getDockerAdditions = function (build) {
             : undefined,
     };
 };
-var getDockerBuildVariables = function (context) {
-    return __assign(__assign(__assign({}, getDockerAdditions(context.buildContext.config)), { APP_DIR: context.buildContext.dir, DOCKER_DIR: "." }), (0, exports.getDockerImageVariables)(context));
+const getDockerBuildVariables = (context) => {
+    var _a;
+    return {
+        ...getDockerAdditions(context.build.config),
+        APP_DIR: context.build.dir,
+        DOCKER_BUILD_CONTEXT: "docker" in context.build.config &&
+            context.build.config.docker &&
+            "buildContextLocation" in context.build.config.docker &&
+            ((_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.buildContextLocation) === "component"
+            ? context.build.dir
+            : ".",
+        ...(0, exports.getDockerImageVariables)(context),
+    };
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
-var getDockerJobBaseProps = function (context) {
+const getDockerJobBaseProps = () => {
     return {
         image: (0, runner_1.getRunnerImage)("docker-build"),
         services: [
@@ -131,53 +102,61 @@ var getDockerJobBaseProps = function (context) {
     };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
-var createDockerBuildJobBase = function (context, _a) {
-    var script = _a.script, def = __rest(_a, ["script"]);
-    return (0, lodash_1.merge)(__assign(__assign({ name: exports.DOCKER_BUILD_JOB_NAME, envMode: "jobPerEnv", stage: "build" }, (0, exports.getDockerJobBaseProps)(context)), { script: script || [] }), {
+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 || [],
+    }, {
         variables: (0, exports.getDockerBuildVariables)(context),
-        runnerVariables: __assign(__assign({}, DOCKER_BUILD_RUNNER_REQUESTS), getDockerBuildRunnerVariables()),
+        runnerVariables: {
+            ...DOCKER_BUILD_RUNNER_REQUESTS,
+            ...getDockerBuildRunnerVariables(),
+        },
     }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
-var gitlabDockerLogin = function (context) {
-    return (0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")
-        ? __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), [
-            "gcloud auth configure-docker ".concat((0, artifactsRegistry_1.getArtifactsRegistryHost)(context)),
-        ], false) : [
+const gitlabDockerLogin = (context) => context.deploy && (0, deploy_1.isOfDeployType)(context.deploy.config, "google-cloudrun")
+    ? [
+        ...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context),
+        `gcloud auth configure-docker ${(0, artifactsRegistry_1.getArtifactsRegistryHost)(context)}`,
+    ]
+    : [
         "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
     ];
-};
 exports.gitlabDockerLogin = gitlabDockerLogin;
-var BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
+const BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
     meteor: "ensureMeteorDockerfile",
     node: "ensureNodeDockerfile",
     nginx: "ensureNginxDockerfile",
     custom: null,
 };
-var getDockerBuildScriptWithBuiltInDockerFile = function (context, defaultType) {
+const getDockerBuildScriptWithBuiltInDockerFile = (context, defaultType) => {
     var _a;
-    var type = "docker" in context.componentConfig.build &&
-        context.componentConfig.build.docker &&
-        "type" in context.componentConfig.build.docker
-        ? (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.type
+    const 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);
 };
 exports.getDockerBuildScriptWithBuiltInDockerFile = getDockerBuildScriptWithBuiltInDockerFile;
-var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {
-    return __spreadArray(__spreadArray(__spreadArray([
-        ensureDockerFileScript !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined
-    ], __read((0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context))), false), __read((0, gitlab_1.collapseableSection)("docker-build", "Docker build")([
-        "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", //BUILDKIT_INLINE_CACHE,  see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
-    ])), false), __read((0, gitlab_1.collapseableSection)("docker-push", "Docker push and tag")([
+const getDockerBuildDefaultScript = (context, ensureDockerFileScript) => [
+    ensureDockerFileScript !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined,
+    ...(0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context)),
+    ...(0, gitlab_1.collapseableSection)("docker-build", "Docker build")([
+        "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1", //BUILDKIT_INLINE_CACHE,  see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
+    ]),
+    ...(0, gitlab_1.collapseableSection)("docker-push", "Docker push and tag")([
         "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
         "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
         "docker push $DOCKER_CACHE_IMAGE",
-    ])), false).filter(Boolean);
-};
+    ]),
+].filter(Boolean);
 exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
-var hasDockerfile = function (context) {
-    return (0, fs_1.existsSync)(path_1.default.join(context.componentConfig.dir, "Dockerfile"));
-};
+const hasDockerfile = (context) => (0, fs_1.existsSync)(path_1.default.join(context.build.dir, "Dockerfile"));
 exports.hasDockerfile = hasDockerfile;
 //# sourceMappingURL=docker.js.map

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":";;;;;;AAAA,2BAAgC;AAChC,mCAA+B;AAC/B,gDAAwB;AAExB,sCAA2C;AAC3C,4EAI8C;AAC9C,kHAA+G;AAC/G,sCAA2C;AAG3C,4CAAsD;AACtD,2DAAwE;AAExE,MAAM,4BAA4B,GAAG;IACnC,sBAAsB,EAAE,MAAM;IAC9B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,MAAM,uBAAuB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACnE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,OAAO;QACL,GAAG,CAAC,IAAA,uBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC;YACjD,CAAC,CAAC;gBACE,eAAe,EAAE,IAAA,4CAAwB,EAAC,OAAO,CAAC;gBAClD,YAAY,EAAE,IAAA,iDAA6B,EAAC,OAAO,CAAC;gBACpD,kBAAkB,EAAE,IAAA,uDAAmC,EAAC,OAAO,CAAC;aACjE;YACH,CAAC,CAAC,mBAAmB;gBACnB;oBACE,eAAe,EAAE,cAAc;oBAE/B,kBAAkB,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI;oBAC/D,0BAA0B;oBAC1B,iBAAiB,EAAE,OAAO,CAAC,GAAG,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI;oBACnD,YAAY,EAAE,uCAAuC;iBACtD,CAAC;QAEN,gBAAgB,EAAE,gBAAgB;KACnC,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,uBAAuB,2BAqBlC;AAEF;;GAEG;AACI,MAAM,mBAAmB,GAAG,CAAC,OAAyB,EAAW,EAAE;;IACxE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,OAAO,CACL,IAAA,uBAAc,EACZ,YAAY,EACZ,YAAY,EACZ,iBAAiB,EACjB,WAAW,CACZ;QACD,CAAC,IAAA,uBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,cAAc,CAAC,CACxE,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,mBAAmB,uBAY9B;AAEF,oCAAoC;AACpC,MAAM,6BAA6B,GAAG,GAAG,EAAE,CAAC,CAAC;IAC3C,WAAW,EAAE,oBAAoB;IACjC,kBAAkB,EAAE,EAAE;IACtB,aAAa,EAAE,UAAU;IACzB,eAAe,EAAE,GAAG,EAAE,yEAAyE;CAChG,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG,CAAC,KAAkB,EAAE,EAAE;;IAChD,IAAI,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAE7B,OAAO;QACL,oBAAoB,EAClB,gBAAgB,IAAI,KAAK,CAAC,MAAM;YAC9B,CAAC,CAAC,MAAA,KAAK,CAAC,MAAM,CAAC,cAAc,0CAAE,IAAI,CAAC,IAAI,CAAC;YACzC,CAAC,CAAC,SAAS;QACf,wBAAwB,EACtB,cAAc,IAAI,KAAK,CAAC,MAAM;YAC5B,CAAC,CAAC,MAAA,KAAK,CAAC,MAAM,CAAC,YAAY,0CAAE,IAAI,CAAC,IAAI,CAAC;YACvC,CAAC,CAAC,SAAS;KAChB,CAAC;AACJ,CAAC,CAAC;AACK,MAAM,uBAAuB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACnE,OAAO;QACL,GAAG,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;QAC3C,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG;QAC1B,oBAAoB,EAClB,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;YAChC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;YAC3B,sBAAsB,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;YACrD,CAAA,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,0CAAE,oBAAoB,MAAK,WAAW;YAC/D,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG;YACnB,CAAC,CAAC,GAAG;QAET,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC;KACpC,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,uBAAuB,2BAclC;AAEW,QAAA,qBAAqB,GAAG,WAAW,CAAC;AAE1C,MAAM,qBAAqB,GAAG,GAGnC,EAAE;IACF,OAAO;QACL,KAAK,EAAE,IAAA,uBAAc,EAAC,cAAc,CAAC;QACrC,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,oBAAoB,EAAE,oFAAoF;gBAChH,OAAO,EAAE,CAAC,aAAa,CAAC;aACzB;SACF;QACD,SAAS,EAAE,EAAE;QACb,eAAe,EAAE,6BAA6B,EAAE;KACjD,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC;AAEK,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACzB,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,EAA4B,EACrC,EAAE;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,6BAAqB;QAC3B,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,GAAG,IAAA,6BAAqB,GAAE;QAC1B,MAAM,EAAE,MAAM,IAAI,EAAE;KACrB,EACD;QACE,SAAS,EAAE,IAAA,+BAAuB,EAAC,OAAO,CAAC;QAC3C,eAAe,EAAE;YACf,GAAG,4BAA4B;YAC/B,GAAG,6BAA6B,EAAE;SACnC;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,wBAAwB,4BAsBnC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC7D,OAAO,CAAC,MAAM,IAAI,IAAA,uBAAc,EAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACxE,CAAC,CAAC;QACE,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;QAC7C,gCAAgC,IAAA,4CAAwB,EAAC,OAAO,CAAC,EAAE;KACpE;IACH,CAAC,CAAC;QACE,+EAA+E;KAChF,CAAC;AARK,QAAA,iBAAiB,qBAQtB;AAER,MAAM,kCAAkC,GAAG;IACzC,MAAM,EAAE,wBAAwB;IAChC,IAAI,EAAE,sBAAsB;IAC5B,KAAK,EAAE,uBAAuB;IAC9B,MAAM,EAAE,IAAI;CAGb,CAAC;AAEK,MAAM,yCAAyC,GAAG,CACvD,OAAyB,EACzB,WAAuC,EACvC,EAAE;;IACF,MAAM,IAAI,GACR,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QAChC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;QAC3B,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;QACnC,CAAC,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,0CAAE,IAAI;QACnC,CAAC,CAAC,WAAW,CAAC;IAClB,OAAO,IAAA,mCAA2B,EAChC,OAAO,EACP,IAAI,CAAC,CAAC,CAAC,kCAAkC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CACvD,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,yCAAyC,6CAcpD;AACK,MAAM,2BAA2B,GAAG,CACzC,OAAyB,EACzB,sBAAsC,EACtC,EAAE,CACF;IACE,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,SAAS;IACnC,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,cAAc,CACf,CAAC,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;IAC7B,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,cAAc,CACf,CAAC;QACA,qLAAqL,EAAE,4FAA4F;KACpR,CAAC;IACF,GAAG,IAAA,4BAAmB,EACpB,aAAa,EACb,qBAAqB,CACtB,CAAC;QACA,6CAA6C;QAC7C,gEAAgE;QAChE,iCAAiC;KAClC,CAAC;CACH,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAxBP,QAAA,2BAA2B,+BAwBpB;AAEb,MAAM,aAAa,GAAG,CAAC,OAAyB,EAAE,EAAE,CACzD,IAAA,eAAU,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC;AAD5C,QAAA,aAAa,iBAC+B"}

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

@@ -1,15 +1,24 @@
-import type { ComponentContext } from "../types/context";
+import type { ComponentContext, WorkspaceContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
-import type { BuildConfig, BuildConfigType } from "./types";
-export * from "./types";
+import type { BuildConfig, BuildConfigStandaloneType, WorkspaceBuildConfig } from "./types";
 export * from "./node";
+export * from "./types";
 export type BuildTypes = {
-    [type in BuildConfigType]: {
+    [type in BuildConfigStandaloneType]: {
         jobs: (context: ComponentContext) => CatladderJob[];
-        defaults: (envContext: EnvironmentContext<BuildConfigType, any>) => Partial<Extract<BuildConfig, {
+        defaults: (envContext: EnvironmentContext) => Partial<Extract<BuildConfig, {
             type: type;
         }>>;
     };
 };
 export declare const BUILD_TYPES: BuildTypes;
+export type WorkspaceBuildTypes = {
+    [type in WorkspaceBuildConfig["type"]]: {
+        jobs: (context: WorkspaceContext) => CatladderJob[];
+        defaults: () => Partial<Extract<WorkspaceBuildConfig, {
+            type: type;
+        }>>;
+    };
+};
+export declare const WORKSPACE_BUILD_TYPES: WorkspaceBuildTypes;

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

@@ -14,51 +14,71 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BUILD_TYPES = void 0;
-var custom_1 = require("./custom");
-var node_1 = require("./node");
-var rails_1 = require("./rails");
-__exportStar(require("./types"), exports);
+exports.WORKSPACE_BUILD_TYPES = exports.BUILD_TYPES = void 0;
+const custom_1 = require("./custom");
+const node_1 = require("./node");
+const rails_1 = require("./rails");
 __exportStar(require("./node"), exports);
+__exportStar(require("./types"), exports);
 exports.BUILD_TYPES = {
     node: {
         jobs: node_1.createNodeJobs,
-        defaults: function () { return ({
+        defaults: () => ({
             buildCommand: "yarn build",
             startCommand: "yarn start",
-        }); },
+            artifactsPaths: ["dist", ".next"],
+        }),
     },
     "node-static": {
         jobs: node_1.createNodeJobs,
-        defaults: function () { return ({
+        defaults: () => ({
             buildCommand: "yarn build",
-        }); },
+            artifactsPaths: ["dist"],
+        }),
     },
     storybook: {
         jobs: node_1.createStorybookJobs,
-        defaults: function () { return ({
+        defaults: () => ({
             buildCommand: ["yarn build-storybook --quiet -o ./dist"],
-        }); },
+            artifactsPaths: ["dist"],
+        }),
     },
     meteor: {
         jobs: node_1.createMeteorJobs,
-        defaults: function () { return ({
+        defaults: () => ({
             startCommand: "node main.js",
-        }); },
+            artifactsPaths: ["dist"],
+        }),
     },
     custom: {
         jobs: custom_1.createCustomJobs,
-        defaults: function () { return ({}); },
+        defaults: () => ({
+            artifactsPaths: ["dist"],
+        }),
     },
     rails: {
         jobs: rails_1.createRailsJobs,
-        defaults: function () { return ({
+        defaults: () => ({
             startCommand: "/cnb/process/web",
             cnbBuilder: {
                 image: "heroku/builder:22",
                 packVersion: "0.32.1",
             },
-        }); },
+        }),
+    },
+};
+exports.WORKSPACE_BUILD_TYPES = {
+    node: {
+        jobs: node_1.createNodeJobs,
+        defaults: () => ({
+            buildCommand: "yarn build",
+            lint: {
+                command: "yarn lint",
+            },
+            test: {
+                command: "yarn test",
+            },
+        }),
     },
 };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,mCAA4C;AAC5C,+BAA+E;AAC/E,iCAA0C;AAG1C,0CAAwB;AACxB,yCAAuB;AAWV,QAAA,WAAW,GAAe;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;SAC3B,CAAC,EAHc,CAGd;KACH;IACD,aAAa,EAAE;QACb,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,YAAY;SAC3B,CAAC,EAFc,CAEd;KACH;IACD,SAAS,EAAE;QACT,IAAI,EAAE,0BAAmB;QACzB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,CAAC,wCAAwC,CAAC;SACzD,CAAC,EAFc,CAEd;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,uBAAgB;QACtB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,cAAc;SAC7B,CAAC,EAFc,CAEd;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,yBAAgB;QACtB,QAAQ,EAAE,cAAM,OAAA,CAAC,EAAE,CAAC,EAAJ,CAAI;KACrB;IACD,KAAK,EAAE;QACL,IAAI,EAAE,uBAAe;QACrB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,kBAAkB;YAChC,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,QAAQ;aACtB;SACF,CAAC,EANc,CAMd;KACH;CACF,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,qCAA4C;AAC5C,iCAA+E;AAC/E,mCAA0C;AAO1C,yCAAuB;AACvB,0CAAwB;AAWX,QAAA,WAAW,GAAe;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;SAClC,CAAC;KACH;IACD,aAAa,EAAE;QACb,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,SAAS,EAAE;QACT,IAAI,EAAE,0BAAmB;QACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,CAAC,wCAAwC,CAAC;YACxD,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,uBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,cAAc;YAC5B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,yBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,KAAK,EAAE;QACL,IAAI,EAAE,uBAAe;QACrB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,kBAAkB;YAChC,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,QAAQ;aACtB;SACF,CAAC;KACH;CACF,CAAC;AASW,QAAA,qBAAqB,GAAwB;IACxD,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;SACF,CAAC;KACH;CACF,CAAC"}

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

@@ -1,3 +1,7 @@
-import type { ComponentContext } from "../../types/context";
+import type { BuildContextStandalone, WorkspaceContext } from "../../types/context";
+import { type ComponentContext } from "../../types/context";
+import type { AppBuildJobDefinition, DockerBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createNodeBuildJobs: (context: ComponentContext) => CatladderJob[];
+export declare const createNodeBuildJobs: (context: ComponentContext | WorkspaceContext) => CatladderJob[];
+export declare const createNodeBuildJobDefinition: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext) => AppBuildJobDefinition | undefined;
+export declare const createNodeDockerJobDefinition: (context: ComponentContext) => DockerBuildJobDefinition;

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

@@ -1,86 +1,51 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodeBuildJobs = void 0;
-var path_1 = require("path");
-var runner_1 = require("../../runner");
-var utils_1 = require("../../utils");
-var base_1 = require("../base");
-var docker_1 = require("../docker");
-var types_1 = require("../types");
-var cache_1 = require("./cache");
-var constants_1 = require("./constants");
-var yarn_1 = require("./yarn");
-var createNodeBuildJobs = function (context) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    var buildConfig = context.componentConfig.build;
-    if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
-        throw new Error("deploy config is not node, node-static or storybook");
+exports.createNodeDockerJobDefinition = exports.createNodeBuildJobDefinition = exports.createNodeBuildJobs = void 0;
+const context_1 = require("../../types/context");
+const base_1 = require("../base");
+const createBuildJobDefinition_1 = require("../base/createBuildJobDefinition");
+const docker_1 = require("../docker");
+const cache_1 = require("./cache");
+const yarn_1 = require("./yarn");
+const createNodeBuildJobs = (context) => {
+    if (context.type === "workspace") {
+        return (0, base_1.createWorkspaceBuildJobs)(context, {
+            appBuild: (0, exports.createNodeBuildJobDefinition)(context),
+        });
     }
-    var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
-    var yarnInstall = (0, yarn_1.getYarnInstall)(context.buildContext);
-    return (0, base_1.createBuildJobs)(context, {
-        appBuild: buildConfig.buildCommand !== null
-            ? {
-                image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
-                runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
-                cache: __spreadArray(__spreadArray(__spreadArray([], __read(((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : [])), false), __read((0, cache_1.getNodeCache)(context.buildContext)), false), __read((0, cache_1.getNextCache)(context)), false),
-                script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read(((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : [])), false),
-                artifacts: {
-                    paths: __spreadArray([
-                        context.componentConfig.dir
-                    ], __read(((_e = (_d = context.buildContext.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.currentWorkspaceDependencies) !== null && _e !== void 0 ? _e : [])), false).flatMap(function (dir) {
-                        var _a, _b;
-                        return __spreadArray([
-                            (0, path_1.join)(dir, "__build_info.json"),
-                            (0, path_1.join)(dir, "dist"),
-                            (0, path_1.join)(dir, ".next")
-                        ], __read(((_b = (_a = buildConfig.artifactsPaths) === null || _a === void 0 ? void 0 : _a.map(function (path) {
-                            return (0, path_1.join)(dir, path);
-                        })) !== null && _b !== void 0 ? _b : [])), false);
-                    }),
-                    expire_in: "1 day",
-                    when: "always",
-                },
-                jobTags: buildConfig.jobTags,
-            }
+    return (0, base_1.createComponentBuildJobs)(context, {
+        appBuild: (0, context_1.componentContextIsStandaloneBuild)(context)
+            ? (0, exports.createNodeBuildJobDefinition)(context)
             : undefined,
-        dockerBuild: {
-            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
-                ? "nginx"
-                : "node"),
-            cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.buildContext, "pull")), false),
-            variables: {
-                // only required for non static
-                DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context.buildContext),
-                DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.buildContext.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) { return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir); })) === null || _g === void 0 ? void 0 : _g.join("\n"),
-            },
-        },
+        dockerBuild: (0, exports.createNodeDockerJobDefinition)(context),
     });
 };
 exports.createNodeBuildJobs = createNodeBuildJobs;
+const createNodeBuildJobDefinition = (context) => {
+    const buildConfig = context.build.config;
+    const yarnInstall = (0, yarn_1.getYarnInstall)(context);
+    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) => {
+    var _a, _b;
+    // get the default docker built-in type based on the build type
+    const dockerDefaultBuiltIn = context.build.buildType === "node-static" ||
+        context.build.buildType === "storybook"
+        ? "nginx"
+        : "node";
+    return {
+        script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, dockerDefaultBuiltIn),
+        cache: [...(0, cache_1.getYarnCache)(context, "pull")],
+        variables: {
+            // only required for non static
+            DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
+            DOCKER_COPY_WORKSPACE_FILES: (_b = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.pathsToCopyInDocker.map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)) === null || _b === void 0 ? void 0 : _b.join("\n"),
+        },
+    };
+};
+exports.createNodeDockerJobDefinition = createNodeDockerJobDefinition;
 //# sourceMappingURL=buildJob.js.map

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;AAM7B,kCAA6E;AAC7E,+EAA4E;AAC5E,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,6 +1,7 @@
-import type { BuildContext, ComponentContext } from "../../types/context";
-import type { GitlabJobCache } from "../../types/gitlab-types";
-export declare const getYarnCache: (context: BuildContext, policy?: string) => GitlabJobCache[];
-export declare const getNodeModulesCache: (context: BuildContext, policy?: string) => GitlabJobCache[];
-export declare const getNodeCache: (context: BuildContext, policy?: string) => GitlabJobCache[];
-export declare const getNextCache: (context: ComponentContext) => GitlabJobCache[];
+import type { Context, WorkspaceContext } from "../../types/context";
+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[];