@catladder/pipeline 1.150.1 → 1.150.2

package/dist/build/base/createAppBuildJob.js

@@ -76,7 +76,7 @@ var createAppBuildJob = function (context, _a) {
     cache: [],
     variables: __assign(__assign(__assign(__assign({}, variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.build.config.extraVars) !== null && _b !== void 0 ? _b : {}),
     runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {}), (_c = context.build.config.runnerVariables) !== null && _c !== void 0 ? _c : {}),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(context) ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context.build)), false), ["cd ".concat(context.build.dir)], false), __read((_d = (0, utils_1.ensureArray)(script)) !== null && _d !== void 0 ? _d : []), false),
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(context) ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read((_d = (0, utils_1.ensureArray)(script)) !== null && _d !== void 0 ? _d : []), false),
     artifacts: {
       paths: [(0, path_1.join)(context.build.dir, "__build_info.json")],
       reports: {

package/dist/build/node/buildJob.js

@@ -51,15 +51,15 @@ var createNodeBuildJobs = function (context) {
     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.build);
+  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   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.build)), 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)), 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.build.dir], __read((_d = context.build.packageManagerInfo.currentWorkspaceDependencies) !== null && _d !== void 0 ? _d : []), false).flatMap(function (dir) {
+        paths: __spreadArray([context.build.dir], __read((_d = context.packageManagerInfo.currentWorkspaceDependencies) !== null && _d !== void 0 ? _d : []), 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);
@@ -72,11 +72,11 @@ var createNodeBuildJobs = function (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.build, "pull")), false),
+      cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
       variables: {
         // only required for non static
-        DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context.build),
-        DOCKER_COPY_WORKSPACE_FILES: (_e = context.build.packageManagerInfo.pathsToCopyInDocker.map(function (dir) {
+        DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
+        DOCKER_COPY_WORKSPACE_FILES: (_e = context.packageManagerInfo.pathsToCopyInDocker.map(function (dir) {
           return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
         })) === null || _e === void 0 ? void 0 : _e.join("\n")
       }

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

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

package/dist/build/node/cache.js

@@ -40,9 +40,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
+var lodash_1 = require("lodash");
 var path_1 = require("path");
 var slugify_1 = __importDefault(require("slugify"));
-var lodash_1 = require("lodash");
 var getYarnCache = function (context, policy) {
   if (policy === void 0) {
     policy = "pull-push";
@@ -53,9 +53,9 @@ var getYarnCache = function (context, policy) {
     policy: policy,
     paths: [".yarn"]
   } : {
-    key: (0, slugify_1.default)(context.dir) + "-yarn",
+    key: (0, slugify_1.default)(context.build.dir) + "-yarn",
     policy: policy,
-    paths: [(0, path_1.join)(context.dir, ".yarn")]
+    paths: [(0, path_1.join)(context.build.dir, ".yarn")]
   }];
 };
 exports.getYarnCache = getYarnCache;
@@ -69,12 +69,12 @@ var getNodeModulesCache = function (context, policy) {
   // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
   return [{
     // if component is in a shared workspace, use workspace cache. use individual cache else
-    key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1.default)(context.dir) + "-node-modules",
+    key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1.default)(context.build.dir) + "-node-modules",
     // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
     policy: policy,
     paths: __spreadArray([], __read(componentIsInWorkspace ? (0, lodash_1.uniq)(__spreadArray(["node_modules"], __read((_a = context.packageManagerInfo.workspaces.map(function (w) {
       return (0, path_1.join)(w.location, "node_modules");
-    })) !== null && _a !== void 0 ? _a : []), false)) : [(0, path_1.join)(context.dir, "node_modules")]), false)
+    })) !== null && _a !== void 0 ? _a : []), false)) : [(0, path_1.join)(context.build.dir, "node_modules")]), false)
   }];
 };
 exports.getNodeModulesCache = getNodeModulesCache;

package/dist/build/node/meteor.js

@@ -54,10 +54,10 @@ var createMeteorBuildJobs = function (context) {
   if (!(0, types_1.isOfBuildType)(buildConfig, "meteor")) {
     throw new Error("deploy config is not meteor");
   }
-  var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
+  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   return (0, base_1.createBuildJobs)(context, {
     appBuild: buildConfig.buildCommand !== null ? {
-      cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context.build)), false), __read(getMeteorCache(context)), false),
+      cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), 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

package/dist/build/node/testJob.js

@@ -69,13 +69,13 @@ var createNodeTestJobs = function (context) {
     needs: [],
     envMode: "none"
   };
-  var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
+  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   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.build.dir)], __read((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [context.build.packageManagerInfo.isClassic ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
+    script: __spreadArray(["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 : [context.packageManagerInfo.isClassic ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
     ]), false),
     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)) : null;
@@ -83,15 +83,15 @@ var createNodeTestJobs = function (context) {
     name: "👮 lint"
   }, base), {
     image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : defaultImage,
-    cache: (0, cache_1.getNodeCache)(context.build),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["yarn lint"]), false)
+    cache: (0, cache_1.getNodeCache)(context),
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["yarn lint"]), false)
   }), (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)) : null;
   var testJob = buildConfig.test !== false ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
     image: (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
-    cache: (0, cache_1.getNodeCache)(context.build),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : ["yarn test"]), false)
+    cache: (0, cache_1.getNodeCache)(context),
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : ["yarn test"]), false)
   }), (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)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };

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

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

package/dist/build/node/yarn.js

@@ -53,7 +53,7 @@ var ensureNodeVersion = function (context) {
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context, options) {
   var _a;
-  var postInstall = "postInstall" in context.config ? context.config.postInstall : null;
+  var postInstall = "postInstall" in context.build.config ? context.build.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);
 };
 exports.getYarnInstall = getYarnInstall;

package/dist/build/sbom.js

@@ -11,7 +11,7 @@ var createSbomBuildJob = function (context) {
   var _a, _b, _c, _d;
   var buildConfig = context.build.config;
   var defaultImage = "aquasec/trivy:0.38.3";
-  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.build.packageManagerInfo.componentIsInWorkspace ? "." : context.build.dir)];
+  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.packageManagerInfo.componentIsInWorkspace ? "." : context.build.dir)];
   var image = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_b = (_a = buildConfig.sbom) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage : defaultImage;
   var script = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_d = (0, utils_1.ensureArray)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : defaultScript : defaultScript;
   return {