@catladder/cli 0.0.0-next-d71e41ba → 0.0.0-next-dccc0a36

package/dist/packages/pipeline/src/customImages/projectImages.d.ts

@@ -0,0 +1,67 @@
+import type { GitlabJobImage } from "../types/gitlab-types";
+/**
+ * a docker image declared by the project (`config.images`): built
+ * automatically in the pipeline, content-hashed into the project's own
+ * registry and rebuilt only when its inputs change.
+ */
+type ProjectImageCommon = {
+    /**
+     * the docker build context, relative to the repository root.
+     *
+     * Defaults to `dir` for a directory-based image, and to the
+     * repository root (`.`) for an inline `dockerfile`.
+     *
+     * NOTE: the context itself is not hashed — only the Dockerfile (or
+     * `dir`), `buildArgs` and `hashExtraPaths` are. List files that are
+     * `COPY`ed from a wider context in `hashExtraPaths` if changing them
+     * should rebuild the image.
+     */
+    context?: string;
+    /**
+     * extra files that influence the image content — they become part of
+     * the content hash and the change detection
+     */
+    hashExtraPaths?: string[];
+    /**
+     * docker `--build-arg` values passed to the image build, part of the
+     * content hash
+     */
+    buildArgs?: Record<string, string>;
+};
+/**
+ * where the image definition comes from: a directory in the repository
+ * containing a `Dockerfile`, or an inline Dockerfile written straight
+ * into the config (materialized into the generated files)
+ */
+export type ProjectImageConfig = ProjectImageCommon & ({
+    /**
+     * directory containing the `Dockerfile`, relative to the
+     * repository root. Also the default build context.
+     */
+    dir: string;
+    dockerfile?: never;
+} | {
+    /**
+     * the Dockerfile content, as one string or as lines. Written to
+     * `.catladder-generated/images/project/<name>/Dockerfile`; the
+     * build context defaults to the repository root.
+     */
+    dockerfile: string | string[];
+    dir?: never;
+});
+/**
+ * a reference to a project-declared job image (`config.images`), usable
+ * in every `jobImage` field. The pipeline backends resolve it to the
+ * concrete content-hashed image url in the project registry.
+ */
+export type ProjectImageRef = {
+    /** the key of the image in `config.images` */
+    image: string;
+};
+export declare const isProjectImageRef: (value: unknown) => value is ProjectImageRef;
+/**
+ * everything a `jobImage` config field accepts: a concrete image (url
+ * or gitlab image object) or a reference to a project-declared image
+ */
+export type JobImageConfig = GitlabJobImage | ProjectImageRef;
+export {};

package/dist/packages/pipeline/src/customImages/projectImages.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isProjectImageRef = void 0;
+const isProjectImageRef = (value) => typeof value === "object" &&
+    value !== null &&
+    "image" in value &&
+    typeof value.image === "string";
+exports.isProjectImageRef = isProjectImageRef;
+//# sourceMappingURL=projectImages.js.map

package/dist/packages/pipeline/src/customImages/projectImages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projectImages.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/customImages/projectImages.ts"],"names":[],"mappings":";;;AAoEO,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAA4B,EAAE,CAC5E,OAAO,KAAK,KAAK,QAAQ;IACzB,KAAK,KAAK,IAAI;IACd,OAAO,IAAI,KAAK;IAChB,OAAQ,KAAyB,CAAC,KAAK,KAAK,QAAQ,CAAC;AAJ1C,QAAA,iBAAiB,qBAIyB"}

package/dist/packages/pipeline/src/deploy/custom/deployJob.js

@@ -2,19 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCustomDeployJobs = void 0;
 const getAllCacheConfigsFromConfig_1 = require("../../build/cache/getAllCacheConfigsFromConfig");
-const yarn_1 = require("../../build/node/yarn");
+const packageManagerInstall_1 = require("../../build/node/packageManagerInstall");
 const runner_1 = require("../../runner");
 const base_1 = require("../base");
 const types_1 = require("../types");
 const createCustomDeployJobs = async (context) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
         // should not happen
         throw new Error("deploy config is not custom");
     }
-    // FIXME: custom deploy currently assumes yarn-based project
-    const yarnInstall = await (0, yarn_1.getYarnInstall)(context, {
+    const packageManagerInstall = await (0, packageManagerInstall_1.getPackageManagerInstall)(context, {
         noCustomPostInstall: true,
     });
     const result = (0, base_1.createDeployementJobs)(context, {
@@ -26,14 +25,16 @@ const createCustomDeployJobs = async (context) => {
                 : undefined,
             script: [
                 `cd ${context.build.dir}`,
-                ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
+                ...(((_c = deployConfig.requiresInstall) !== null && _c !== void 0 ? _c : deployConfig.requiresYarnInstall)
+                    ? packageManagerInstall
+                    : []),
                 ...deployConfig.script,
             ],
             variables: {},
         },
         stop: deployConfig.stopScript
             ? {
-                image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
+                image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
                 script: [...deployConfig.stopScript],
                 variables: {},
             }

package/dist/packages/pipeline/src/deploy/custom/deployJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,gDAAuD;AACvD,yCAA8C;AAG9C,kCAAgD;AAEhD,oCAA0C;AAEnC,MAAM,sBAAsB,GAAG,KAAK,EACzC,OAAyB,EACA,EAAE;;IAC3B,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAc,EAAC,OAAO,EAAE;QAChD,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,4BAAqB,EAAC,OAAO,EAAE;QAC5C,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,SAAS,EAAE,YAAY,CAAC,cAAc;gBACpC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,cAAc,EAAE;gBACxC,CAAC,CAAC,SAAS;YACb,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,GAAG,YAAY,CAAC,MAAM;aACvB;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,EAAE,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC;gBACpC,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AArCW,QAAA,sBAAsB,0BAqCjC"}
+{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,kFAAkF;AAClF,yCAA8C;AAG9C,kCAAgD;AAEhD,oCAA0C;AAEnC,MAAM,sBAAsB,GAAG,KAAK,EACzC,OAAyB,EACA,EAAE;;IAC3B,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,MAAM,qBAAqB,GAAG,MAAM,IAAA,gDAAwB,EAAC,OAAO,EAAE;QACpE,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,4BAAqB,EAAC,OAAO,EAAE;QAC5C,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,SAAS,EAAE,YAAY,CAAC,cAAc;gBACpC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,cAAc,EAAE;gBACxC,CAAC,CAAC,SAAS;YACb,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,CAAC,MAAA,YAAY,CAAC,eAAe,mCAAI,YAAY,CAAC,mBAAmB,CAAC;oBACpE,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,YAAY,CAAC,MAAM;aACvB;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,EAAE,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC;gBACpC,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAtCW,QAAA,sBAAsB,0BAsCjC"}

package/dist/packages/pipeline/src/deploy/pages/deployJob.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPagesDeployJobs = void 0;
 const getAllCacheConfigsFromConfig_1 = require("../../build/cache/getAllCacheConfigsFromConfig");
-const yarn_1 = require("../../build/node/yarn");
+const packageManagerInstall_1 = require("../../build/node/packageManagerInstall");
 const runner_1 = require("../../runner");
 const base_1 = require("../base");
 const types_1 = require("../types");
 const createPagesDeployJobs = async (context) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, types_1.isOfDeployType)(deployConfig, "pages")) {
         // should not happen
@@ -22,7 +22,7 @@ const createPagesDeployJobs = async (context) => {
     // parallel deployments) — every merge request gets a site preview
     const pathPrefix = context.environment.envType === "review" ? "mr-$CI_MERGE_REQUEST_IID" : "";
     const publishDir = (_b = deployConfig.publishDir) !== null && _b !== void 0 ? _b : "public";
-    const yarnInstall = await (0, yarn_1.getYarnInstall)(context, {
+    const packageManagerInstall = await (0, packageManagerInstall_1.getPackageManagerInstall)(context, {
         noCustomPostInstall: true,
     });
     return (0, base_1.createDeployementJobs)(context, {
@@ -33,7 +33,9 @@ const createPagesDeployJobs = async (context) => {
             pages: { path_prefix: pathPrefix },
             script: [
                 `cd ${context.build.dir}`,
-                ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
+                ...(((_d = deployConfig.requiresInstall) !== null && _d !== void 0 ? _d : deployConfig.requiresYarnInstall)
+                    ? packageManagerInstall
+                    : []),
                 ...deployConfig.script,
                 // the gitlab environment url should point at the published site
                 // (the base deploy job reports $ROOT_URL as environment url)

package/dist/packages/pipeline/src/deploy/pages/deployJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/pages/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,gDAAuD;AACvD,yCAA8C;AAG9C,kCAAgD;AAChD,oCAA0C;AAEnC,MAAM,qBAAqB,GAAG,KAAK,EACxC,OAAyB,EACA,EAAE;;IAC3B,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;QAC3C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,OAAO,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QACtC,oEAAoE;QACpE,OAAO,CAAC,IAAI,CACV,cAAc,OAAO,CAAC,IAAI,gGAAgG,CAC3H,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,kEAAkE;IAClE,kEAAkE;IAClE,MAAM,UAAU,GACd,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,MAAM,UAAU,GAAG,MAAA,YAAY,CAAC,UAAU,mCAAI,QAAQ,CAAC;IAEvD,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAc,EAAC,OAAO,EAAE;QAChD,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE;YAClC,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;YAClC,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,GAAG,YAAY,CAAC,MAAM;gBACtB,gEAAgE;gBAChE,6DAA6D;gBAC7D,iCAAiC,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG;aACvE;YACD,SAAS,EAAE,EAAE;YACb,eAAe,EAAE;gBACf,0DAA0D;gBAC1D,YAAY,EAAE,UAAU;gBACxB,iEAAiE;gBACjE,+DAA+D;gBAC/D,yBAAyB,EAAE,KAAK;gBAChC,uBAAuB,EAAE,KAAK;aAC/B;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAnDW,QAAA,qBAAqB,yBAmDhC"}
+{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/pages/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,kFAAkF;AAClF,yCAA8C;AAG9C,kCAAgD;AAChD,oCAA0C;AAEnC,MAAM,qBAAqB,GAAG,KAAK,EACxC,OAAyB,EACA,EAAE;;IAC3B,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;QAC3C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,OAAO,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QACtC,oEAAoE;QACpE,OAAO,CAAC,IAAI,CACV,cAAc,OAAO,CAAC,IAAI,gGAAgG,CAC3H,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,kEAAkE;IAClE,kEAAkE;IAClE,MAAM,UAAU,GACd,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,MAAM,UAAU,GAAG,MAAA,YAAY,CAAC,UAAU,mCAAI,QAAQ,CAAC;IAEvD,MAAM,qBAAqB,GAAG,MAAM,IAAA,gDAAwB,EAAC,OAAO,EAAE;QACpE,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE;YAClC,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;YAClC,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,CAAC,MAAA,YAAY,CAAC,eAAe,mCAAI,YAAY,CAAC,mBAAmB,CAAC;oBACpE,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,YAAY,CAAC,MAAM;gBACtB,gEAAgE;gBAChE,6DAA6D;gBAC7D,iCAAiC,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG;aACvE;YACD,SAAS,EAAE,EAAE;YACb,eAAe,EAAE;gBACf,0DAA0D;gBAC1D,YAAY,EAAE,UAAU;gBACxB,iEAAiE;gBACjE,+DAA+D;gBAC/D,yBAAyB,EAAE,KAAK;gBAChC,uBAAuB,EAAE,KAAK;aAC/B;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AArDW,QAAA,qBAAqB,yBAqDhC"}

package/dist/packages/pipeline/src/deploy/types/custom.d.ts

@@ -1,5 +1,5 @@
 import type { WithCacheConfig } from "../../build";
-import type { GitlabJobImage } from "../../types";
+import type { JobImageConfig } from "../../customImages/projectImages";
 import type { DeployConfigBase } from "./base";
 export type DeployConfigCustom = {
     /**
@@ -11,7 +11,13 @@ export type DeployConfigCustom = {
      */
     requiresDocker: boolean;
     /**
-     * whether your custom script requires yarn install
+     * whether your custom script requires the package-manager install
+     * (yarn/pnpm, autodetected) to run first
+     */
+    requiresInstall?: boolean;
+    /**
+     * @deprecated use {@link requiresInstall} — same behavior (the
+     * install always uses the project's detected package manager)
      */
     requiresYarnInstall?: boolean;
     /**
@@ -25,7 +31,7 @@ export type DeployConfigCustom = {
     /**
      * image to use
      */
-    jobImage?: GitlabJobImage;
+    jobImage?: JobImageConfig;
     /**
      * job artifact paths the deploy produces (relative to the repo root)
      */

package/dist/packages/pipeline/src/deploy/types/index.d.ts

@@ -15,17 +15,17 @@ export type DeployConfigType = DeployConfig["type"];
 export type DeployConfigGeneric<T extends DeployConfigType> = Extract<DeployConfig, {
     type: T;
 }>;
-export declare const isOfDeployType: <T extends ("custom" | "kubernetes" | "dockerTag" | "google-cloudrun" | "npmPackage" | "pages")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigCustom, {
+export declare const isOfDeployType: <T extends ("custom" | "kubernetes" | "pages" | "google-cloudrun" | "dockerTag" | "npmPackage")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigKubernetes, {
     type: T[number];
-}> | Extract<DeployConfigDockerTag, {
+}> | Extract<DeployConfigCustom, {
     type: T[number];
 }> | Extract<DeployConfigCloudRun, {
     type: T[number];
-}> | Extract<DeployConfigKubernetes, {
+}> | Extract<DeployConfigDockerTag, {
     type: T[number];
 }> | Extract<DeployConfigNpmPackage, {
     type: T[number];
 }> | Extract<DeployConfigPages, {
     type: T[number];
 }>;
-export declare const getDeployConfigType: (t: DeployConfig | false | null | undefined) => "custom" | "kubernetes" | "dockerTag" | "google-cloudrun" | "npmPackage" | "pages";
+export declare const getDeployConfigType: (t: DeployConfig | false | null | undefined) => "custom" | "kubernetes" | "pages" | "google-cloudrun" | "dockerTag" | "npmPackage";

package/dist/packages/pipeline/src/deploy/types/pages.d.ts

@@ -1,5 +1,5 @@
 import type { WithCacheConfig } from "../../build";
-import type { GitlabJobImage } from "../../types";
+import type { JobImageConfig } from "../../customImages/projectImages";
 import type { DeployConfigBase } from "./base";
 export type DeployConfigPages = {
     /**
@@ -27,11 +27,17 @@ export type DeployConfigPages = {
      */
     publishDir?: string;
     /**
-     * whether the script needs `yarn install` first
+     * whether the script needs the package-manager install (yarn/pnpm,
+     * autodetected) to run first
+     */
+    requiresInstall?: boolean;
+    /**
+     * @deprecated use {@link requiresInstall} — same behavior (the
+     * install always uses the project's detected package manager)
      */
     requiresYarnInstall?: boolean;
     /**
      * image to use
      */
-    jobImage?: GitlabJobImage;
+    jobImage?: JobImageConfig;
 } & DeployConfigBase & WithCacheConfig;

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

@@ -3,6 +3,8 @@ export * from "./backends";
 export * from "./types";
 export * from "./rules";
 export * from "./runner";
+export * from "./customImages/projectImages";
+export * from "./customImages/jobImagesPlan";
 export * from "./config";
 export * from "./store";
 export * from "./context";

package/dist/packages/pipeline/src/index.js

@@ -19,6 +19,8 @@ __exportStar(require("./backends"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./rules"), exports);
 __exportStar(require("./runner"), exports);
+__exportStar(require("./customImages/projectImages"), exports);
+__exportStar(require("./customImages/jobImagesPlan"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./store"), exports);
 __exportStar(require("./context"), exports);

package/dist/packages/pipeline/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/pipeline/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,6CAA2B;AAC3B,0CAAwB;AACxB,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,4CAA0B;AAC1B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,qDAAmC;AACnC,sDAAoC;AACpC,kDAAgC;AAChC,2CAAyB;AACzB,gDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/pipeline/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,6CAA2B;AAC3B,0CAAwB;AACxB,0CAAwB;AACxB,2CAAyB;AACzB,+DAA6C;AAC7C,+DAA6C;AAC7C,2CAAyB;AACzB,0CAAwB;AACxB,4CAA0B;AAC1B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,qDAAmC;AACnC,sDAAoC;AACpC,kDAAgC;AAChC,2CAAyB;AACzB,gDAA8B"}

package/dist/packages/pipeline/src/pipeline/detectPackageManager.d.ts

@@ -0,0 +1,18 @@
+import memoizee from "memoizee";
+import type { PackageManagerType } from "../types/context";
+export type DetectedPackageManager = {
+    type: PackageManagerType;
+    version: string;
+};
+/**
+ * detect which package manager the project uses (and its version).
+ *
+ * Order: the `packageManager` field in package.json (cwd, then git root)
+ * wins, then the lockfile present (pnpm-lock.yaml → pnpm, yarn.lock →
+ * yarn), then falling back to yarn (the historical default).
+ *
+ * An `explicitType` (from `packageManager` in catladder.ts) overrides the
+ * detected type; the version is still taken from the `packageManager`
+ * field when it pins the same manager, otherwise from the installed CLI.
+ */
+export declare const detectPackageManager: ((explicitType?: PackageManagerType) => Promise<DetectedPackageManager>) & memoizee.Memoized<(explicitType?: PackageManagerType) => Promise<DetectedPackageManager>>;

package/dist/packages/pipeline/src/pipeline/detectPackageManager.js

@@ -0,0 +1,76 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectPackageManager = void 0;
+const child_process_promise_1 = require("child-process-promise");
+const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+const memoizee_1 = __importDefault(require("memoizee"));
+const readPackageManagerField = async (dir) => {
+    try {
+        const pkg = JSON.parse(await (0, promises_1.readFile)((0, path_1.join)(dir, "package.json"), "utf-8"));
+        const match = /^(yarn|pnpm)@(.+)$/.exec(pkg.packageManager);
+        if (!match)
+            return null;
+        return { type: match[1], version: match[2] };
+    }
+    catch (_a) {
+        return null;
+    }
+};
+const detectByLockfile = (dir) => {
+    if ((0, fs_1.existsSync)((0, path_1.join)(dir, "pnpm-lock.yaml")))
+        return "pnpm";
+    if ((0, fs_1.existsSync)((0, path_1.join)(dir, "yarn.lock")))
+        return "yarn";
+    return null;
+};
+const getGitRoot = async () => {
+    try {
+        return (await (0, child_process_promise_1.exec)("git rev-parse --show-toplevel")).stdout.trim();
+    }
+    catch (_a) {
+        return null;
+    }
+};
+const getInstalledVersion = async (type) => {
+    try {
+        return (await (0, child_process_promise_1.exec)(`${type} --version`)).stdout.trim();
+    }
+    catch (_a) {
+        return "";
+    }
+};
+/**
+ * detect which package manager the project uses (and its version).
+ *
+ * Order: the `packageManager` field in package.json (cwd, then git root)
+ * wins, then the lockfile present (pnpm-lock.yaml → pnpm, yarn.lock →
+ * yarn), then falling back to yarn (the historical default).
+ *
+ * An `explicitType` (from `packageManager` in catladder.ts) overrides the
+ * detected type; the version is still taken from the `packageManager`
+ * field when it pins the same manager, otherwise from the installed CLI.
+ */
+exports.detectPackageManager = (0, memoizee_1.default)(async (explicitType) => {
+    var _a, _b;
+    const roots = [process.cwd()];
+    const gitRoot = await getGitRoot();
+    if (gitRoot && gitRoot !== process.cwd())
+        roots.push(gitRoot);
+    let fromField = null;
+    for (const root of roots) {
+        fromField = await readPackageManagerField(root);
+        if (fromField)
+            break;
+    }
+    const detectedType = (_b = (_a = explicitType !== null && explicitType !== void 0 ? explicitType : fromField === null || fromField === void 0 ? void 0 : fromField.type) !== null && _a !== void 0 ? _a : roots.map(detectByLockfile).find(Boolean)) !== null && _b !== void 0 ? _b : "yarn";
+    const version = (fromField === null || fromField === void 0 ? void 0 : fromField.type) === detectedType
+        ? fromField.version
+        : await getInstalledVersion(detectedType);
+    return { type: detectedType, version };
+}, { promise: true });
+//# sourceMappingURL=detectPackageManager.js.map

package/dist/packages/pipeline/src/pipeline/detectPackageManager.js.map

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

package/dist/packages/pipeline/src/pipeline/packageManager.d.ts

@@ -1,4 +1,4 @@
 import type { Config, PackageManagerInfoBase, PackageManagerInfoComponent } from "../types";
 import memoizee from "memoizee";
 export declare const getPackageManagerInfoForComponent: (config: Config, componentName: string) => Promise<PackageManagerInfoComponent>;
-export declare const getPackageManagerInfoBase: (() => Promise<PackageManagerInfoBase>) & memoizee.Memoized<() => Promise<PackageManagerInfoBase>>;
+export declare const getPackageManagerInfoBase: ((config?: Config) => Promise<PackageManagerInfoBase>) & memoizee.Memoized<(config?: Config) => Promise<PackageManagerInfoBase>>;

package/dist/packages/pipeline/src/pipeline/packageManager.js

@@ -7,12 +7,23 @@ exports.getPackageManagerInfoBase = exports.getPackageManagerInfoForComponent =
 const fs_1 = require("fs");
 const path_1 = require("path");
 const path_equal_1 = require("path-equal");
+const detectPackageManager_1 = require("./detectPackageManager");
+const pnpmUtils_1 = require("./pnpm/pnpmUtils");
 const yarnUtils_1 = require("./yarn/yarnUtils");
 const memoizee_1 = __importDefault(require("memoizee"));
+const PACKAGE_MANAGER_FILES = {
+    yarn: {
+        lockFile: "yarn.lock",
+        configFiles: [".yarnrc", ".yarnrc.yml", ".npmrc", ".yarn"], // ".yarn" is yarn 2 folder
+    },
+    pnpm: {
+        lockFile: "pnpm-lock.yaml",
+        configFiles: ["pnpm-workspace.yaml", ".npmrc", ".pnpmfile.cjs"],
+    },
+};
 const getPackageManagerInfoForComponent = async (config, componentName) => {
-    const baseInfo = await (0, exports.getPackageManagerInfoBase)();
+    const baseInfo = await (0, exports.getPackageManagerInfoBase)(config);
     const { workspaces } = baseInfo;
-    // currently only supports yarn
     const component = config.components[componentName];
     const currentWorkspace = workspaces.find((w) => (0, path_equal_1.pathEqual)(component.dir, w.location));
     const componentIsInWorkspace = Boolean(currentWorkspace);
@@ -21,10 +32,10 @@ const getPackageManagerInfoForComponent = async (config, componentName) => {
     const workspacePackageJson = componentIsInWorkspace
         ? (0, path_1.join)(workspaceRoot, "package.json")
         : null;
+    const { lockFile: lockFileName, configFiles } = PACKAGE_MANAGER_FILES[baseInfo.type];
     const lockFile = componentIsInWorkspace
-        ? (0, path_1.join)(workspaceRoot, "yarn.lock")
-        : (0, path_1.join)(component.dir, "yarn.lock");
-    const configFiles = [".yarnrc", ".yarnrc.yml", ".npmrc", ".yarn"]; // ".yarn" is yarn 2 folder
+        ? (0, path_1.join)(workspaceRoot, lockFileName)
+        : (0, path_1.join)(component.dir, lockFileName);
     // copy all those configFiles from workspace root and/or component folder
     const configFilePaths = [
         ...configFiles,
@@ -35,12 +46,27 @@ const getPackageManagerInfoForComponent = async (config, componentName) => {
     const currentWorkspaceDependencies = currentWorkspace
         ? (0, yarnUtils_1.getWorkspaceDependencies)(currentWorkspace, workspaces)
         : [];
+    // pnpm's --frozen-lockfile check requires every importer of the
+    // lockfile to exist on disk, so all workspace manifests (not just the
+    // dependency workspaces, which are copied entirely) go into the image
+    const allWorkspaceManifests = baseInfo.type === "pnpm" && componentIsInWorkspace
+        ? workspaces
+            .map((w) => (0, path_1.join)(w.location, "package.json"))
+            .filter((f) => (0, fs_1.existsSync)(f))
+        : [];
+    // patch files referenced by patchedDependencies must exist in the
+    // image, or pnpm's frozen install fails verifying them
+    const patchFiles = baseInfo.type === "pnpm"
+        ? (0, pnpmUtils_1.getPnpmPatchFiles)(componentIsInWorkspace ? workspaceRoot : component.dir)
+        : [];
     const pathsToCopyInDocker = [
         ...new Set([
             packageJson,
             ...(workspacePackageJson ? [workspacePackageJson] : []),
             lockFile,
             ...configFilePaths,
+            ...allWorkspaceManifests,
+            ...patchFiles,
             ...currentWorkspaceDependencies,
         ]),
     ];
@@ -53,11 +79,17 @@ const getPackageManagerInfoForComponent = async (config, componentName) => {
     };
 };
 exports.getPackageManagerInfoForComponent = getPackageManagerInfoForComponent;
-const _getPackageManagerInfoBase = async () => {
-    // currently only supports yarn
-    const version = await (0, yarnUtils_1.getYarnVersion)();
+const _getPackageManagerInfoBase = async (config) => {
+    const { type, version } = await (0, detectPackageManager_1.detectPackageManager)(config === null || config === void 0 ? void 0 : config.packageManager);
     if (!version)
-        throw new Error("could not get yarn version");
+        throw new Error(`could not get ${type} version`);
+    if (type === "pnpm") {
+        return {
+            type: "pnpm",
+            workspaces: await (0, pnpmUtils_1.getPnpmWorkspaces)(),
+            version,
+        };
+    }
     const isClassic = version.startsWith("1");
     const workspaces = await (0, yarnUtils_1.getWorkspaces)(isClassic);
     return {
@@ -69,5 +101,7 @@ const _getPackageManagerInfoBase = async () => {
 };
 exports.getPackageManagerInfoBase = (0, memoizee_1.default)(_getPackageManagerInfoBase, {
     promise: true,
+    // memoize per explicit packageManager choice, not per config identity
+    normalizer: ([config]) => { var _a; return (_a = config === null || config === void 0 ? void 0 : config.packageManager) !== null && _a !== void 0 ? _a : ""; },
 });
 //# sourceMappingURL=packageManager.js.map

package/dist/packages/pipeline/src/pipeline/packageManager.js.map

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

package/dist/packages/pipeline/src/pipeline/pnpm/pnpmUtils.d.ts

@@ -0,0 +1,14 @@
+import memoizee from "memoizee";
+import type { YarnWorkspace } from "../../types";
+/**
+ * patch files referenced by `patchedDependencies` (pnpm-workspace.yaml
+ * or the root package.json's `pnpm` section) — they must travel into
+ * the docker build context, or the prod install fails to verify them
+ */
+export declare const getPnpmPatchFiles: (root?: string) => string[];
+/**
+ * list pnpm workspace projects in the same shape yarn berry reports them
+ * (locations relative to the project root, workspace dependencies as
+ * locations). Outside a pnpm workspace this returns [].
+ */
+export declare const getPnpmWorkspaces: (() => Promise<Array<YarnWorkspace>>) & memoizee.Memoized<() => Promise<Array<YarnWorkspace>>>;

package/dist/packages/pipeline/src/pipeline/pnpm/pnpmUtils.js

@@ -0,0 +1,93 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPnpmWorkspaces = exports.getPnpmPatchFiles = void 0;
+const child_process_promise_1 = require("child-process-promise");
+const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+const memoizee_1 = __importDefault(require("memoizee"));
+const yaml_1 = require("yaml");
+const jsonParse_1 = require("../../utils/jsonParse");
+const readWorkspaceDependencyLocations = async (location, locationByName) => {
+    var _a, _b, _c;
+    try {
+        const pkg = JSON.parse(await (0, promises_1.readFile)((0, path_1.join)(location, "package.json"), "utf-8"));
+        const depNames = [
+            ...Object.keys((_a = pkg.dependencies) !== null && _a !== void 0 ? _a : {}),
+            ...Object.keys((_b = pkg.devDependencies) !== null && _b !== void 0 ? _b : {}),
+            ...Object.keys((_c = pkg.optionalDependencies) !== null && _c !== void 0 ? _c : {}),
+        ];
+        return [
+            ...new Set(depNames
+                .map((name) => locationByName.get(name))
+                .filter((l) => Boolean(l) && l !== location)),
+        ];
+    }
+    catch (_d) {
+        return [];
+    }
+};
+/**
+ * patch files referenced by `patchedDependencies` (pnpm-workspace.yaml
+ * or the root package.json's `pnpm` section) — they must travel into
+ * the docker build context, or the prod install fails to verify them
+ */
+const getPnpmPatchFiles = (root = ".") => {
+    var _a, _b, _c;
+    const patchedDependencies = {};
+    try {
+        const ws = (0, yaml_1.parse)((0, fs_1.readFileSync)((0, path_1.join)(root, "pnpm-workspace.yaml"), "utf-8"));
+        Object.assign(patchedDependencies, (_a = ws === null || ws === void 0 ? void 0 : ws.patchedDependencies) !== null && _a !== void 0 ? _a : {});
+    }
+    catch (_d) {
+        // no workspace file
+    }
+    try {
+        const pkg = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(root, "package.json"), "utf-8"));
+        Object.assign(patchedDependencies, (_c = (_b = pkg === null || pkg === void 0 ? void 0 : pkg.pnpm) === null || _b === void 0 ? void 0 : _b.patchedDependencies) !== null && _c !== void 0 ? _c : {});
+    }
+    catch (_e) {
+        // no package.json
+    }
+    return [
+        ...new Set(Object.values(patchedDependencies)
+            .map((p) => (0, path_1.join)(root, p))
+            .filter((p) => (0, fs_1.existsSync)(p))),
+    ];
+};
+exports.getPnpmPatchFiles = getPnpmPatchFiles;
+/**
+ * list pnpm workspace projects in the same shape yarn berry reports them
+ * (locations relative to the project root, workspace dependencies as
+ * locations). Outside a pnpm workspace this returns [].
+ */
+// export for mocking
+exports.getPnpmWorkspaces = (0, memoizee_1.default)(async () => {
+    let output;
+    try {
+        output = (await (0, child_process_promise_1.exec)("pnpm m ls --json --depth -1")).stdout;
+    }
+    catch (_a) {
+        return [];
+    }
+    const projects = (0, jsonParse_1.jsonParseOrThrow)(output.trim() || "[]");
+    if (!Array.isArray(projects))
+        return [];
+    const withLocations = projects
+        .filter((p) => p.name && p.path)
+        .map((p) => ({
+        name: p.name,
+        location: (0, path_1.relative)(process.cwd(), p.path) || ".",
+    }));
+    const locationByName = new Map(withLocations.map((p) => [p.name, p.location]));
+    return Promise.all(withLocations.map(async ({ name, location }) => ({
+        name,
+        location,
+        workspaceDependencies: await readWorkspaceDependencyLocations(location, locationByName),
+        mismatchedWorkspaceDependencies: [],
+    })));
+}, { promise: true });
+//# sourceMappingURL=pnpmUtils.js.map

package/dist/packages/pipeline/src/pipeline/pnpm/pnpmUtils.js.map

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