@catladder/cli 0.0.0-main-c009adef → 0.0.0-main-85a0b1ad

package/dist/bundles/catenv/index.js

@@ -666,9 +666,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 var catenv_1 = __importDefault(__nccwpck_require__(6965));
 var parseChoice_1 = __nccwpck_require__(3941);
 var choice = process.argv[2] ? (0, parseChoice_1.parseChoice)(process.argv[2]) : null;
-var now = performance.now();
 (0, catenv_1.default)(choice).then(function () {
-    console.log("catenv", performance.now() - now);
     // we have to exit manually, because we have some file watches
     process.exit();
 });
@@ -2284,7 +2282,7 @@ var createAppBuildJob = function (context, _a) {
         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), [
+            : [])), 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: {
@@ -3020,19 +3018,18 @@ 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) {
+                    ], __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"),
@@ -3052,11 +3049,11 @@ var createNodeBuildJobs = function (context) {
             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
+                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"),
             },
         },
@@ -3102,9 +3099,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
+var lodash_1 = __nccwpck_require__(3255);
 var path_1 = __nccwpck_require__(1017);
 var slugify_1 = __importDefault(__nccwpck_require__(4035));
-var lodash_1 = __nccwpck_require__(3255);
 var getYarnCache = function (context, policy) {
     if (policy === void 0) { policy = "pull-push"; }
     var componentIsInWorkspace = context.packageManagerInfo.componentIsInWorkspace;
@@ -3116,9 +3113,9 @@ var getYarnCache = function (context, 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")],
             },
     ];
 };
@@ -3134,7 +3131,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.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.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([
@@ -3142,7 +3139,7 @@ var getNodeModulesCache = function (context, policy) {
                 ], __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),
+                : [(0, path_1.join)(context.build.dir, "node_modules")])), false),
         },
     ];
 };
@@ -3287,11 +3284,11 @@ 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
@@ -3389,21 +3386,21 @@ 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
+                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;
     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, cache: (0, cache_1.getNodeCache)(context.build), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), 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, 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), [
+        ? __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), 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);
@@ -3466,7 +3463,9 @@ 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);
@@ -3739,7 +3738,7 @@ var createSbomBuildJob = function (context) {
     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
+        "trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.packageManagerInfo.componentIsInWorkspace
             ? "."
             : context.build.dir),
     ];
@@ -4043,9 +4042,9 @@ var createComponentContext = function (ctx) { return __awaiter(void 0, void 0, v
                 context = {
                     fullConfig: ctx.config,
                     componentConfig: componentConfig,
+                    env: ctx.env,
                     build: {
                         dir: dir,
-                        packageManagerInfo: packageManagerInfo,
                         config: build,
                     },
                     deploy: deploy
@@ -6425,7 +6424,7 @@ var createCustomDeployJobs = function (context) {
         throw new Error("deploy config is not custom");
     }
     // FIXME: custom deploy currently assumes yarn-based project
-    var yarnInstall = (0, yarn_1.getYarnInstall)(context.build, {
+    var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
         noCustomPostInstall: true,
     });
     return (0, base_1.createDeployementJobs)(context, {

package/dist/bundles/cli/index.js

@@ -9728,7 +9728,7 @@ var createAppBuildJob = function (context, _a) {
         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), [
+            : [])), 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: {
@@ -10464,19 +10464,18 @@ 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) {
+                    ], __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"),
@@ -10496,11 +10495,11 @@ var createNodeBuildJobs = function (context) {
             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
+                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"),
             },
         },
@@ -10546,9 +10545,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
+var lodash_1 = __nccwpck_require__(23255);
 var path_1 = __nccwpck_require__(71017);
 var slugify_1 = __importDefault(__nccwpck_require__(44035));
-var lodash_1 = __nccwpck_require__(23255);
 var getYarnCache = function (context, policy) {
     if (policy === void 0) { policy = "pull-push"; }
     var componentIsInWorkspace = context.packageManagerInfo.componentIsInWorkspace;
@@ -10560,9 +10559,9 @@ var getYarnCache = function (context, 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")],
             },
     ];
 };
@@ -10578,7 +10577,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.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.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([
@@ -10586,7 +10585,7 @@ var getNodeModulesCache = function (context, policy) {
                 ], __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),
+                : [(0, path_1.join)(context.build.dir, "node_modules")])), false),
         },
     ];
 };
@@ -10731,11 +10730,11 @@ 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
@@ -10833,21 +10832,21 @@ 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
+                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;
     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, cache: (0, cache_1.getNodeCache)(context.build), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), 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, 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), [
+        ? __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), 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);
@@ -10910,7 +10909,9 @@ 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);
@@ -11183,7 +11184,7 @@ var createSbomBuildJob = function (context) {
     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
+        "trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.packageManagerInfo.componentIsInWorkspace
             ? "."
             : context.build.dir),
     ];
@@ -11487,9 +11488,9 @@ var createComponentContext = function (ctx) { return __awaiter(void 0, void 0, v
                 context = {
                     fullConfig: ctx.config,
                     componentConfig: componentConfig,
+                    env: ctx.env,
                     build: {
                         dir: dir,
-                        packageManagerInfo: packageManagerInfo,
                         config: build,
                     },
                     deploy: deploy
@@ -13869,7 +13870,7 @@ var createCustomDeployJobs = function (context) {
         throw new Error("deploy config is not custom");
     }
     // FIXME: custom deploy currently assumes yarn-based project
-    var yarnInstall = (0, yarn_1.getYarnInstall)(context.build, {
+    var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
         noCustomPostInstall: true,
     });
     return (0, base_1.createDeployementJobs)(context, {

package/dist/cli/src/catenv.js

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var catenv_1 = __importDefault(require("./apps/catenv/catenv"));
 var parseChoice_1 = require("./config/parseChoice");
 var choice = process.argv[2] ? (0, parseChoice_1.parseChoice)(process.argv[2]) : null;
-var now = performance.now();
 (0, catenv_1.default)(choice).then(function () {
-    console.log("catenv", performance.now() - now);
     // we have to exit manually, because we have some file watches
     process.exit();
 });

package/dist/cli/src/catenv.js.map

@@ -1 +1 @@
-{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAE1C,oDAAmD;AAEnD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAErE,IAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;AAC9B,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC;IAC/C,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAE1C,oDAAmD;AAEnD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAErE,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAClB,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}

package/dist/pipeline/src/build/base/createAppBuildJob.js

@@ -70,7 +70,7 @@ var createAppBuildJob = function (context, _a) {
         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), [
+            : [])), 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: {

package/dist/pipeline/src/build/base/createAppBuildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAC/B,6BAA4B;AAE5B,2BAAuC;AAEvC,qCAA0C;AAC1C,qCAAiD;AACjD,yCAGqB;AACrB,mDAAkD;AAClD,6CAGuB;AAGhB,IAAM,iBAAiB,GAAG,UAC/B,OAAyB,EACzB,EAAqE;;IAAnE,IAAA,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,eAAe,qBAAA,EAAK,GAAG,cAA5C,0CAA8C,CAAF;IAE5C,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,EAAE;QACT,SAAS,0CACJ,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,GACjB,OAAO,CAAC,WAAW,CAAC,OAAO,GAC3B,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC,CAC1C;QACD,eAAe,iCACV,2CAA+B,GAC/B,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC,GACvB,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC,CAChD;QAED,MAAM,mFACD,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;YAC/C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,kBACJ,IAAA,+BAAc,EAAC,OAAO,CAAC,kBACvB,IAAA,wBAAiB,EAAC,OAAO,CAAC,KAAK,CAAC;YACnC,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;0BACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAM,CAAC,mCAAI,EAAE,CAAC,SAC/B;QACD,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;YACrD,OAAO,EAAE;gBACP,KAAK,EAAE,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,0CAAE,KAAK,0CAAE,GAAG,CAAC,UAAC,CAAC;oBACzD,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAA1B,CAA0B,CAC3B;aACF;SACF;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,iBAAiB,qBA4C5B"}
+{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAC/B,6BAA4B;AAE5B,2BAAuC;AAEvC,qCAA0C;AAC1C,qCAAiD;AACjD,yCAGqB;AACrB,mDAAkD;AAClD,6CAGuB;AAGhB,IAAM,iBAAiB,GAAG,UAC/B,OAAyB,EACzB,EAAqE;;IAAnE,IAAA,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,eAAe,qBAAA,EAAK,GAAG,cAA5C,0CAA8C,CAAF;IAE5C,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,EAAE;QACT,SAAS,0CACJ,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,GACjB,OAAO,CAAC,WAAW,CAAC,OAAO,GAC3B,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC,CAC1C;QACD,eAAe,iCACV,2CAA+B,GAC/B,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC,GACvB,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC,CAChD;QAED,MAAM,mFACD,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;YAC/C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,kBACJ,IAAA,+BAAc,EAAC,OAAO,CAAC,kBACvB,IAAA,wBAAiB,EAAC,OAAO,CAAC;YAC7B,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;0BACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAM,CAAC,mCAAI,EAAE,CAAC,SAC/B;QACD,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;YACrD,OAAO,EAAE;gBACP,KAAK,EAAE,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,0CAAE,KAAK,0CAAE,GAAG,CAAC,UAAC,CAAC;oBACzD,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAA1B,CAA0B,CAC3B;aACF;SACF;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,iBAAiB,qBA4C5B"}

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

@@ -42,19 +42,18 @@ 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) {
+                    ], __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"),
@@ -74,11 +73,11 @@ var createNodeBuildJobs = function (context) {
             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
+                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/pipeline/src/build/node/buildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAG9C,qCAA0C;AAC1C,gCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AACzC,iCAAmE;AACnE,yCAA0D;AAC1D,+BAAwE;AAEjE,IAAM,mBAAmB,GAAG,UACjC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,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,KAAK,CAAC,GAAG;8BAEd,CAAC,MAAA,OAAO,CAAC,kBAAkB,CAAC,4BAA4B,mCACzD,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,kDAAyC,EAC/C,OAAO,EACP,WAAW,CAAC,IAAI,KAAK,aAAa,IAAI,WAAW,CAAC,IAAI,KAAK,WAAW;gBACpE,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,MAAM,CACX;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,OAAO,CAAC,kBAAkB,CAAC,mBAAmB;qBAC3C,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;AAlEW,QAAA,mBAAmB,uBAkE9B"}

package/dist/pipeline/src/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/pipeline/src/build/node/cache.js

@@ -29,9 +29,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 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"; }
     var componentIsInWorkspace = context.packageManagerInfo.componentIsInWorkspace;
@@ -43,9 +43,9 @@ var getYarnCache = function (context, 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")],
             },
     ];
 };
@@ -61,7 +61,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.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.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([
@@ -69,7 +69,7 @@ var getNodeModulesCache = function (context, policy) {
                 ], __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),
+                : [(0, path_1.join)(context.build.dir, "node_modules")])), false),
         },
     ];
 };

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,OAAqB,EACrB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IACpD,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,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IAEpD,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,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC;oBAC9C,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"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA8B;AAC9B,6BAA4B;AAC5B,oDAA8B;AAIvB,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IACpD,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,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO;gBACzC,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aAC1C;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,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IAEpD,uNAAuN;IACvN,0HAA0H;IAC1H,OAAO;QACL;YACE,wFAAwF;YACxF,GAAG,EAAE,sBAAsB;gBACzB,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,+LAA+L;YACjP,MAAM,QAAA;YACN,KAAK,2BACA,CAAC,sBAAsB;gBACxB,CAAC,CAAC,IAAA,aAAI;oBACF,cAAc;0BACX,CAAC,MAAA,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC;oBAC9C,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,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,SAC/C;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,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/meteor.js

@@ -50,11 +50,11 @@ 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/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,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"}
+{"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,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,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.js

@@ -59,21 +59,21 @@ 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
+                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;
     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, cache: (0, cache_1.getNodeCache)(context.build), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), 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, 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), [
+        ? __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), 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/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 { 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/pipeline/src/build/node/yarn.js

@@ -47,7 +47,9 @@ 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);