@catladder/pipeline 1.149.2 → 1.149.3

package/dist/build/base/createAppBuildJob.js

@@ -76,8 +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(context.componentConfig.dotEnv === true // don't build when set to `local`
-    ? (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.build)), 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/base/writeDotEnv.d.ts

@@ -4,4 +4,5 @@ import type { ComponentContext } from "../../types";
  * @param context
  * @returns
  */
-export declare const writeDotEnv: (context: ComponentContext) => string[];
+export declare const writeDotEnv: (context: ComponentContext) => string[];
+export declare const componentContextNeedsBuildTimeDotEnv: (context: ComponentContext) => boolean;

package/dist/build/base/writeDotEnv.js

@@ -25,7 +25,7 @@ var __read = this && this.__read || function (o, n) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.writeDotEnv = void 0;
+exports.componentContextNeedsBuildTimeDotEnv = exports.writeDotEnv = void 0;
 var lodash_1 = require("lodash");
 /**
  * writes a .env file in the components folder
@@ -49,4 +49,9 @@ var writeDotEnv = function (context) {
   }).join("\n");
   return ["cat <<EOF > ".concat(context.build.dir, "/.env\n").concat(keyValueString, "\nEOF")];
 };
-exports.writeDotEnv = writeDotEnv;
+exports.writeDotEnv = writeDotEnv;
+var componentContextNeedsBuildTimeDotEnv = function (context) {
+  return context.componentConfig.dotEnv === true; // don't build when set to `local`
+};
+
+exports.componentContextNeedsBuildTimeDotEnv = componentContextNeedsBuildTimeDotEnv;

package/dist/build/node/buildJob.js

@@ -45,7 +45,7 @@ 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 _a, _b, _c, _d, _e;
   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");
@@ -59,7 +59,7 @@ var createNodeBuildJobs = function (context) {
       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.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) {
+        paths: __spreadArray([context.build.dir], __read((_d = context.build.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);
@@ -76,9 +76,9 @@ var createNodeBuildJobs = function (context) {
       variables: {
         // only required for non static
         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) {
+        DOCKER_COPY_WORKSPACE_FILES: (_e = context.build.packageManagerInfo.pathsToCopyInDocker.map(function (dir) {
           return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
-        })) === null || _g === void 0 ? void 0 : _g.join("\n")
+        })) === null || _e === void 0 ? void 0 : _e.join("\n")
       }
     }
   });

package/dist/build/node/cache.js

@@ -44,11 +44,10 @@ var path_1 = require("path");
 var slugify_1 = __importDefault(require("slugify"));
 var lodash_1 = require("lodash");
 var getYarnCache = function (context, policy) {
-  var _a;
   if (policy === void 0) {
     policy = "pull-push";
   }
-  var componentIsInWorkspace = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
+  var componentIsInWorkspace = context.packageManagerInfo.componentIsInWorkspace;
   return [componentIsInWorkspace ? {
     key: "yarn",
     policy: policy,
@@ -61,11 +60,11 @@ var getYarnCache = function (context, policy) {
 };
 exports.getYarnCache = getYarnCache;
 var getNodeModulesCache = function (context, policy) {
-  var _a, _b, _c;
+  var _a;
   if (policy === void 0) {
     policy = "pull-push";
   }
-  var componentIsInWorkspace = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
+  var componentIsInWorkspace = context.packageManagerInfo.componentIsInWorkspace;
   // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
   // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
   return [{
@@ -73,9 +72,9 @@ var getNodeModulesCache = function (context, policy) {
     key: componentIsInWorkspace ? "node-modules-workspace" : (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(["node_modules"], __read((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
+    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 && _c !== void 0 ? _c : []), false)) : [(0, path_1.join)(context.dir, "node_modules")]), false)
+    })) !== null && _a !== void 0 ? _a : []), false)) : [(0, path_1.join)(context.dir, "node_modules")]), false)
   }];
 };
 exports.getNodeModulesCache = getNodeModulesCache;

package/dist/build/node/testJob.js

@@ -52,7 +52,7 @@ var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
 var createArtifactsConfig_1 = require("../base/createArtifactsConfig");
 var createNodeTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {
@@ -75,24 +75,24 @@ var createNodeTestJobs = function (context) {
   }, 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 : [((_f = context.build.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.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.build.packageManagerInfo.isClassic ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
     ]), 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;
+  }), (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;
   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,
+    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((_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;
+    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)
+  }), (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: (_r = (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.jobImage) !== null && _r !== void 0 ? _r : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
+    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((_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;
+    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)
+  }), (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);
 };
 exports.createNodeTestJobs = createNodeTestJobs;

package/dist/build/node/yarn.js

@@ -42,8 +42,7 @@ var YARN_INSTALL_CLASSIC = "yarn install --frozen-lockfile";
 // FIXME: check why and when rebuild is needed
 var YARN_BERRY_PROD_REBUILD = "yarn workspaces focus --production && yarn rebuild";
 var getYarnInstallCommand = function (context) {
-  var _a;
-  if ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) {
+  if (context.packageManagerInfo.isClassic) {
     return YARN_INSTALL_CLASSIC;
   }
   return "yarn install --immutable";
@@ -60,15 +59,13 @@ var getYarnInstall = function (context, options) {
 exports.getYarnInstall = getYarnInstall;
 var DOCKER_COPY_FILES = "COPY --chown=node:node $APP_DIR .";
 var getDockerAppCopyAndBuildScript = function (context) {
-  var _a;
-  if ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) {
+  if (context.packageManagerInfo.isClassic) {
     return new BashExpression_1.BashExpression("\nRUN ".concat(YARN_INSTALL_CLASSIC, " --production --ignore-scripts\n").concat(DOCKER_COPY_FILES, "\nRUN ").concat(YARN_INSTALL_CLASSIC, " --production \n    ").trim());
   }
   // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
   // trying to import those fail on this version
   var doesNotShipWithBuiltInPlugins = ["2", "3"].some(function (v) {
-    var _a;
-    return (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.version.startsWith(v);
+    return context.packageManagerInfo.version.startsWith(v);
   });
   var maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins ? "RUN yarn plugin import workspace-tools" : "";
   // copy first everything and then install

package/dist/build/sbom.js

@@ -8,12 +8,12 @@ var utils_1 = require("../utils");
 exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
 exports.SBOM_FILE = "__sbom.json";
 var createSbomBuildJob = function (context) {
-  var _a, _b, _c, _d, _e;
+  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(((_a = context.build.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace) ? "." : context.build.dir)];
-  var image = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_c = (_b = buildConfig.sbom) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage : defaultImage;
-  var script = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_e = (0, utils_1.ensureArray)((_d = buildConfig.sbom) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : defaultScript : defaultScript;
+  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.build.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 {
     name: exports.SBOM_BUILD_JOB_NAME,
     stage: "build",