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

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":";;;;;;AAAA,2BAAgC;AAChC,+BAA4B;AAC5B,2CAAuC;AAMvC,gDAI0B;AAC1B,wDAAgC;AAEzB,MAAM,iCAAiC,GAAG,KAAK,EACpD,MAAc,EACd,aAAqB,EACiB,EAAE;IACxC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAyB,GAAE,CAAC;IACnD,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;IAChC,+BAA+B;IAE/B,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACnD,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC7C,IAAA,sBAAS,EAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CACrC,CAAC;IACF,MAAM,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,GAAG,CAAC,CAAC,mFAAmF;IAC9G,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,SAAS,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACxD,MAAM,oBAAoB,GAAG,sBAAsB;QACjD,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,cAAc,CAAC;QACrC,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,QAAQ,GAAG,sBAAsB;QACrC,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,CAAC;QAClC,CAAC,CAAC,IAAA,WAAI,EAAC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACrC,MAAM,WAAW,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,2BAA2B;IAC9F,yEAAyE;IAEzE,MAAM,eAAe,GAAG;QACtB,GAAG,WAAW;QACd,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;KAClD,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAU,EAAC,CAAC,CAAC,CAAC,CAAC;IAE/B,gDAAgD;IAChD,gDAAgD;IAChD,MAAM,4BAA4B,GAAG,gBAAgB;QACnD,CAAC,CAAC,IAAA,oCAAwB,EAAC,gBAAgB,EAAE,UAAU,CAAC;QACxD,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,mBAAmB,GAAG;QAC1B,GAAG,IAAI,GAAG,CAAC;YACT,WAAW;YACX,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvD,QAAQ;YACR,GAAG,eAAe;YAClB,GAAG,4BAA4B;SAChC,CAAC;KACH,CAAC;IACF,OAAO;QACL,GAAG,QAAQ;QACX,gBAAgB;QAChB,4BAA4B;QAC5B,sBAAsB;QACtB,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC;AApDW,QAAA,iCAAiC,qCAoD5C;AAEF,MAAM,0BAA0B,GAC9B,KAAK,IAAqC,EAAE;IAC1C,+BAA+B;IAE/B,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAc,GAAE,CAAC;IACvC,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAa,EAAC,SAAS,CAAC,CAAC;IAElD,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,UAAU;QACV,OAAO;QACP,SAAS;KACV,CAAC;AACJ,CAAC,CAAC;AAES,QAAA,yBAAyB,GAAG,IAAA,kBAAQ,EAAC,0BAA0B,EAAE;IAC5E,OAAO,EAAE,IAAI;CACd,CAAC,CAAC"}
+{"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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"}

package/dist/packages/pipeline/src/types/config.d.ts

@@ -1,7 +1,7 @@
 import type { BuildConfig } from "../build/types";
 import type { DeployConfig } from "../deploy/types";
 import type { CatladderJobSpec } from "./jobs";
-import type { ComponentContext } from "./context";
+import type { ComponentContext, PackageManagerType } from "./context";
 import type { PartialDeep } from "./utils";
 import type { PipelineType, WorkspaceBuildConfig } from "..";
 import type { AgentConfig } from "./agent";
@@ -255,6 +255,13 @@ export type Config<C extends ConfigProps = never> = {
      * how secrets are stored and shared (see {@link SecretsConfig})
      */
     secrets?: SecretsConfig;
+    /**
+     * which package manager the project uses. Usually not needed:
+     * catladder autodetects it from the `packageManager` field in
+     * package.json or the lockfile present (pnpm-lock.yaml / yarn.lock),
+     * falling back to yarn. Set it to override the detection.
+     */
+    packageManager?: PackageManagerType;
     /**
      * materialize the agent skills shipped with catladder (usage guides
      * for AI coding agents like Claude Code) into the repository, so

package/dist/packages/pipeline/src/types/context.d.ts

@@ -45,23 +45,31 @@ export type YarnWorkspace = {
     workspaceDependencies: string[];
     mismatchedWorkspaceDependencies: string[];
 };
+export type PackageManagerType = "yarn" | "pnpm";
 export type YarnPackageManagerInfoBase = {
     type: "yarn";
     version: string;
     workspaces: YarnWorkspace[];
     isClassic: boolean;
 };
-export type YarnPackageManagerInfoComponent = YarnPackageManagerInfoBase & {
+export type PnpmPackageManagerInfoBase = {
+    type: "pnpm";
+    version: string;
+    workspaces: YarnWorkspace[];
+};
+type PackageManagerInfoComponentPart = {
     currentWorkspace?: YarnWorkspace;
     componentIsInWorkspace: boolean;
     pathsToCopyInDocker: string[];
     currentWorkspaceDependencies: string[];
 };
-export type PackageManagerInfoComponent = YarnPackageManagerInfoComponent;
+export type YarnPackageManagerInfoComponent = YarnPackageManagerInfoBase & PackageManagerInfoComponentPart;
+export type PnpmPackageManagerInfoComponent = PnpmPackageManagerInfoBase & PackageManagerInfoComponentPart;
+export type PackageManagerInfoComponent = YarnPackageManagerInfoComponent | PnpmPackageManagerInfoComponent;
 /**
  * not confuse with yarn workspaces
  */
-export type PackageManagerInfoBase = YarnPackageManagerInfoBase;
+export type PackageManagerInfoBase = YarnPackageManagerInfoBase | PnpmPackageManagerInfoBase;
 export type ContextBeforeConfig = {
     componentName: string;
     fullConfig: Config;

package/dist/packages/pipeline/src/types/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/types/context.ts"],"names":[],"mappings":";;;AA8LO,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACK,EAAE;IACvD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC;AAC7C,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C;AAEK,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACQ,EAAE;IAC1D,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC;AAChD,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/types/context.ts"],"names":[],"mappings":";;;AAiNO,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACK,EAAE;IACvD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC;AAC7C,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C;AAEK,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACQ,EAAE;IAC1D,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC;AAChD,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C"}

package/dist/packages/pipeline/src/verify/createVerifyJobs.js

@@ -4,7 +4,7 @@ exports.createVerifyJobs = exports.VERIFY_JOB_NAME = void 0;
 const createArtifactsConfig_1 = require("../build/base/createArtifactsConfig");
 const cache_1 = require("../build/node/cache");
 const constants_1 = require("../build/node/constants");
-const yarn_1 = require("../build/node/yarn");
+const packageManagerInstall_1 = require("../build/node/packageManagerInstall");
 const deploy_1 = require("../deploy");
 const runner_1 = require("../runner");
 const utils_1 = require("../utils");
@@ -21,9 +21,9 @@ const createVerifyJobs = async (context) => {
         return [];
     }
     const isNodeBuild = context.build.type !== "disabled" && context.build.buildType === "node";
-    const [yarnInstall, nodeCache] = isNodeBuild
+    const [packageManagerInstall, nodeCache] = isNodeBuild
         ? await Promise.all([
-            (0, yarn_1.getYarnInstall)(context),
+            (0, packageManagerInstall_1.getPackageManagerInstall)(context),
             (0, cache_1.getNodeCache)(context, "pull"),
         ])
         : [null, null];
@@ -59,9 +59,9 @@ const createVerifyJobs = async (context) => {
             },
             script: [
                 ...setupScript,
-                ...(yarnInstall ? (0, yarn_1.ensureNodeVersion)(context) : []),
+                ...(packageManagerInstall ? (0, packageManagerInstall_1.ensureNodeVersion)(context) : []),
                 `cd ${context.build.dir}`,
-                ...(yarnInstall !== null && yarnInstall !== void 0 ? yarnInstall : []),
+                ...(packageManagerInstall !== null && packageManagerInstall !== void 0 ? packageManagerInstall : []),
                 ...(0, utils_1.ensureArray)(verifyConfig.command),
             ],
             allow_failure: verifyConfig.allowFailure,

package/dist/packages/pipeline/src/verify/createVerifyJobs.js.map

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

package/dist/runner-images/docker-build/scripts/ensureNodeDockerfile

@@ -35,10 +35,17 @@ FROM node:$NODE_VERSION-alpine
 $DOCKERFILE_ADDITIONS
 
 RUN apk add --no-cache git curl
-USER node
+# package-manager setup (e.g. installing pnpm globally) and the
+# workspace-file copy run as root: pnpm ADDs a tar whose extracted
+# parent dirs come out root-owned (ADD --chown only covers the files),
+# so it needs a root chown before the node user can write node_modules.
+# The actual install below still runs as the unprivileged node user.
+$DOCKER_SETUP_PACKAGE_MANAGER
 
 $DOCKER_COPY_WORKSPACE_FILES
 
+USER node
+
 WORKDIR /app/$APP_DIR
 
 $DOCKER_COPY_AND_INSTALL_APP

package/dist/runner-images/jobs-default/Dockerfile

@@ -9,6 +9,10 @@ RUN rm /bin/sh && \
 # set high timeout for yarn, see https://github.com/dhis2/notes/issues/29
 RUN yarn config set network-timeout 600000 -g
 
+# pnpm for projects using it (pnpm self-switches to the version pinned
+# in the project's packageManager field)
+RUN npm install -g pnpm
+
 # install nvm && some common node versions
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash && \
     source /root/.nvm/nvm.sh && \

package/dist/skills/catladder-builds/SKILL.md

@@ -28,11 +28,26 @@ components: {
 Set `build: false` to disable building for a component (e.g. a
 deploy-only or docker-tag component).
 
+Node-family builds work with **yarn or pnpm**: catladder autodetects the
+package manager (from the `packageManager` field in package.json or the
+lockfile) and generates the matching install commands, caches and
+default build/lint/test commands. Override with `packageManager:
+"pnpm" | "yarn"` at the top level of `catladder.ts` if needed. The
+`meteor` build type is yarn-only.
+
+pnpm gotchas: dependency build scripts must be approved in
+pnpm-workspace.yaml (`allowBuilds` map since pnpm 11,
+`onlyBuiltDependencies` list on pnpm 10); pnpm runs the root
+`prepare` script even during the production install in the docker
+build — guard husky with `"prepare": "husky || true"`; `pnpm run`
+prints a banner to stdout, so use `pnpm --silent run` in piped
+commands.
+
 ## Build types
 
 | Type | Use for | Notes |
 |---|---|---|
-| `node` | Node/JS apps (Next.js, Vite, plain node) | default `yarn build` + `yarn start`; `docker` selects the runtime image |
+| `node` | Node/JS apps (Next.js, Vite, plain node) | default `<pm> build` + `<pm> start` (yarn or pnpm, autodetected); `docker` selects the runtime image |
 | `rails` | Ruby on Rails apps | Cloud Native Buildpacks when there is no `Dockerfile`; Postgres test DB |
 | `meteor` | Meteor apps | starts `node main.js` |
 | `custom` | anything else | you provide the `jobImage` and `docker` config (both required) |
@@ -46,8 +61,9 @@ type: `build: { from: "web" }` (see workspace builds below).
 - `buildCommand` — the build step (`string | string[] | null | false`;
   `false`/`null` skips building).
 - `startCommand` — how the app is started at runtime.
-- `postInstall` — commands run after `yarn install` (node family; needed
-  e.g. for Yarn PnP where `package.json` postinstall won't run).
+- `postInstall` — commands run after the package-manager install (node
+  family; needed e.g. for Yarn PnP where `package.json` postinstall
+  won't run).
 - `lint` / `test` / `audit` — customize (`{ command, jobImage, … }`) or
   set to `false` to disable that job.
 - `artifactsPaths` / `artifactsExcludePaths` — extra build artifacts

package/dist/skills/catladder-builds/references/build-types.md

@@ -10,7 +10,7 @@ generated pipeline files.
 |---|---|---|
 | `buildCommand` | `string \| string[] \| null \| false` | build step; `false`/`null` skips it |
 | `startCommand` | `string` | runtime start command |
-| `postInstall` | `string \| string[]` | runs after `yarn install` (node family) |
+| `postInstall` | `string \| string[]` | runs after the package-manager install (node family) |
 | `lint` / `test` / `audit` | `false \| TestJobCustom` | customize or disable the job |
 | `artifactsPaths` | `string[]` | extra artifacts (`dist`, `.next` always included) |
 | `artifactsExcludePaths` | `string[]` | artifact excludes |
@@ -29,8 +29,9 @@ generated pipeline files.
 ## Per-type options & defaults
 
 ### `node`
-- `docker?` — built-in node image `{ type: "node", yarnRebuildEnabled?: boolean (default true), additionsBegin?: string[], additionsEnd?: string[] }`, or a custom docker config.
-- Defaults: `buildCommand: "yarn build"`, `startCommand: "yarn start"`, artifacts `["dist", ".next"]`, excludes `[".next/cache/**/*"]`.
+- Works with yarn **and pnpm** — the package manager is autodetected (`packageManager` field / lockfile), overridable via top-level `packageManager: "pnpm" | "yarn"` in `catladder.ts`.
+- `docker?` — built-in node image `{ type: "node", yarnRebuildEnabled?: boolean (default true, yarn berry only), additionsBegin?: string[], additionsEnd?: string[] }`, or a custom docker config.
+- Defaults: `buildCommand: "<pm> build"`, `startCommand: "<pm> start"` (`yarn`/`pnpm` per detection), artifacts `["dist", ".next"]`, excludes `[".next/cache/**/*"]`.
 
 ### `rails`
 - `test?.databaseImage?` — test DB container image (Postgres only; default `docker.io/postgres:latest`).
@@ -41,6 +42,7 @@ generated pipeline files.
   - `buildVars?: Record<string, string | undefined>` — Bundler / Rails asset-precompile vars (`undefined` inherits from the component's env vars).
 
 ### `meteor`
+- Yarn-only (meteor's bundler is yarn-based) — a pnpm project cannot use this build type.
 - `installScripts?: boolean` — run `yarn install` inside the source folder in the image (only needed with custom image scripts).
 - `docker?` — meteor built-in or custom. Default `startCommand: "node main.js"`.
 
@@ -68,5 +70,5 @@ defaulted `buildCommand: "yarn build-storybook --quiet -o ./dist"`.
 Top-level `builds: Record<string, WorkspaceBuildConfig>`. Only
 `type: "node"` is supported.
 
-- Node workspace build: `dir?`, `buildCommand?` (default `yarn build`), `dockerDefaults?: { yarnRebuildEnabled }`, plus shared `lint?` (default `{ command: "yarn lint" }`), `test?` (default `{ command: "yarn test" }`), `audit?`, `runnerVariables?`, `artifactsReports?`, `jobImage?`, `jobTags?`, `cache?`.
+- Node workspace build: `dir?`, `buildCommand?` (default `<pm> build`), `dockerDefaults?: { yarnRebuildEnabled }`, plus shared `lint?` (default `{ command: "<pm> lint" }`), `test?` (default `{ command: "<pm> test" }`), `audit?`, `runnerVariables?`, `artifactsReports?`, `jobImage?`, `jobTags?`, `cache?` (`<pm>` = `yarn`/`pnpm` per detection).
 - A component references it via `build: { from: "<name>", docker?, startCommand?, artifactsPaths?, artifactsExcludePaths?, cache? }` — the per-component overrides layer on top of the shared build.

package/dist/skills/catladder-cli/references/commands.md

@@ -3,8 +3,9 @@
 <!-- rendered from the command definitions by
      apps/cli/src/scripts/generateCliSkillReference.ts — do not edit -->
 
-All commands run non-interactively as `yarn catladder <command> ...`;
-see SKILL.md for how to pass inputs.
+All commands run non-interactively as `yarn catladder <command> ...`
+(`pnpm catladder ...` in pnpm projects); see SKILL.md for how to
+pass inputs.
 
 ## `catladder cloudsql restore-db`
 

package/dist/skills/catladder-config/SKILL.md

@@ -64,6 +64,11 @@ Key concepts:
 - **Pipelines**: `pipelines: { gitlab: true, github: true }` selects
   which CI systems get generated files. Options objects instead of
   `true` allow per-pipeline settings (e.g. `runnerVariables`).
+- **Package manager**: yarn and pnpm are supported and autodetected
+  (from the `packageManager` field in package.json or the lockfile;
+  yarn is the fallback). `packageManager: "pnpm" | "yarn"` at the top
+  level overrides the detection. In pnpm projects, run the CLIs as
+  `pnpm catenv` / `pnpm catladder`.
 
 ## Common tasks
 

package/dist/skills/catladder-deploys/SKILL.md

@@ -121,7 +121,7 @@ docs: {
   build: false,
   deploy: {
     type: "pages",
-    requiresYarnInstall: true,
+    requiresInstall: true,
     script: ["yarn workspace docs build"],
   },
 },

package/dist/skills/catladder-deploys/references/deploy-types.md

@@ -61,7 +61,7 @@ resources with `yarn catladder project setup`; detect drift with
 - `type: "pages"` — **required**. Publishes a static site on gitlab pages (not yet supported on the github backend).
 - `script: string[]` — **required**; produces the site.
 - `publishDir?: string` — output directory relative to the repo root, default `"public"`.
-- `requiresYarnInstall?: boolean` — run `yarn install` first.
+- `requiresInstall?: boolean` — run the package-manager install (yarn/pnpm) first (`requiresYarnInstall` is a deprecated alias).
 - `jobImage?: GitlabJobImage`; also accepts `cache`.
 - Review envs publish under an `mr-<iid>` path prefix (parallel deployments → MR previews; exposed as `$PAGES_PREFIX`); other envs publish at the root. The environment url is the published pages url.
 - Defaults to `allowFailure: true`.
@@ -75,7 +75,7 @@ resources with `yarn catladder project setup`; detect drift with
 - `type: "custom"` — **required**.
 - `requiresDocker: boolean` — **required**; whether the deploy needs a built Docker image.
 - `script: string[]` — **required**; the deploy script.
-- `requiresYarnInstall?: boolean` — whether the script needs `yarn install`.
+- `requiresInstall?: boolean` — whether the script needs the package-manager install (`requiresYarnInstall` is a deprecated alias).
 - `stopScript?: string[]` — script to stop/tear down the environment.
 - `jobImage?: GitlabJobImage`.
 - Also accepts `cache` (via `WithCacheConfig`).

package/dist/skills/catladder-pipelines/SKILL.md

@@ -39,7 +39,9 @@ edit.
 ## Caching
 
 Cache configuration is generated per build type; node builds cache
-`node_modules` and the yarn cache. GitLab uses mutable caches with
+`node_modules` and the package manager's download cache (the `.yarn`
+zip cache, or for pnpm projects a project-local `.pnpm-store`). GitLab
+uses mutable caches with
 fallback keys (review branches fall back to the dev cache); GitHub uses
 immutable lockfile-keyed caches where only the build job writes.
 Caching behavior is changed via the build config in `catladder.ts`,