@catladder/cli 1.146.1 → 1.147.0

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

@@ -50,22 +50,24 @@ 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.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
-var lodash_1 = require("lodash");
-var deploy_1 = require("../deploy");
-var runner_1 = require("../runner");
+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 gitlab_1 = require("../utils/gitlab");
+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",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
     KUBERNETES_MEMORY_LIMIT: "2Gi",
 };
 var getDockerImageVariables = function (context) {
-    return __assign(__assign({}, ((0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")
+    var _a;
+    var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    return __assign(__assign({}, ((0, deploy_1.isOfDeployType)(deployConfig, "google-cloudrun")
         ? {
             DOCKER_REGISTRY: (0, artifactsRegistry_1.getArtifactsRegistryHost)(context),
             DOCKER_IMAGE: (0, artifactsRegistry_1.getArtifactsRegistryImageName)(context),
@@ -84,10 +86,11 @@ 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);
+var requiresDockerBuild = function (context) {
+    var _a;
+    var 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
@@ -97,13 +100,27 @@ var getDockerBuildRunnerVariables = function () { return ({
     DOCKER_DRIVER: "overlay2",
     DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
 }); };
+var getDockerAdditions = function (build) {
+    var _a, _b;
+    if (!("docker" in build))
+        return {};
+    if (!build.docker)
+        return {};
+    return {
+        DOCKERFILE_ADDITIONS: "additionsBegin" in build.docker
+            ? (_a = build.docker.additionsBegin) === null || _a === void 0 ? void 0 : _a.join("\n")
+            : undefined,
+        DOCKERFILE_ADDITIONS_END: "additionsEnd" in build.docker
+            ? (_b = build.docker.additionsEnd) === null || _b === void 0 ? void 0 : _b.join("\n")
+            : undefined,
+    };
+};
 var getDockerBuildVariables = function (context) {
-    var _a, _b, _c, _d;
-    return __assign({ DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"), DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"), APP_DIR: context.componentConfig.dir, DOCKER_DIR: "." }, (0, exports.getDockerImageVariables)(context));
+    return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), { APP_DIR: context.build.dir, DOCKER_DIR: "." }), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
-var getDockerJobBaseProps = function (context) {
+var getDockerJobBaseProps = function () {
     return {
         image: (0, runner_1.getRunnerImage)("docker-build"),
         services: [
@@ -119,14 +136,14 @@ 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 || [] }), {
+    return (0, lodash_1.merge)(__assign(__assign({ name: exports.DOCKER_BUILD_JOB_NAME, envMode: "jobPerEnv", stage: "build" }, (0, exports.getDockerJobBaseProps)()), { script: script || [] }), {
         variables: (0, exports.getDockerBuildVariables)(context),
         runnerVariables: __assign(__assign({}, DOCKER_BUILD_RUNNER_REQUESTS), getDockerBuildRunnerVariables()),
     }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 var gitlabDockerLogin = function (context) {
-    return (0, deploy_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")
+    return context.deploy && (0, deploy_1.isOfDeployType)(context.deploy.config, "google-cloudrun")
         ? __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), [
             "gcloud auth configure-docker ".concat((0, artifactsRegistry_1.getArtifactsRegistryHost)(context)),
         ], false) : [
@@ -134,9 +151,25 @@ var gitlabDockerLogin = function (context) {
     ];
 };
 exports.gitlabDockerLogin = gitlabDockerLogin;
+var BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
+    meteor: "ensureMeteorDockerfile",
+    node: "ensureNodeDockerfile",
+    nginx: "ensureNginxDockerfile",
+    custom: null,
+};
+var getDockerBuildScriptWithBuiltInDockerFile = function (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
+        : 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
+        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")([
@@ -147,7 +180,7 @@ var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {
 };
 exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
 var hasDockerfile = function (context) {
-    return (0, fs_1.existsSync)(path_1.default.join(context.componentConfig.dir, "Dockerfile"));
+    return (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":"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"}

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

@@ -1,4 +1,4 @@
-import type { Context } from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { BuildConfig, BuildConfigType } from "./types";
@@ -6,7 +6,7 @@ export * from "./types";
 export * from "./node";
 export type BuildTypes = {
     [type in BuildConfigType]: {
-        jobs: (context: Context) => CatladderJob[];
+        jobs: (context: ComponentContext) => CatladderJob[];
         defaults: (envContext: EnvironmentContext<BuildConfigType, any>) => Partial<Extract<BuildConfig, {
             type: type;
         }>>;

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

@@ -1,3 +1,3 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createNodeBuildJobs: (context: Context) => CatladderJob[];
+export declare const createNodeBuildJobs: (context: ComponentContext) => CatladderJob[];

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

@@ -37,23 +37,23 @@ 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;
+    var 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");
     }
     var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
-    var yarnInstall = (0, yarn_1.getYarnInstall)(context);
+    var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
     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)), false), __read((0, cache_1.getNextCache)(context)), false),
+                cache: __spreadArray(__spreadArray(__spreadArray([], __read(((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : [])), false), __read((0, cache_1.getNodeCache)(context.build)), 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.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.currentWorkspaceDependencies) !== null && _e !== void 0 ? _e : [])), false).flatMap(function (dir) {
+                        context.build.dir
+                    ], __read(((_e = (_d = context.build.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"),
@@ -70,14 +70,14 @@ var createNodeBuildJobs = function (context) {
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildDefaultScript)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
-                ? "ensureNginxDockerfile"
-                : "ensureNodeDockerfile"),
-            cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
+            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
+                ? "nginx"
+                : "node"),
+            cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.build, "pull")), false),
             variables: {
                 // only required for non static
-                DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
-                DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.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"),
+                DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context.build),
+                DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.build.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"),
             },
         },
     });

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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAG9C,qCAA0C;AAC1C,gCAA0C;AAC1C,oCAAwD;AACxD,kCAAyC;AACzC,iCAAmE;AACnE,yCAA0D;AAC1D,+BAAwE;AAEjE,IAAM,mBAAmB,GAAG,UAAC,OAAgB;;IAClD,IAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC;IAElD,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,IAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IACpD,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,YAAY;gBAC3C,eAAe,EAAE,uCAA2B;gBAC5C,KAAK,uDACA,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,QAAQ,CAAC,mCAAI,EAAE,CAAC,kBACzC,IAAA,oBAAY,EAAC,OAAO,CAAC,kBACrB,IAAA,oBAAY,EAAC,OAAO,CAAC,SACzB;gBACD,MAAM,yCACD,WAAW,kBACX,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SACjD;gBACD,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,CAAC,eAAe,CAAC,GAAG;8BAExB,CAAC,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,4BAA4B,mCAC1D,EAAE,CAAC,UACL,OAAO,CAAC,UAAC,GAAG;;wBAAK;4BACjB,IAAA,WAAI,EAAC,GAAG,EAAE,mBAAmB,CAAC;4BAC9B,IAAA,WAAI,EAAC,GAAG,EAAE,MAAM,CAAC;4BACjB,IAAA,WAAI,EAAC,GAAG,EAAE,OAAO,CAAC;kCACf,CAAC,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,GAAG,CAAC,UAAC,IAAI;4BACvC,OAAA,IAAA,WAAI,EAAC,GAAG,EAAE,IAAI,CAAC;wBAAf,CAAe,CAChB,mCAAI,EAAE,CAAC,UACT;qBAAA,CAAC;oBACF,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,QAAQ;iBACf;gBACD,OAAO,EAAE,WAAW,CAAC,OAAO;aAC7B;YACH,CAAC,CAAC,SAAS;QAEf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,oCAA2B,EACjC,OAAO,EACP,WAAW,CAAC,IAAI,KAAK,aAAa,IAAI,WAAW,CAAC,IAAI,KAAK,WAAW;gBACpE,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,sBAAsB,CAC3B;YACD,KAAK,2BAAM,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,SAAC;YACzC,SAAS,EAAE;gBACT,+BAA+B;gBAC/B,2BAA2B,EAAE,IAAA,qCAA8B,EAAC,OAAO,CAAC;gBACpE,2BAA2B,EACzB,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,mBAAmB,CAC5C,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,iCAA0B,GAAG,mBAAS,GAAG,CAAE,EAA3C,CAA2C,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;aACjB;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAhEW,QAAA,mBAAmB,uBAgE9B"}
+{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
-import type { Context } from "../../types/context";
+import type { BuildContext, ComponentContext } 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 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[];

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

@@ -44,9 +44,9 @@ var getYarnCache = function (context, policy) {
                 paths: [".yarn"],
             }
             : {
-                key: (0, slugify_1.default)(context.componentConfig.dir) + "-yarn",
+                key: (0, slugify_1.default)(context.dir) + "-yarn",
                 policy: policy,
-                paths: [(0, path_1.join)(context.componentConfig.dir, ".yarn")],
+                paths: [(0, path_1.join)(context.dir, ".yarn")],
             },
     ];
 };
@@ -62,7 +62,7 @@ var getNodeModulesCache = function (context, policy) {
             // if component is in a shared workspace, use workspace cache. use individual cache else
             key: componentIsInWorkspace
                 ? "node-modules-workspace"
-                : (0, slugify_1.default)(context.componentConfig.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
+                : (0, slugify_1.default)(context.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
             policy: policy,
             paths: __spreadArray([], __read((componentIsInWorkspace
                 ? (0, lodash_1.uniq)(__spreadArray([
@@ -70,7 +70,7 @@ var getNodeModulesCache = function (context, policy) {
                 ], __read(((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
                     return (0, path_1.join)(w.location, "node_modules");
                 })) !== null && _c !== void 0 ? _c : [])), false))
-                : [(0, path_1.join)(context.componentConfig.dir, "node_modules")])), false),
+                : [(0, path_1.join)(context.dir, "node_modules")])), false),
         },
     ];
 };
@@ -84,7 +84,7 @@ var getNextCache = function (context) { return [
     {
         key: context.componentName + "-next-cache",
         policy: "pull-push",
-        paths: [context.componentConfig.dir + "/.next/cache/"],
+        paths: [context.build.dir + "/.next/cache/"],
     },
 ]; };
 exports.getNextCache = getNextCache;

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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,oDAA8B;AAG9B,iCAA8B;AAEvB,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,MAAA,OAAO,CAAC,kBAAkB,0CAAE,sBAAsB,CAAC;IACrD,OAAO;QACL,sBAAsB;YACpB,CAAC,CAAC;gBACE,GAAG,EAAE,MAAM;gBACX,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,OAAO,CAAC;aACjB;YACH,CAAC,CAAC;gBACE,GAAG,EAAE,IAAA,iBAAO,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,OAAO;gBACnD,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aACpD;KACN,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB;AAEK,IAAM,mBAAmB,GAAG,UACjC,OAAgB,EAChB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,MAAA,OAAO,CAAC,kBAAkB,0CAAE,sBAAsB,CAAC;IAErD,uNAAuN;IACvN,0HAA0H;IAC1H,OAAO;QACL;YACE,wFAAwF;YACxF,GAAG,EAAE,sBAAsB;gBACzB,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,+LAA+L;YAC3P,MAAM,QAAA;YACN,KAAK,2BACA,CAAC,sBAAsB;gBACxB,CAAC,CAAC,IAAA,aAAI;oBACF,cAAc;0BACX,CAAC,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC;oBAC/C,OAAA,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC;gBAAhC,CAAgC,CACjC,mCAAI,EAAE,CAAC,UACR;gBACJ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,SACzD;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,mBAAmB,uBA4B9B;AACK,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,8CACK,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,kBAC7B,IAAA,2BAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UACvC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEK,IAAM,YAAY,GAAG,UAAC,OAAgB,IAAuB,OAAA;IAClE;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,aAAa;QAC1C,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,GAAG,eAAe,CAAC;KACvD;CACF,EANmE,CAMnE,CAAC;AANW,QAAA,YAAY,gBAMvB"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,oDAA8B;AAG9B,iCAA8B;AAEvB,IAAM,YAAY,GAAG,UAC1B,OAAqB,EACrB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,MAAA,OAAO,CAAC,kBAAkB,0CAAE,sBAAsB,CAAC;IACrD,OAAO;QACL,sBAAsB;YACpB,CAAC,CAAC;gBACE,GAAG,EAAE,MAAM;gBACX,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,OAAO,CAAC;aACjB;YACH,CAAC,CAAC;gBACE,GAAG,EAAE,IAAA,iBAAO,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO;gBACnC,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aACpC;KACN,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB;AAEK,IAAM,mBAAmB,GAAG,UACjC,OAAqB,EACrB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,MAAA,OAAO,CAAC,kBAAkB,0CAAE,sBAAsB,CAAC;IAErD,uNAAuN;IACvN,0HAA0H;IAC1H,OAAO;QACL;YACE,wFAAwF;YACxF,GAAG,EAAE,sBAAsB;gBACzB,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,+LAA+L;YAC3O,MAAM,QAAA;YACN,KAAK,2BACA,CAAC,sBAAsB;gBACxB,CAAC,CAAC,IAAA,aAAI;oBACF,cAAc;0BACX,CAAC,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC;oBAC/C,OAAA,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC;gBAAhC,CAAgC,CACjC,mCAAI,EAAE,CAAC,UACR;gBACJ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,SACzC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,mBAAmB,uBA4B9B;AACK,IAAM,YAAY,GAAG,UAC1B,OAAqB,EACrB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,8CACK,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,kBAC7B,IAAA,2BAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UACvC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEK,IAAM,YAAY,GAAG,UAAC,OAAyB,IAAuB,OAAA;IAC3E;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,aAAa;QAC1C,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,eAAe,CAAC;KAC7C;CACF,EAN4E,CAM5E,CAAC;AANW,QAAA,YAAY,gBAMvB"}

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

@@ -1,5 +1,5 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createNodeJobs: (context: Context) => CatladderJob[];
-export declare const createStorybookJobs: (context: Context) => CatladderJob[];
-export declare const createMeteorJobs: (context: Context) => CatladderJob[];
+export declare const createNodeJobs: (context: ComponentContext) => CatladderJob[];
+export declare const createStorybookJobs: (context: ComponentContext) => CatladderJob[];
+export declare const createMeteorJobs: (context: ComponentContext) => CatladderJob[];

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uCAAiD;AACjD,mCAAiD;AACjD,qCAA+C;AAExC,IAAM,cAAc,GAAG,UAAC,OAAgB;IAC7C,8CAAW,IAAA,4BAAkB,EAAC,OAAO,CAAC,kBAAK,IAAA,8BAAmB,EAAC,OAAO,CAAC,UAAE;AAC3E,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB;AAEK,IAAM,mBAAmB,GAAG,UAAC,OAAgB;IAClD,gCAAW,IAAA,8BAAmB,EAAC,OAAO,CAAC,UAAE;AAC3C,CAAC,CAAC;AAFW,QAAA,mBAAmB,uBAE9B;AAEK,IAAM,gBAAgB,GAAG,UAAC,OAAgB;IAC/C,8CAAW,IAAA,4BAAkB,EAAC,OAAO,CAAC,kBAAK,IAAA,8BAAqB,EAAC,OAAO,CAAC,UAAE;AAC7E,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uCAAiD;AACjD,mCAAiD;AACjD,qCAA+C;AAExC,IAAM,cAAc,GAAG,UAAC,OAAyB;IACtD,8CAAW,IAAA,4BAAkB,EAAC,OAAO,CAAC,kBAAK,IAAA,8BAAmB,EAAC,OAAO,CAAC,UAAE;AAC3E,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB;AAEK,IAAM,mBAAmB,GAAG,UACjC,OAAyB;IAEzB,gCAAW,IAAA,8BAAmB,EAAC,OAAO,CAAC,UAAE;AAC3C,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B;AAEK,IAAM,gBAAgB,GAAG,UAAC,OAAyB;IACxD,8CAAW,IAAA,4BAAkB,EAAC,OAAO,CAAC,kBAAK,IAAA,8BAAqB,EAAC,OAAO,CAAC,UAAE;AAC7E,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}

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

@@ -1,3 +1,3 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createMeteorBuildJobs: (context: Context) => CatladderJob[];
+export declare const createMeteorBuildJobs: (context: ComponentContext) => CatladderJob[];

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

@@ -38,23 +38,23 @@ var getMeteorCache = function (context) { return [
         key: context.componentName + "meteor-build-cache",
         policy: "pull-push",
         paths: [
-            (0, path_1.join)(context.componentConfig.dir, ".meteor/local/resolver-result-cache.json"),
-            (0, path_1.join)(context.componentConfig.dir, ".meteor/local/plugin-cache"),
-            (0, path_1.join)(context.componentConfig.dir, ".meteor/local/isopacks"),
-            (0, path_1.join)(context.componentConfig.dir, ".meteor/local/bundler-cache/scanner"),
+            (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"),
         ],
     },
 ]; };
 var createMeteorBuildJobs = function (context) {
-    var buildConfig = context.componentConfig.build;
+    var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "meteor")) {
         throw new Error("deploy config is not meteor");
     }
-    var yarnInstall = (0, yarn_1.getYarnInstall)(context);
+    var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
     return (0, base_1.createBuildJobs)(context, {
         appBuild: buildConfig.buildCommand !== null
             ? {
-                cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
+                cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context.build)), false), __read(getMeteorCache(context)), false),
                 image: (0, runner_1.getRunnerImage)("jobs-meteor"),
                 variables: {
                     METEOR_DISABLE_OPTIMISTIC_CACHING: "1", // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone
@@ -68,14 +68,14 @@ var createMeteorBuildJobs = function (context) {
                 ], false),
                 artifacts: {
                     paths: [
-                        context.componentConfig.dir + "/__build_info.json",
-                        context.componentConfig.dir + "/dist",
+                        context.build.dir + "/__build_info.json",
+                        context.build.dir + "/dist",
                     ],
                 },
             }
             : undefined,
         dockerBuild: {
-            script: (0, docker_1.getDockerBuildDefaultScript)(context, "ensureMeteorDockerfile"),
+            script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
             variables: {
                 METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
             },

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

@@ -1 +1 @@
-{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,gCAA0C;AAC1C,oCAAwD;AACxD,kCAAyC;AACzC,iCAAuC;AACvC,+BAAwC;AAExC,IAAM,cAAc,GAAG,UAAC,OAAgB,IAAuB,OAAA;IAC7D;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,oBAAoB;QACjD,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,IAAA,WAAI,EACF,OAAO,CAAC,eAAe,CAAC,GAAG,EAC3B,0CAA0C,CAC3C;YACD,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,4BAA4B,CAAC;YAC/D,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,wBAAwB,CAAC;YAC3D,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,qCAAqC,CAAC;SACzE;KACF;CACF,EAd8D,CAc9D,CAAC;AACK,IAAM,qBAAqB,GAAG,UAAC,OAAgB;IACpD,IAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC;IAElD,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,yCAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,kBAAK,cAAc,CAAC,OAAO,CAAC,SAAC;gBAC7D,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,yCACD,WAAW;oBAEd,gCAAgC;oBAChC,iDAAiD;oBACjD,gDAAgD;oBAEhD,kNAAkN;oBAElN,sDAAsD;yBACvD;gBACD,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,CAAC,eAAe,CAAC,GAAG,GAAG,oBAAoB;wBAClD,OAAO,CAAC,eAAe,CAAC,GAAG,GAAG,OAAO;qBACtC;iBACF;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,oCAA2B,EAAC,OAAO,EAAE,wBAAwB,CAAC;YACtE,SAAS,EAAE;gBACT,sBAAsB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;aACjE;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA5CW,QAAA,qBAAqB,yBA4ChC"}
+{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,gCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AACzC,iCAAuC;AACvC,+BAAwC;AAExC,IAAM,cAAc,GAAG,UAAC,OAAyB,IAAuB,OAAA;IACtE;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,oBAAoB;QACjD,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,0CAA0C,CAAC;YACnE,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,4BAA4B,CAAC;YACrD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,wBAAwB,CAAC;YACjD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,qCAAqC,CAAC;SAC/D;KACF;CACF,EAXuE,CAWvE,CAAC;AACK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;IAEzB,IAAM,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,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElD,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,yCAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,KAAK,CAAC,kBAAK,cAAc,CAAC,OAAO,CAAC,SAAC;gBACnE,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,yCACD,WAAW;oBAEd,gCAAgC;oBAChC,iDAAiD;oBACjD,gDAAgD;oBAEhD,kNAAkN;oBAElN,sDAAsD;yBACvD;gBACD,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,oBAAoB;wBACxC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,OAAO;qBAC5B;iBACF;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,EAAE,QAAQ,CAAC;YACpE,SAAS,EAAE;gBACT,sBAAsB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;aACjE;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA9CW,QAAA,qBAAqB,yBA8ChC"}

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

@@ -1,3 +1,3 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createNodeTestJobs: (context: Context) => CatladderJob[];
+export declare const createNodeTestJobs: (context: ComponentContext) => CatladderJob[];

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

@@ -50,32 +50,32 @@ var createNodeTestJobs = function (context) {
     if (context.trigger === "taggedRelease") {
         return [];
     }
-    var buildConfig = context.componentConfig.build;
+    var buildConfig = context.build.config;
     var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
     var base = {
-        variables: __assign(__assign({ APP_PATH: context.componentConfig.dir }, context.environment.jobOnlyVars.build.envVars), ((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {})),
+        variables: __assign(__assign({ APP_PATH: context.build.dir }, context.environment.jobOnlyVars.build.envVars), ((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {})),
         runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
         stage: "test",
         needs: [],
         envMode: "none",
     };
-    var yarnInstall = (0, yarn_1.getYarnInstall)(context);
+    var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
     var auditJob = buildConfig.audit !== false
         ? __assign(__assign(__assign({ name: "🛡 audit" }, base), { image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage, cache: undefined, script: __spreadArray([
-                "cd ".concat(context.componentConfig.dir)
+                "cd ".concat(context.build.dir)
             ], __read(((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [
-                ((_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.isClassic)
+                ((_f = context.build.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.isClassic)
                     ? "yarn audit"
                     : "yarn npm audit --environment production", // yarn 2
-            ])), false), allow_failure: true }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifactsReports, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifacts)) : null;
+            ])), false), allow_failure: true }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifactsReports, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifacts)) : null;
     var lintJob = buildConfig.lint !== false
-        ? __assign(__assign(__assign({ name: "👮 lint" }, base), { image: (_k = (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.jobImage) !== null && _k !== void 0 ? _k : defaultImage, cache: (0, cache_1.getNodeCache)(context), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), [
-                "cd ".concat(context.componentConfig.dir)
-            ], false), __read(yarnInstall), false), __read(((_m = (0, utils_1.ensureArray)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : ["yarn lint"])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifactsReports, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifacts)) : null;
+        ? __assign(__assign(__assign({ name: "👮 lint" }, base), { image: (_k = (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.jobImage) !== null && _k !== void 0 ? _k : defaultImage, cache: (0, cache_1.getNodeCache)(context.build), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), false), [
+                "cd ".concat(context.build.dir)
+            ], false), __read(yarnInstall), false), __read(((_m = (0, utils_1.ensureArray)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : ["yarn lint"])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifactsReports, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifacts)) : null;
     var testJob = buildConfig.test !== false
-        ? __assign(__assign(__assign({ name: "🧪 test" }, base), { image: (_r = (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.jobImage) !== null && _r !== void 0 ? _r : (0, runner_1.getRunnerImage)("jobs-testing-chrome"), cache: (0, cache_1.getNodeCache)(context), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), [
-                "cd ".concat(context.componentConfig.dir)
-            ], false), __read(yarnInstall), false), __read(((_t = (0, utils_1.ensureArray)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : ["yarn test"])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifactsReports, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifacts)) : null;
+        ? __assign(__assign(__assign({ name: "🧪 test" }, base), { image: (_r = (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.jobImage) !== null && _r !== void 0 ? _r : (0, runner_1.getRunnerImage)("jobs-testing-chrome"), cache: (0, cache_1.getNodeCache)(context.build), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), false), [
+                "cd ".concat(context.build.dir)
+            ], false), __read(yarnInstall), false), __read(((_t = (0, utils_1.ensureArray)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : ["yarn test"])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifactsReports, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifacts)) : null;
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createNodeTestJobs = createNodeTestJobs;

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

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

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

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

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

@@ -48,9 +48,7 @@ var ensureNodeVersion = function (context) {
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context, options) {
     var _a;
-    var postInstall = "postInstall" in context.componentConfig.build
-        ? context.componentConfig.build.postInstall
-        : null;
+    var postInstall = "postInstall" in context.config ? context.config.postInstall : null;
     return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), __read((0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)])), false), __read((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 : [])
         : [])), false);

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

@@ -1 +1 @@
-{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAE3D,qCAA0C;AAC1C,6CAAyD;AAEzD,IAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,IAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,IAAM,qBAAqB,GAAG,UAAC,OAAgB;;IAC7C,IAAI,MAAA,OAAO,CAAC,kBAAkB,0CAAE,SAAS,EAAE,CAAC;QAC1C,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,IAAM,iBAAiB,GAAG,UAAC,OAAgB;IAChD,OAAA,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;QACA,yDAAyD;QACzD,yEAAyE;KAC1E,CAAC;AANF,CAME,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,IAAM,cAAc,GAAG,UAC5B,OAAgB,EAChB,OAEC;;IAED,IAAM,WAAW,GACf,aAAa,IAAI,OAAO,CAAC,eAAe,CAAC,KAAK;QAC5C,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW;QAC3C,CAAC,CAAC,IAAI,CAAC;IACX,4DACK,IAAA,yBAAiB,EAAC,OAAO,CAAC,kBAC1B,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,kBAChC,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;QAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QACnC,CAAC,CAAC,EAAE,CAAC,UACP;AACJ,CAAC,CAAC;AAvBW,QAAA,cAAc,kBAuBzB;AAEF,IAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,IAAM,8BAA8B,GAAG,UAAC,OAAgB;;IAC7D,IAAI,MAAA,OAAO,CAAC,kBAAkB,0CAAE,SAAS,EAAE,CAAC;QAC1C,OAAO,IAAI,+BAAc,CACvB,gBACA,oBAAoB,6CACxB,iBAAiB,mBACb,oBAAoB,yBACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,IAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,UAAC,CAAC,YACtD,OAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA,EAAA,CAClD,CAAC;IACF,IAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB,YACF,iBAAiB,eACjB,6BAA6B,mBACzB,uBAAuB,aAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,8BAA8B,kCA8BzC"}
+{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAE3D,qCAA0C;AAC1C,6CAAyD;AAEzD,IAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,IAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,IAAM,qBAAqB,GAAG,UAAC,OAAqB;;IAClD,IAAI,MAAA,OAAO,CAAC,kBAAkB,0CAAE,SAAS,EAAE,CAAC;QAC1C,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,IAAM,iBAAiB,GAAG,UAAC,OAAqB;IACrD,OAAA,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;QACA,yDAAyD;QACzD,yEAAyE;KAC1E,CAAC;AANF,CAME,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,IAAM,cAAc,GAAG,UAC5B,OAAqB,EACrB,OAEC;;IAED,IAAM,WAAW,GACf,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IACtE,4DACK,IAAA,yBAAiB,EAAC,OAAO,CAAC,kBAC1B,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,kBAChC,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;QAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QACnC,CAAC,CAAC,EAAE,CAAC,UACP;AACJ,CAAC,CAAC;AArBW,QAAA,cAAc,kBAqBzB;AAEF,IAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,IAAM,8BAA8B,GAAG,UAAC,OAAqB;;IAClE,IAAI,MAAA,OAAO,CAAC,kBAAkB,0CAAE,SAAS,EAAE,CAAC;QAC1C,OAAO,IAAI,+BAAc,CACvB,gBACA,oBAAoB,6CACxB,iBAAiB,mBACb,oBAAoB,yBACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,IAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,UAAC,CAAC,YACtD,OAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA,EAAA,CAClD,CAAC;IACF,IAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB,YACF,iBAAiB,eACjB,6BAA6B,mBACzB,uBAAuB,aAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,8BAA8B,kCA8BzC"}

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

@@ -1,3 +1,3 @@
-import type { Context } from "../..";
+import type { ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createRailsBuildJobs: (context: Context) => CatladderJob[];
+export declare const createRailsBuildJobs: (context: ComponentContext) => CatladderJob[];

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

@@ -42,7 +42,7 @@ var docker_1 = require("../docker");
 var types_1 = require("../types");
 var createRailsBuildJobs = function (context) {
     var _a, _b, _c;
-    var buildConfig = context.componentConfig.build;
+    var buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
         // should not happen
         throw new Error("build type is not rails");
@@ -66,10 +66,10 @@ var createRailsBuildJobs = function (context) {
     return (0, base_1.createBuildJobs)(context, {
         appBuild: undefined,
         dockerBuild: {
-            variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
+            variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.build.config.extraVars),
             // custom script
             script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), [
-                "cd ".concat(context.componentConfig.dir),
+                "cd ".concat(context.build.dir),
                 "docker pull $DOCKER_CACHE_IMAGE || true",
                 "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"),
                 "chmod +x /usr/local/bin/pack",

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

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,gCAA0C;AAC1C,oCAImB;AACnB,kCAAyC;AAElC,IAAM,oBAAoB,GAAG,UAAC,OAAgB;;IACnD,IAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC;IAClD,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QACzC,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,IAAA,sBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;YAC9B,QAAQ,EAAE,SAAS;YACnB,WAAW,EAAE;gBACX,MAAM,EAAE,IAAA,oCAA2B,EAAC,OAAO,CAAC;gBAC5C,SAAS,EAAE,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;IAEvC,IAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,EAAE,CAAC;SACzD,GAAG,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,CAAC,QAAA,EAAE,CAAC,QAAA;QAAM,OAAA,iBAAU,CAAC,SAAG,CAAC,CAAC,CAAC,CAAC,WAAI,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,MAAG;IAAjC,CAAiC,CAAC;SAClD,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE;YACX,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAC3C;YACD,gBAAgB;YAChB,MAAM,yCACD,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,aAAM,OAAO,CAAC,eAAe,CAAC,GAAG,CAAE;gBACnC,yCAAyC;gBACzC,yFAAkF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,oBAAU,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,yDAAsD;gBAC1L,8BAA8B;gBAC9B,oGAAoG;gBACpG,yEAAyE;gBACzE,oEACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,+DACmC,WAAW,cAC5D,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,IAAI,CAAC,GAAG,CAAC,mCAAI,EAAE,CACvC;qBACH;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA9CW,QAAA,oBAAoB,wBA8C/B"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,gCAA0C;AAC1C,oCAImB;AACnB,kCAAyC;AAElC,IAAM,oBAAoB,GAAG,UAClC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IACzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QACzC,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,IAAA,sBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;YAC9B,QAAQ,EAAE,SAAS;YACnB,WAAW,EAAE;gBACX,MAAM,EAAE,IAAA,oCAA2B,EAAC,OAAO,CAAC;gBAC5C,SAAS,EAAE,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;IAEvC,IAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,EAAE,CAAC;SACzD,GAAG,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,CAAC,QAAA,EAAE,CAAC,QAAA;QAAM,OAAA,iBAAU,CAAC,SAAG,CAAC,CAAC,CAAC,CAAC,WAAI,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,MAAG;IAAjC,CAAiC,CAAC;SAClD,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE;YACX,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAClC;YACD,gBAAgB;YAChB,MAAM,yCACD,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;gBACzB,yCAAyC;gBACzC,yFAAkF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,oBAAU,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,yDAAsD;gBAC1L,8BAA8B;gBAC9B,oGAAoG;gBACpG,yEAAyE;gBACzE,oEACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,+DACmC,WAAW,cAC5D,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,IAAI,CAAC,GAAG,CAAC,mCAAI,EAAE,CACvC;qBACH;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAhDW,QAAA,oBAAoB,wBAgD/B"}

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

@@ -1,3 +1,3 @@
-import type { Context } from "../../types";
+import type { ComponentContext } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createRailsJobs: (context: Context) => CatladderJob[];
+export declare const createRailsJobs: (context: ComponentContext) => CatladderJob[];

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,iCAA+C;AAC/C,+BAA6C;AAEtC,IAAM,eAAe,GAAG,UAAC,OAAgB;IAC9C,8CAAW,IAAA,0BAAmB,EAAC,OAAO,CAAC,kBAAK,IAAA,4BAAoB,EAAC,OAAO,CAAC,UAAE;AAC7E,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,iCAA+C;AAC/C,+BAA6C;AAEtC,IAAM,eAAe,GAAG,UAAC,OAAyB;IACvD,8CAAW,IAAA,0BAAmB,EAAC,OAAO,CAAC,kBAAK,IAAA,4BAAoB,EAAC,OAAO,CAAC,UAAE;AAC7E,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B"}

package/dist/pipeline/src/build/rails/test.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../..";
+import type { ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createRailsTestJobs: (context: Context) => CatladderJob[];
+export declare const createRailsTestJobs: (context: ComponentContext) => CatladderJob[];