@catladder/pipeline 1.170.0 → 2.0.0

package/dist/bash/BashExpression.d.ts

@@ -8,6 +8,7 @@ export declare class BashExpression {
   constructor(value: string | BashExpression);
   toJSON(): string;
   toString(): string;
+  replace(searchValue: any, replacer: (substring: string, ...args: any[]) => string): BashExpression;
   /**
    *
    * @returns a bash expression to lowercase the string
@@ -32,9 +33,4 @@ export declare const getBashVariable: (name: string) => BashExpression;
  * @param joiner
  * @returns
  */
-export declare const joinBashExpressions: (parts: Array<StringOrBashExpression>, joiner?: string) => StringOrBashExpression;
-/**
- * escapes a string or bash expression for bash
- * it mainly escapes double quotes
- */
-export declare const bashEscape: (value: StringOrBashExpression | any) => any;
+export declare const joinBashExpressions: (parts: Array<StringOrBashExpression>, joiner?: string) => StringOrBashExpression;

package/dist/bash/BashExpression.js

@@ -34,7 +34,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.bashEscape = exports.joinBashExpressions = exports.getBashVariable = exports.BashExpression = void 0;
+exports.joinBashExpressions = exports.getBashVariable = exports.BashExpression = void 0;
 /**
  * this class represents a string that can be evaluated in bash scripts.
  *
@@ -50,6 +50,9 @@ var BashExpression = /** @class */function () {
   BashExpression.prototype.toString = function () {
     return this.value.toString();
   };
+  BashExpression.prototype.replace = function (searchValue, replacer) {
+    return new BashExpression(this.value.toString().replace(searchValue, replacer));
+  };
   /**
    *
    * @returns a bash expression to lowercase the string
@@ -108,17 +111,4 @@ var joinBashExpressions = function (parts, joiner) {
     return parts.join(joiner);
   }
 };
-exports.joinBashExpressions = joinBashExpressions;
-/**
- * escapes a string or bash expression for bash
- * it mainly escapes double quotes
- */
-var bashEscape = function (value) {
-  if (value instanceof BashExpression) {
-    return value.toString(); // no need to escape bash expressions, as we want them to evaluate
-  }
-  // we wrap it in double quotes, so we need to escape them
-  if (typeof value === "string") return value.replace(/"/g, '\\"');
-  return value;
-};
-exports.bashEscape = bashEscape;
+exports.joinBashExpressions = joinBashExpressions;

package/dist/bash/bashEscape.d.ts

@@ -0,0 +1,34 @@
+import type { VariableValue } from "../variables/VariableValue";
+import { BashExpression } from "./BashExpression";
+export type QuotesEscapeMode = "single" | "double";
+export type EscapeOptions = {
+  quotes?: QuotesEscapeMode | false;
+};
+/**
+ * escapes a string or bash expression for bash
+ * it either can escape single or double quotes (double is default)
+ */
+export declare const bashEscape: (value: VariableValue | any, options?: EscapeOptions) => string | BashExpression | null | undefined;
+export declare const escapeString: (value: string | null | undefined, {
+  quotes
+}?: EscapeOptions) => string | null | undefined;
+export declare const escapeBashExpression: (value: BashExpression, options: EscapeOptions) => BashExpression;
+export declare const escapeDoubleQuotes: (value: string | null | undefined) => string | undefined;
+export declare const escapeSingleQuotes: (value: string | null | undefined) => string | undefined;
+/**
+ *
+ * escape env vars for .env files.
+ * unfortunatly, the format has many limitations. In order to be very forgiving, we need to do some magic here:
+ *
+ * - when the value contains no newlines, we are fine
+ * - if the value contains newlines, we need to wrap it in quotes. And thats where the problem begins:
+ * - you can't escape quotes. this is a limitation of dotenv and node
+ * - you can have inner quotes, but they break in node.js (not in dotenv though), see https://github.com/nodejs/node/issues/54134
+ * - so we need to quote cleverly
+ * - to make things worse, we need to check whether we have a simple stirng or a bash expression, that needs to be evalulated first...
+ *
+ *  what an absolute nightmare.
+ *
+ * - other languages are currently only partially supported, since most .env implementations are slightly different
+ */
+export declare const escapeForDotEnv: (value: VariableValue | undefined | null) => string;

package/dist/bash/bashEscape.js

@@ -0,0 +1,114 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.escapeForDotEnv = exports.escapeSingleQuotes = exports.escapeDoubleQuotes = exports.escapeBashExpression = exports.escapeString = exports.bashEscape = void 0;
+var globalScriptFunctions_1 = require("../globalScriptFunctions");
+var VariableValueContainingReferences_1 = require("../variables/VariableValueContainingReferences");
+var BashExpression_1 = require("./BashExpression");
+/**
+ * escapes a string or bash expression for bash
+ * it either can escape single or double quotes (double is default)
+ */
+var bashEscape = function (value, options) {
+  if (options === void 0) {
+    options = {
+      quotes: "double"
+    };
+  }
+  if (value instanceof BashExpression_1.BashExpression) {
+    // no need to escape
+    return (0, exports.escapeBashExpression)(value, options);
+  }
+  if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
+    return value.toString(options);
+  }
+  return (0, exports.escapeString)(value, options);
+};
+exports.bashEscape = bashEscape;
+var escapeString = function (value, _a) {
+  var _b = _a === void 0 ? {
+      quotes: "double"
+    } : _a,
+    quotes = _b.quotes;
+  var quoteEscaped = quotes ? quotes === "single" ? (0, exports.escapeSingleQuotes)(value) : (0, exports.escapeDoubleQuotes)(value) : value;
+  return quoteEscaped;
+};
+exports.escapeString = escapeString;
+var escapeBashExpression = function (value, options) {
+  // no need to escape, we just return the string
+  return value;
+};
+exports.escapeBashExpression = escapeBashExpression;
+var escapeDoubleQuotes = function (value) {
+  return value === null || value === void 0 ? void 0 : value.toString().replace(/"/g, '\\"');
+};
+exports.escapeDoubleQuotes = escapeDoubleQuotes;
+var escapeSingleQuotes = function (value) {
+  return value === null || value === void 0 ? void 0 : value.toString().replace(/'/g, "\\'");
+};
+exports.escapeSingleQuotes = escapeSingleQuotes;
+/**
+ *
+ * escape env vars for .env files.
+ * unfortunatly, the format has many limitations. In order to be very forgiving, we need to do some magic here:
+ *
+ * - when the value contains no newlines, we are fine
+ * - if the value contains newlines, we need to wrap it in quotes. And thats where the problem begins:
+ * - you can't escape quotes. this is a limitation of dotenv and node
+ * - you can have inner quotes, but they break in node.js (not in dotenv though), see https://github.com/nodejs/node/issues/54134
+ * - so we need to quote cleverly
+ * - to make things worse, we need to check whether we have a simple stirng or a bash expression, that needs to be evalulated first...
+ *
+ *  what an absolute nightmare.
+ *
+ * - other languages are currently only partially supported, since most .env implementations are slightly different
+ */
+var escapeForDotEnv = function (value) {
+  if (value === undefined || value === null) {
+    return "";
+  }
+  if (typeof value === "string") {
+    // if string contains newlines, we need to wrap it in quotes
+    // we additionaly escape newlines, that give best compatibility
+    if (value.includes("\n")) {
+      var newlinesReplaces = value.replace(/\n/g, "\\n");
+      // default to ", but if this is not possible, we try to use ' or `
+      var quote = value.includes("\"") ? value.includes("'") ? value.includes("`") ?
+      // If all quote types are present, default to double quotes. This works in dotenv, but not in node.js because of the bug mentioned abouve
+      '"' : "`" : "'" : '"';
+      // if we found a quote, we can wrap the string in it
+      return "".concat(quote).concat(newlinesReplaces).concat(quote);
+    } else {
+      // otherwise we can return as is
+      return value;
+    }
+  } else if (value instanceof BashExpression_1.BashExpression) {
+    return escapeBashExpressionForDotEnv(value);
+  } else if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
+    // instead of doing it part-wise, we just do it all at once
+    var containsAnyBashExpression = value.parts.some(function (part) {
+      return part instanceof BashExpression_1.BashExpression;
+    });
+    if (!containsAnyBashExpression) {
+      return (0, exports.escapeForDotEnv)(value.toString({
+        quotes: "double"
+      }));
+    } else {
+      var result = escapeBashExpressionForDotEnv(new BashExpression_1.BashExpression(value.toString({
+        quotes: "double"
+      })));
+      return result;
+    }
+  } else {
+    return value;
+  }
+};
+exports.escapeForDotEnv = escapeForDotEnv;
+// basically the same thing as above for bash
+// thx chatgpt for this
+var escapeForDotEnvScript = (0, globalScriptFunctions_1.registerGlobalScriptFunction)("escapeForDotEnv", "\n input=\"${1:-$(cat)}\"\n input=\"${input//$'\\n'/\\\\n}\"\n  if [[ \"$input\" == *\\\\n* ]]; then\n    if [[ \"$input\" == *\\\"* && \"$input\" == *\\'* && \"$input\" == *\\`* ]]; then\n      printf \"\\\"%s\\\"\\n\" \"$input\" ".concat( /* fallback to double quotes */"", "\n    elif [[ \"$input\" == *\\\"* && \"$input\" == *\\'* ]]; then\n      printf \"`%s`\\n\" \"$input\"\n    elif [[ \"$input\" == *\\\"* ]]; then\n      printf \"'%s'\\n\" \"$input\"\n    else\n      printf \"\\\"%s\\\"\\n\" \"$input\"\n    fi\n  else\n    printf \"%s\\n\" \"$input\"\n  fi\n  "));
+var escapeBashExpressionForDotEnv = function (value) {
+  return value.transformWithCommand(escapeForDotEnvScript.name).toString();
+};

package/dist/bash/bashYaml.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.writeBashYamlToFileScript = exports.yamlBashString = void 0;
 var yaml_1 = require("yaml");
 var BashExpression_1 = require("./BashExpression");
+var VariableValueContainingReferences_1 = require("../variables/VariableValueContainingReferences");
 var bashExpressionType = {
   tag: "",
   resolve: function (str) {
@@ -16,12 +17,34 @@ var bashExpressionType = {
     // we create a BLOCK_LITERAL
     // but because bash will interpret the value, it may resolve to a multiline string
     // so we need to indent every line using sed
-    return "|-\n" + node.value.transformWithCommand("sed 's/^/".concat(ctx.indent, "/'"));
+    return "|-\n" + ctx.indent + indentNewlinesInBashExpression(node.value, ctx.indent);
   },
   identify: function (v) {
     return v instanceof BashExpression_1.BashExpression;
   }
 };
+var indentNewlinesInBashExpression = function (expression, indent) {
+  return expression.transformWithCommand("sed '1!s/^/".concat(indent, "/'"));
+};
+var variableContainingReferences = {
+  tag: "",
+  resolve: function (str) {
+    // not really needed,but let's make typescript happy
+    return new VariableValueContainingReferences_1.VariableValueContainingReferences(str);
+  },
+  stringify: function (node, ctx) {
+    var value = node.value;
+    var stringified = value.parts.map(function (part) {
+      return part instanceof BashExpression_1.BashExpression ? indentNewlinesInBashExpression(part, ctx.indent) :
+      // indent every new line
+      part.toString().replace(/\n/g, "\n".concat(ctx.indent));
+    }).join("");
+    return "|-\n" + ctx.indent + stringified;
+  },
+  identify: function (v) {
+    return v instanceof VariableValueContainingReferences_1.VariableValueContainingReferences;
+  }
+};
 /***
  * creates a yaml string that can be used in bash scripts
  * it handles BashExpressions correctly so that they can be evaluated in bash
@@ -30,7 +53,7 @@ var yamlBashString = function (value) {
   return (0, yaml_1.stringify)(value, {
     defaultStringType: "BLOCK_LITERAL",
     defaultKeyType: "PLAIN",
-    customTags: [bashExpressionType],
+    customTags: [bashExpressionType, variableContainingReferences],
     aliasDuplicateObjects: false,
     lineWidth: 0
   });

package/dist/bash/getInjectVarsScript.js

@@ -27,7 +27,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getInjectVarsScript = void 0;
 var lodash_1 = require("lodash");
-var BashExpression_1 = require("./BashExpression");
+var bashEscape_1 = require("./bashEscape");
 var getInjectVarsScript = function (vars) {
   if (!vars) return [];
   // filter out null and undefined values
@@ -39,7 +39,9 @@ var getInjectVarsScript = function (vars) {
     var _b = __read(_a, 2),
       key = _b[0],
       value = _b[1];
-    return "export ".concat(key, "=\"").concat(value ? (0, BashExpression_1.bashEscape)(value) : "", "\"");
+    return "export ".concat(key, "=\"").concat(value ? (0, bashEscape_1.bashEscape)(value, {
+      quotes: "double"
+    }) : "", "\"");
   });
 };
 exports.getInjectVarsScript = getInjectVarsScript;

package/dist/bash/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./bashEscape";
+export * from "./BashExpression";

package/dist/bash/index.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  var desc = Object.getOwnPropertyDescriptor(m, k);
+  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+    desc = {
+      enumerable: true,
+      get: function () {
+        return m[k];
+      }
+    };
+  }
+  Object.defineProperty(o, k2, desc);
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+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
+});
+__exportStar(require("./bashEscape"), exports);
+__exportStar(require("./BashExpression"), exports);

package/dist/build/base/createAppBuildJob.js

@@ -63,7 +63,7 @@ var constants_1 = require("./constants");
 var writeBuildInfo_1 = require("./writeBuildInfo");
 var writeDotEnv_1 = require("./writeDotEnv");
 var createAppBuildJob = function (context, _a) {
-  var _b, _c;
+  var _b;
   var script = _a.script,
     variables = _a.variables,
     runnerVariables = _a.runnerVariables,
@@ -76,8 +76,8 @@ var createAppBuildJob = function (context, _a) {
     image: (0, __1.getRunnerImage)("jobs-default"),
     needs: [],
     cache: cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, cache) : undefined,
-    variables: __assign(__assign({}, variables !== null && variables !== void 0 ? variables : {}), context.type === "component" ? __assign(__assign(__assign({}, 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 : {}),
+    variables: __assign(__assign({}, variables !== null && variables !== void 0 ? variables : {}), context.type === "component" ? __assign(__assign({}, context.environment.envVars), context.environment.jobOnlyVars.build.envVars) : {}),
+    runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {}), (_b = context.build.config.runnerVariables) !== null && _b !== void 0 ? _b : {}),
     script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(context.type === "component" ? (0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(context) ? (0, writeDotEnv_1.writeDotEnv)(context) : [] : context.type === "workspace" ? context.components.filter(function (c) {
       return (0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(c);
     }).flatMap(function (c) {

package/dist/build/base/writeDotEnv.js

@@ -27,8 +27,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.componentContextNeedsBuildTimeDotEnv = exports.writeDotEnv = void 0;
 var lodash_1 = require("lodash");
-var gitlab_1 = require("../../utils/gitlab");
+var bashEscape_1 = require("../../bash/bashEscape");
 var getBuildInfoVariables_1 = require("../../context/getBuildInfoVariables");
+var gitlab_1 = require("../../utils/gitlab");
 /**
  * writes a .env file in the components folder
  * @param context
@@ -54,13 +55,14 @@ var writeDotEnv = function (context) {
     var _b = __read(_a, 2),
       key = _b[0],
       value = _b[1];
-    return "".concat(key, "=").concat(value === null || value === void 0 ? void 0 : value.toString().replaceAll("\n", "\\n"));
+    return "".concat(key, "=").concat((0, bashEscape_1.escapeForDotEnv)(value));
   }).join("\n");
-  return (0, gitlab_1.collapseableSection)("write-dotenv-" + context.name, "write dot env")(["cat <<EOF > ".concat(context.build.dir, "/.env\n").concat(keyValueString, "\nEOF")]);
+  return (0, gitlab_1.collapseableSection)("write-dotenv-" + context.name, "write dot env for " + context.name)(["cat <<EOF > ".concat(context.build.dir, "/.env\n").concat(keyValueString, "\nEOF")]);
 };
 exports.writeDotEnv = writeDotEnv;
 var componentContextNeedsBuildTimeDotEnv = function (context) {
-  return context.componentConfig.dotEnv === true; // don't build when set to `local`
+  var _a;
+  return ((_a = context.componentConfig.dotEnv) !== null && _a !== void 0 ? _a : true) === true; // don't build when set to `local`
 };
 
 exports.componentContextNeedsBuildTimeDotEnv = componentContextNeedsBuildTimeDotEnv;

package/dist/build/custom/testJob.js

@@ -55,7 +55,7 @@ var RUNNER_CUSTOM_TEST_VARIABLES = {
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
 var createCustomTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {
@@ -66,9 +66,9 @@ var createCustomTestJobs = function (context) {
     throw new Error("deploy config is not custom");
   }
   var base = {
-    variables: __assign(__assign({
+    variables: __assign({
       APP_PATH: context.build.dir
-    }, context.environment.jobOnlyVars.build.envVars), (_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
+    }, context.environment.jobOnlyVars.build.envVars),
     runnerVariables: RUNNER_CUSTOM_TEST_VARIABLES,
     services: buildConfig.jobServices,
     cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
@@ -79,23 +79,23 @@ var createCustomTestJobs = function (context) {
   var auditJob = buildConfig.audit ? __assign(__assign(__assign({
     name: "🛡 audit"
   }, base), {
-    image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage,
+    image: (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage,
     cache: undefined,
-    script: __spreadArray([], __read((0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)), false),
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)), false),
     allow_failure: true
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifactsReports, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.artifactsReports, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifacts)) : null;
   var lintJob = buildConfig.lint ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
-    image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage,
-    script: __spreadArray([], __read((0, utils_1.ensureArray)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.artifactsReports, (_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.artifacts)) : null;
+    image: (_g = (_f = buildConfig.lint) === null || _f === void 0 ? void 0 : _f.jobImage) !== null && _g !== void 0 ? _g : buildConfig.jobImage,
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.command)), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.artifactsReports, (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.artifacts)) : null;
   var testJob = buildConfig.test ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
-    image: (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage,
-    script: __spreadArray([], __read((0, utils_1.ensureArray)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.artifactsReports, (_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.artifacts)) : null;
+    image: (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage,
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.command)), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.artifactsReports, (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createCustomTestJobs = createCustomTestJobs;

package/dist/build/docker.d.ts

@@ -4,7 +4,7 @@ import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
   DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
-  DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
+  DOCKER_IMAGE: import("..").StringOrBashExpression;
   DOCKER_CACHE_IMAGE: string;
 } | {
   DOCKER_IMAGE_TAG: string;
@@ -20,7 +20,7 @@ export declare const requiresDockerBuild: (context: ComponentContext) => boolean
 export declare const getDockerBuildVariables: (context: ComponentContext) => {
   DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
-  DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
+  DOCKER_IMAGE: import("..").StringOrBashExpression;
   DOCKER_CACHE_IMAGE: string;
   APP_DIR: string;
   DOCKER_BUILD_CONTEXT: string;
@@ -39,7 +39,7 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
 } | {
   DOCKER_IMAGE_TAG: string;
   DOCKER_REGISTRY: string;
-  DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
+  DOCKER_IMAGE: import("..").StringOrBashExpression;
   DOCKER_CACHE_IMAGE: string;
   APP_DIR: string;
   DOCKER_BUILD_CONTEXT: string;

package/dist/build/node/buildJob.js

@@ -58,7 +58,7 @@ var createNodeBuildJobDefinition = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   return (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig, {
     prescript: yarnInstall,
-    cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false)
+    cache: (0, cache_1.getNodeCache)(context)
   });
 };
 exports.createNodeBuildJobDefinition = createNodeBuildJobDefinition;

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

@@ -1,7 +1,5 @@
-import type { Context, WorkspaceContext } from "../../types/context";
+import type { Context } 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[];
+export declare const getNodeCache: (context: Context, policy?: string) => CacheConfig[];

package/dist/build/node/cache.js

@@ -39,7 +39,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getWorkspaceDefaultCaches = exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
+exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
 var lodash_1 = require("lodash");
 var path_1 = require("path");
 var slugify_1 = __importDefault(require("slugify"));
@@ -82,27 +82,6 @@ var getNodeCache = function (context, policy) {
   if (policy === void 0) {
     policy = "pull-push";
   }
-  return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.getYarnCache)(context, policy)), false), __read((0, exports.getNodeModulesCache)(context, policy)), false), __read(context.type === "workspace" ? (0, exports.getWorkspaceDefaultCaches)(context) : []), false);
+  return __spreadArray(__spreadArray([], __read((0, exports.getYarnCache)(context, policy)), false), __read((0, exports.getNodeModulesCache)(context, policy)), false);
 };
-exports.getNodeCache = getNodeCache;
-var getNextCache = function (context) {
-  var paths = context.build.getComponentDirs("direct").map(function (c) {
-    return (0, path_1.join)(c, ".next/cache");
-  });
-  return [{
-    pathMode: "absolute",
-    key: "next-cache",
-    policy: "pull-push",
-    paths: paths
-  }];
-};
-exports.getNextCache = getNextCache;
-var getWorkspaceDefaultCaches = function (context) {
-  return [{
-    // turbo repo
-    key: "turbo",
-    policy: "pull-push",
-    paths: [".turbo"]
-  }];
-};
-exports.getWorkspaceDefaultCaches = getWorkspaceDefaultCaches;
+exports.getNodeCache = getNodeCache;

package/dist/build/node/testJob.js

@@ -54,7 +54,7 @@ var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
 var createJobCache_1 = require("../cache/createJobCache");
 var createNodeTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {
@@ -68,7 +68,7 @@ var createNodeTestJobs = function (context) {
   var base = {
     variables: __assign({
       APP_PATH: context.build.dir
-    }, context.type === "component" ? __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), (_a = context.build.config.extraVars) !== null && _a !== void 0 ? _a : {}) : {}),
+    }, context.type === "component" ? __assign({}, context.environment.jobOnlyVars.build.envVars) : {}),
     runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
     stage: "test",
     needs: [],
@@ -79,26 +79,26 @@ var createNodeTestJobs = function (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,
+    image: (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage,
     cache: undefined,
-    script: __spreadArray(["cd ".concat(context.build.dir)], __read((_e = (0, utils_1.ensureArrayOrNull)((_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
+    script: __spreadArray(["cd ".concat(context.build.dir)], __read((_d = (0, utils_1.ensureArrayOrNull)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : [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;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifactsReports, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifacts)) : null;
   var lintJob = buildConfig.lint !== false ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
-    image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : defaultImage,
+    image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : defaultImage,
     cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (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.ensureArrayOrNull)((_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;
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_k = (0, utils_1.ensureArrayOrNull)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)) !== null && _k !== void 0 ? _k : ["yarn lint"]), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.artifactsReports, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.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"),
+    image: (_p = (_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.jobImage) !== null && _p !== void 0 ? _p : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
     cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (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.ensureArrayOrNull)((_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;
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_r = (0, utils_1.ensureArrayOrNull)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : ["yarn test"]), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.artifactsReports, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createNodeTestJobs = createNodeTestJobs;

package/dist/build/rails/build.js

@@ -79,7 +79,7 @@ var createRailsBuildJobs = function (context) {
   return (0, base_1.createComponentBuildJobs)(context, {
     appBuild: undefined,
     dockerBuild: {
-      variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.build.config.extraVars),
+      variables: __assign({}, context.environment.jobOnlyVars.build.envVars),
       // custom script
       script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["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",
       //  replace private git ssh gem sources with https to make bundler with credentials via env var work

package/dist/build/rails/test.js

@@ -48,7 +48,7 @@ exports.createRailsTestJobs = void 0;
 var __1 = require("../..");
 var utils_1 = require("../../utils");
 var createRailsTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {
@@ -60,7 +60,7 @@ var createRailsTestJobs = function (context) {
   }
   var buildConfig = context.build.config;
   var base = {
-    variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), (_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
+    variables: __assign({}, context.environment.jobOnlyVars.build.envVars),
     stage: "test",
     needs: [],
     envMode: "none"
@@ -80,23 +80,23 @@ var createRailsTestJobs = function (context) {
     name: "🛡 audit"
   }, base), {
     cache: undefined,
-    image: (_d = (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage) !== null && _d !== void 0 ? _d : defaultImage,
-    script: __spreadArray(["cd ".concat(context.build.dir)], __read((_f = (0, utils_1.ensureArrayOrNull)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : ["gem install bundler-audit", "bundle audit check"]), false),
+    image: (_c = (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage) !== null && _c !== void 0 ? _c : defaultImage,
+    script: __spreadArray(["cd ".concat(context.build.dir)], __read((_e = (0, utils_1.ensureArrayOrNull)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : ["gem install bundler-audit", "bundle audit check"]), false),
     allow_failure: true
   }) : null;
   var lintJob = buildConfig.lint !== false ? __assign(__assign({
     name: "👮 lint"
   }, base), {
     cache: bundlerCache,
-    image: (_j = (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage) !== null && _j !== void 0 ? _j : defaultImage,
-    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_l = (0, utils_1.ensureArrayOrNull)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["bundle exec rubocop"]), false)
+    image: (_h = (_g = (_f = buildConfig.lint) === null || _f === void 0 ? void 0 : _f.jobImage) !== null && _g !== void 0 ? _g : buildConfig.jobImage) !== null && _h !== void 0 ? _h : defaultImage,
+    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_k = (0, utils_1.ensureArrayOrNull)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)) !== null && _k !== void 0 ? _k : ["bundle exec rubocop"]), false)
   }) : null;
   var testJob = buildConfig.test !== false ? __assign(__assign({
     name: "🧪 test"
   }, base), {
     cache: bundlerCache,
-    image: (_p = (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage) !== null && _p !== void 0 ? _p : defaultImage,
-    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_r = (0, utils_1.ensureArrayOrNull)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : ["bundle exec rspec"]), false)
+    image: (_o = (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage) !== null && _o !== void 0 ? _o : defaultImage,
+    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_q = (0, utils_1.ensureArrayOrNull)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)) !== null && _q !== void 0 ? _q : ["bundle exec rspec"]), false)
   }) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };