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

package/dist/bundles/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/bundles/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/bundles/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/bundles/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/bundles/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/bundles/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/bundles/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/bundles/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/bundles/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`,

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

@@ -7,7 +7,7 @@ const jobs_1 = require("../../types/jobs");
 const utils_1 = require("../../utils");
 const removeUndefined_1 = require("../../utils/removeUndefined");
 const createBuildJobArtifact_1 = require("../artifacts/createBuildJobArtifact");
-const yarn_1 = require("../node/yarn");
+const packageManagerInstall_1 = require("../node/packageManagerInstall");
 const constants_1 = require("./constants");
 const writeBuildInfo_1 = require("./writeBuildInfo");
 const writeDotEnv_1 = require("./writeDotEnv");
@@ -47,7 +47,7 @@ class AppBuildJob extends jobs_1.CatladderJob {
                             .flatMap((c) => (0, writeDotEnv_1.writeDotEnv)(c))
                         : []),
                 ...(context.type === "component" ? (0, writeBuildInfo_1.writeBuildInfo)(context) : []),
-                ...(0, yarn_1.ensureNodeVersion)(context), // in pure node repos, we might want to have the nvmrc file in top-level
+                ...(0, packageManagerInstall_1.ensureNodeVersion)(context), // in pure node repos, we might want to have the nvmrc file in top-level
                 `cd ${context.build.dir}`,
                 ...(0, utils_1.ensureArray)(script),
             ],

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

@@ -1 +1 @@
-{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAMtC,6BAAuC;AAGvC,2CAAgD;AAChD,uCAA0C;AAC1C,iEAA8D;AAC9D,gFAA8E;AAC9E,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAEvB,MAAa,WAAY,SAAQ,mBAAY;IAC3C,YACE,OAAoE,EACpE,EACE,MAAM,EACN,SAAS,EACT,eAAe,EACf,KAAK,EACL,GAAG,GAAG,EACgB,EACxB,SAAgC;;QAEhC,KAAK,CAAC;YACJ,IAAI,EAAE,8BAAkB;YACxB,OAAO,EAAE,WAAW;YACpB,KAAK,EAAE,OAAO;YACd,QAAQ,EAAE,CAAC,gBAAgB,CAAC;YAC5B,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;YACrC,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,KAAK;YACb,SAAS,EAAE;gBACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;gBACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC9B,CAAC,CAAC;wBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;wBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;qBACjD;oBACH,CAAC,CAAC,EAAE,CAAC;aACR;YACD,eAAe,EAAE;gBACf,GAAG,2CAA+B;gBAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;gBAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;aAChD;YAED,MAAM,EAAE;gBACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;wBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;wBACtB,CAAC,CAAC,EAAE;oBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;wBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;6BACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;6BACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;wBACnC,CAAC,CAAC,EAAE,CAAC;gBACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;gBACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;aACvB;YACD,SAAS;YACT,gEAAgE;YAChE,iEAAiE;YACjE,mEAAmE;YACnE,4CAA4C;YAC5C,GAAG,IAAA,qBAAS,EAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC;SACnC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,OAAoE,EACpE,UAAiC;QAEjC,OAAO,IAAI,WAAW,CACpB,OAAO,EACP,UAAU,EACV,MAAM,IAAA,gDAAuB,EAAC,OAAO,CAAC,CACvC,CAAC;IACJ,CAAC;CACF;AArED,kCAqEC"}
+{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAMtC,6BAAuC;AAGvC,2CAAgD;AAChD,uCAA0C;AAC1C,iEAA8D;AAC9D,gFAA8E;AAC9E,yEAAkE;AAClE,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAEvB,MAAa,WAAY,SAAQ,mBAAY;IAC3C,YACE,OAAoE,EACpE,EACE,MAAM,EACN,SAAS,EACT,eAAe,EACf,KAAK,EACL,GAAG,GAAG,EACgB,EACxB,SAAgC;;QAEhC,KAAK,CAAC;YACJ,IAAI,EAAE,8BAAkB;YACxB,OAAO,EAAE,WAAW;YACpB,KAAK,EAAE,OAAO;YACd,QAAQ,EAAE,CAAC,gBAAgB,CAAC;YAC5B,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;YACrC,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,KAAK;YACb,SAAS,EAAE;gBACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;gBACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC9B,CAAC,CAAC;wBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;wBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;qBACjD;oBACH,CAAC,CAAC,EAAE,CAAC;aACR;YACD,eAAe,EAAE;gBACf,GAAG,2CAA+B;gBAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;gBAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;aAChD;YAED,MAAM,EAAE;gBACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;wBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;wBACtB,CAAC,CAAC,EAAE;oBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;wBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;6BACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;6BACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;wBACnC,CAAC,CAAC,EAAE,CAAC;gBACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,GAAG,IAAA,yCAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;gBACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;aACvB;YACD,SAAS;YACT,gEAAgE;YAChE,iEAAiE;YACjE,mEAAmE;YACnE,4CAA4C;YAC5C,GAAG,IAAA,qBAAS,EAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC;SACnC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,OAAoE,EACpE,UAAiC;QAEjC,OAAO,IAAI,WAAW,CACpB,OAAO,EACP,UAAU,EACV,MAAM,IAAA,gDAAuB,EAAC,OAAO,CAAC,CACvC,CAAC;IACJ,CAAC;CACF;AArED,kCAqEC"}

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

@@ -1,4 +1,4 @@
-import type { ComponentContextWithBuild, WorkspaceContext } from "../types/context";
+import type { ComponentContextWithBuild, PackageManagerType, WorkspaceContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { BuildConfig, BuildConfigStandaloneType, WorkspaceBuildConfig } from "./types";
@@ -7,7 +7,7 @@ export * from "./types";
 export type BuildTypes = {
     [type in BuildConfigStandaloneType]: {
         jobs: (context: ComponentContextWithBuild) => CatladderJob[] | Promise<CatladderJob[]>;
-        defaults: (envContext: EnvironmentContext) => Partial<Extract<BuildConfig, {
+        defaults: (envContext: EnvironmentContext, packageManager: PackageManagerType) => Partial<Extract<BuildConfig, {
             type: type;
         }>>;
     };
@@ -16,7 +16,7 @@ export declare const BUILD_TYPES: BuildTypes;
 export type WorkspaceBuildTypes = {
     [type in WorkspaceBuildConfig["type"]]: {
         jobs: (context: WorkspaceContext) => CatladderJob[] | Promise<CatladderJob[]>;
-        defaults: () => Partial<Extract<WorkspaceBuildConfig, {
+        defaults: (packageManager: PackageManagerType) => Partial<Extract<WorkspaceBuildConfig, {
             type: type;
         }>>;
     };

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

@@ -20,27 +20,32 @@ const node_1 = require("./node");
 const rails_1 = require("./rails");
 __exportStar(require("./node"), exports);
 __exportStar(require("./types"), exports);
+/**
+ * run a package.json script with the project's package manager
+ * (`yarn build` / `pnpm build`)
+ */
+const runScript = (packageManager, script) => `${packageManager} ${script}`;
 exports.BUILD_TYPES = {
     node: {
         jobs: node_1.createNodeJobs,
-        defaults: () => ({
-            buildCommand: "yarn build",
-            startCommand: "yarn start",
+        defaults: (_, pm) => ({
+            buildCommand: runScript(pm, "build"),
+            startCommand: runScript(pm, "start"),
             artifactsPaths: ["dist", ".next"],
             artifactsExcludePaths: [".next/cache/**/*"],
         }),
     },
     "node-static": {
         jobs: node_1.createNodeJobs,
-        defaults: () => ({
-            buildCommand: "yarn build",
+        defaults: (_, pm) => ({
+            buildCommand: runScript(pm, "build"),
             artifactsPaths: ["dist"],
         }),
     },
     storybook: {
         jobs: node_1.createStorybookJobs,
-        defaults: () => ({
-            buildCommand: ["yarn build-storybook --quiet -o ./dist"],
+        defaults: (_, pm) => ({
+            buildCommand: [runScript(pm, "build-storybook --quiet -o ./dist")],
             artifactsPaths: ["dist"],
         }),
     },
@@ -70,13 +75,13 @@ exports.BUILD_TYPES = {
 exports.WORKSPACE_BUILD_TYPES = {
     node: {
         jobs: node_1.createNodeJobs,
-        defaults: () => ({
-            buildCommand: "yarn build",
+        defaults: (pm) => ({
+            buildCommand: runScript(pm, "build"),
             lint: {
-                command: "yarn lint",
+                command: runScript(pm, "lint"),
             },
             test: {
-                command: "yarn test",
+                command: runScript(pm, "test"),
             },
         }),
     },

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAOA,qCAA4C;AAC5C,iCAA+E;AAC/E,mCAA0C;AAO1C,yCAAuB;AACvB,0CAAwB;AAaX,QAAA,WAAW,GAAe;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACjC,qBAAqB,EAAE,CAAC,kBAAkB,CAAC;SAC5C,CAAC;KACH;IACD,aAAa,EAAE;QACb,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,SAAS,EAAE;QACT,IAAI,EAAE,0BAAmB;QACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,CAAC,wCAAwC,CAAC;YACxD,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,uBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,cAAc;YAC5B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,yBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,KAAK,EAAE;QACL,IAAI,EAAE,uBAAe;QACrB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,QAAQ;aACtB;SACF,CAAC;KACH;CACF,CAAC;AAWW,QAAA,qBAAqB,GAAwB;IACxD,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;SACF,CAAC;KACH;CACF,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAQA,qCAA4C;AAC5C,iCAA+E;AAC/E,mCAA0C;AAO1C,yCAAuB;AACvB,0CAAwB;AAExB;;;GAGG;AACH,MAAM,SAAS,GAAG,CAAC,cAAkC,EAAE,MAAc,EAAE,EAAE,CACvE,GAAG,cAAc,IAAI,MAAM,EAAE,CAAC;AAcnB,QAAA,WAAW,GAAe;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACpB,YAAY,EAAE,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;YACpC,YAAY,EAAE,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;YACpC,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACjC,qBAAqB,EAAE,CAAC,kBAAkB,CAAC;SAC5C,CAAC;KACH;IACD,aAAa,EAAE;QACb,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACpB,YAAY,EAAE,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;YACpC,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,SAAS,EAAE;QACT,IAAI,EAAE,0BAAmB;QACzB,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACpB,YAAY,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,mCAAmC,CAAC,CAAC;YAClE,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,uBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,cAAc;YAC5B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,yBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,KAAK,EAAE;QACL,IAAI,EAAE,uBAAe;QACrB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,QAAQ;aACtB;SACF,CAAC;KACH;CACF,CAAC;AAaW,QAAA,qBAAqB,GAAwB;IACxD,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACjB,YAAY,EAAE,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;YACpC,IAAI,EAAE;gBACJ,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC;aAC/B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC;aAC/B;SACF,CAAC;KACH;CACF,CAAC"}

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

@@ -6,7 +6,7 @@ const base_1 = require("../base");
 const createBuildJobDefinition_1 = require("../base/createBuildJobDefinition");
 const docker_1 = require("../docker");
 const cache_1 = require("./cache");
-const yarn_1 = require("./yarn");
+const packageManagerInstall_1 = require("./packageManagerInstall");
 const createNodeBuildJobs = async (context) => {
     if (context.type === "workspace") {
         return (0, base_1.createWorkspaceBuildJobs)(context, {
@@ -23,18 +23,17 @@ const createNodeBuildJobs = async (context) => {
 exports.createNodeBuildJobs = createNodeBuildJobs;
 const createNodeBuildJobDefinition = async (context) => {
     const buildConfig = context.build.config;
-    const [yarnInstall, nodeCache] = await Promise.all([
-        (0, yarn_1.getYarnInstall)(context),
+    const [packageManagerInstall, nodeCache] = await Promise.all([
+        (0, packageManagerInstall_1.getPackageManagerInstall)(context),
         (0, cache_1.getNodeCache)(context),
     ]);
     return (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig, {
-        prescript: yarnInstall,
+        prescript: packageManagerInstall,
         cache: nodeCache,
     });
 };
 exports.createNodeBuildJobDefinition = createNodeBuildJobDefinition;
 const createNodeDockerJobDefinition = async (context) => {
-    var _a;
     // get the default docker built-in type based on the build type
     const dockerDefaultBuiltIn = context.build.buildType === "node-static" ||
         context.build.buildType === "storybook"
@@ -42,16 +41,58 @@ const createNodeDockerJobDefinition = async (context) => {
         : "node";
     const [yarnCache, dockerAppCopyAndBuildScript, packageManagerInfo] = await Promise.all([
         (0, cache_1.getYarnCache)(context, "pull"),
-        (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
+        (0, packageManagerInstall_1.getDockerAppCopyAndBuildScript)(context),
         context.packageManagerInfo,
     ]);
+    // the pnpm store (pulled via the cache above) is copied into the
+    // image so the prod install works offline — like the yarn zip cache,
+    // which travels inside the copied `.yarn` config folder
+    const copyPnpmStore = packageManagerInfo.type === "pnpm" &&
+        packageManagerInfo.componentIsInWorkspace;
+    // pnpm copies every workspace manifest into the image — as individual
+    // COPY instructions that many layers exceed docker's depth limit, so
+    // the job tars them up and a single ADD extracts them
+    const isPnpm = packageManagerInfo.type === "pnpm";
+    const WORKSPACE_FILES_TAR = ".catladder-workspace-files.tar";
     return {
-        script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, dockerDefaultBuiltIn),
+        script: [
+            // the COPY source must exist even when the cache was cold
+            ...(copyPnpmStore ? ["mkdir -p .pnpm-store"] : []),
+            ...(isPnpm
+                ? [
+                    `tar -cf ${WORKSPACE_FILES_TAR} ${packageManagerInfo.pathsToCopyInDocker.join(" ")}`,
+                ]
+                : []),
+            ...(0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, dockerDefaultBuiltIn),
+        ],
         cache: [...yarnCache],
         variables: {
             // only required for non static
             DOCKER_COPY_AND_INSTALL_APP: dockerAppCopyAndBuildScript,
-            DOCKER_COPY_WORKSPACE_FILES: (_a = packageManagerInfo === null || packageManagerInfo === void 0 ? void 0 : packageManagerInfo.pathsToCopyInDocker.map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)) === null || _a === void 0 ? void 0 : _a.join("\n"),
+            DOCKER_COPY_WORKSPACE_FILES: isPnpm
+                ? [
+                    `ADD ${WORKSPACE_FILES_TAR} /app/`,
+                    // ADD does not apply --chown to extracted tars, and parent
+                    // dirs of the entries come out root-owned — fix ownership
+                    // while the stage still runs as root (store not copied yet,
+                    // so this only touches the small manifest tree). Custom
+                    // base images without a node user run as root and don't
+                    // need it, hence the fallback
+                    `RUN chown -R node:node /app || true`,
+                    ...(copyPnpmStore
+                        ? [`COPY --chown=node:node .pnpm-store /app/.pnpm-store`]
+                        : []),
+                ].join("\n")
+                : packageManagerInfo.pathsToCopyInDocker
+                    .map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)
+                    .join("\n"),
+            // pnpm is not preinstalled in the node base images; installed as
+            // root before the image switches to the node user
+            ...(isPnpm
+                ? {
+                    DOCKER_SETUP_PACKAGE_MANAGER: `RUN npm install -g pnpm@${packageManagerInfo.version}`,
+                }
+                : {}),
         },
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;AAKA,iDAG6B;AAM7B,kCAA6E;AAC7E,+EAA4E;AAC5E,sCAAsE;AAEtE,mCAAqD;AACrD,iCAAwE;AAEjE,MAAM,mBAAmB,GAAG,KAAK,EACtC,OAAqD,EAC5B,EAAE;IAC3B,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,MAAM,IAAA,oCAA4B,EAAC,OAAO,CAAC;SACtD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,IAAA,2CAAiC,EAAC,OAAO,CAAC;YAClD,CAAC,CAAC,MAAM,IAAA,oCAA4B,EAAC,OAAO,CAAC;YAC7C,CAAC,CAAC,SAAS;QAEb,WAAW,EAAE,MAAM,IAAA,qCAA6B,EAAC,OAAO,CAAC;KAC1D,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,MAAM,4BAA4B,GAAG,KAAK,EAC/C,OAAoE,EACxB,EAAE;IAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjD,IAAA,qBAAc,EAAC,OAAO,CAAC;QACvB,IAAA,oBAAY,EAAC,OAAO,CAAC;KACtB,CAAC,CAAC;IACH,OAAO,IAAA,mDAAwB,EAAC,OAAO,EAAE,WAAW,EAAE;QACpD,SAAS,EAAE,WAAW;QACtB,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;AACL,CAAC,CAAC;AAbW,QAAA,4BAA4B,gCAavC;AAIK,MAAM,6BAA6B,GAAG,KAAK,EAChD,OAAgB,EACmB,EAAE;;IACrC,+DAA+D;IAC/D,MAAM,oBAAoB,GACxB,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,aAAa;QACzC,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,WAAW;QACrC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,CAAC;IAEb,MAAM,CAAC,SAAS,EAAE,2BAA2B,EAAE,kBAAkB,CAAC,GAChE,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC;QAC7B,IAAA,qCAA8B,EAAC,OAAO,CAAC;QACvC,OAAO,CAAC,kBAAkB;KAC3B,CAAC,CAAC;IAEL,OAAO;QACL,MAAM,EAAE,IAAA,kDAAyC,EAC/C,OAAO,EACP,oBAAoB,CACrB;QACD,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC;QACrB,SAAS,EAAE;YACT,+BAA+B;YAC/B,2BAA2B,EAAE,2BAA2B;YACxD,2BAA2B,EAAE,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,mBAAmB,CACjE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,0BAA0B,GAAG,SAAS,GAAG,EAAE,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;SACf;KACF,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,6BAA6B,iCA+BxC"}
+{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":"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"}

package/dist/packages/pipeline/src/build/node/cache.d.ts

@@ -1,5 +1,10 @@
 import type { Context } from "../../types/context";
 import type { CacheConfig } from "../types";
+/**
+ * the package manager's download cache: yarn's `.yarn` zip cache, or
+ * pnpm's content-addressable store (which catladder points at a
+ * project-local `.pnpm-store`, see the install script)
+ */
 export declare const getYarnCache: (context: Context, policy?: string) => Promise<CacheConfig[]>;
 export declare const getNodeModulesCache: (context: Context, policy?: string) => Promise<CacheConfig[]>;
 export declare const getNodeCache: (context: Context, policy?: string) => Promise<CacheConfig[]>;

package/dist/packages/pipeline/src/build/node/cache.js

@@ -4,12 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
+const lodash_es_1 = require("lodash-es");
 const path_1 = require("path");
 const slugify_1 = __importDefault(require("slugify"));
 /**
- * stable reference between the two node caches: the yarn (zip) cache
- * declares itself redundant when the node_modules cache scored an
- * exact-lockfile hit (github skips the ~0.6GB download on warm runs)
+ * stable reference between the two node caches: the package-manager
+ * (yarn zip / pnpm store) cache declares itself redundant when the
+ * node_modules cache scored an exact-lockfile hit (github skips the
+ * ~0.6GB download on warm runs)
  */
 const NODE_MODULES_CACHE_ID = "node-modules";
 /**
@@ -36,23 +38,37 @@ const getCacheBaseDir = async (context) => {
         ? ((_a = context.build.workspaceBuildConfig.dir) !== null && _a !== void 0 ? _a : ".")
         : ".";
 };
+/**
+ * the package manager's download cache: yarn's `.yarn` zip cache, or
+ * pnpm's content-addressable store (which catladder points at a
+ * project-local `.pnpm-store`, see the install script)
+ */
 const getYarnCache = async (context, policy = "pull-push") => {
+    const packageManagerInfo = await context.packageManagerInfo;
+    const isPnpm = packageManagerInfo.type === "pnpm";
     const baseDir = await getCacheBaseDir(context);
+    // pnpm keeps its store in a format-versioned subdir (v10, v11, ...)
+    // and never cleans old ones up — scope the cache slot by major so a
+    // pnpm upgrade starts a fresh slot instead of dragging the dead old
+    // store tree along in every cache transfer (formats change only on
+    // majors)
+    const pnpmStoreKey = `pnpm-v${packageManagerInfo.version.split(".")[0]}`;
     return [
         {
             scope: "buildDir",
             pathMode: "relative",
             buildDir: baseDir,
-            key: "yarn",
+            key: isPnpm ? pnpmStoreKey : "yarn",
             policy,
-            paths: [".yarn"],
+            paths: [isPnpm ? ".pnpm-store" : ".yarn"],
             // content-key for immutable-cache backends (github); the lockfile
             // decides whether the cached content could have changed
-            keyFiles: ["yarn.lock"],
-            // the .yarn zips (~hundreds of MB) are only read when yarn has to
-            // (re)install packages. When the node_modules cache hit for the
-            // same lockfile, install verifies via install-state.gz and never
-            // opens a zip — so github skips downloading this cache entirely
+            keyFiles: [isPnpm ? "pnpm-lock.yaml" : "yarn.lock"],
+            // the package manager's download cache (~hundreds of MB) is only
+            // read when packages have to be (re)installed. When the
+            // node_modules cache hit for the same lockfile, install verifies
+            // its state file and never touches the store — so github skips
+            // downloading this cache entirely
             redundantOnExactHitOf: NODE_MODULES_CACHE_ID,
         },
     ];
@@ -61,27 +77,50 @@ exports.getYarnCache = getYarnCache;
 const getNodeModulesCache = async (context, policy = "pull-push") => {
     const packageManagerInfo = await context.packageManagerInfo;
     const baseDir = await getCacheBaseDir(context);
-    const { isClassic } = packageManagerInfo;
-    // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
+    const { workspaces } = packageManagerInfo;
+    const isPnpm = packageManagerInfo.type === "pnpm";
+    const lockFileName = isPnpm ? "pnpm-lock.yaml" : "yarn.lock";
+    // yarn berry tracks install state in .yarn/install-state.gz (pnpm's
+    // equivalent lives inside node_modules and is covered by the paths)
+    const hasInstallState = packageManagerInfo.type === "yarn" && !packageManagerInfo.isClassic;
+    // We intentionally do not use the contents of the lockfile as a cache key, as install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
     // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
     return [
         {
             scope: "global",
             pathMode: "absolute",
             // 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
-            key: (0, slugify_1.default)(baseDir) + "-node-modules",
+            //
+            // pnpm gets its own, lockfile-keyed cache: node_modules layouts
+            // are not compatible between package managers (a migrating
+            // project must not inherit the yarn slot), and unlike yarn, a
+            // pnpm install on top of a node_modules from a different lockfile
+            // leaves orphaned .pnpm dirs behind that break type identity —
+            // so the slot changes whenever the lockfile changes
+            key: isPnpm
+                ? {
+                    prefix: "pnpm-" + (0, slugify_1.default)(baseDir) + "-node-modules",
+                    files: [(0, path_1.join)(baseDir, "pnpm-lock.yaml")],
+                }
+                : (0, slugify_1.default)(baseDir) + "-node-modules",
             // content-key for immutable-cache backends (github); the lockfile
             // decides whether the cached content could have changed (absolute
             // pathMode: resolve the lockfile explicitly)
-            keyFiles: [(0, path_1.join)(baseDir, "yarn.lock")],
-            // referenced by the yarn cache: an exact hit here makes the yarn
-            // zips unnecessary (see redundantOnExactHitOf on getYarnCache)
+            keyFiles: [(0, path_1.join)(baseDir, lockFileName)],
+            // referenced by the package-manager cache: an exact hit here makes
+            // it unnecessary (see redundantOnExactHitOf on getYarnCache)
             cacheId: NODE_MODULES_CACHE_ID,
             policy,
-            paths: [
+            paths: (0, lodash_es_1.uniq)([
                 (0, path_1.join)(baseDir, "node_modules"),
-                ...(!isClassic ? [(0, path_1.join)(baseDir, ".yarn/install-state.gz")] : []),
-            ],
+                // pnpm's per-package node_modules are symlink farms worth
+                // keeping warm (yarn hoists into the root, so root-only
+                // matches its historical behavior)
+                ...(isPnpm
+                    ? workspaces.map((w) => (0, path_1.join)(w.location, "node_modules"))
+                    : []),
+                ...(hasInstallState ? [(0, path_1.join)(baseDir, ".yarn/install-state.gz")] : []),
+            ]),
         },
     ];
 };

package/dist/packages/pipeline/src/build/node/cache.js.map

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

package/dist/packages/pipeline/src/build/node/meteor.js

@@ -7,7 +7,7 @@ const base_1 = require("../base");
 const docker_1 = require("../docker");
 const types_1 = require("../types");
 const cache_1 = require("./cache");
-const yarn_1 = require("./yarn");
+const packageManagerInstall_1 = require("./packageManagerInstall");
 const getMeteorCache = (context) => [
     {
         key: "meteor-build-cache",
@@ -22,6 +22,11 @@ const getMeteorCache = (context) => [
 ];
 const getMeteorDockerInstallScripts = async (context) => {
     const packageManagerInfo = await context.packageManagerInfo;
+    if (packageManagerInfo.type === "pnpm") {
+        // not a meteor limitation — catladder's meteor docker install path
+        // is only implemented for yarn so far
+        throw new Error("the meteor build type is only implemented for yarn in catladder");
+    }
     if (packageManagerInfo.isClassic) {
         return new bash_1.BashExpression(`
 COPY $APP_DIR/package.json $APP_DIR/yarn.lock ./
@@ -48,8 +53,8 @@ const createMeteorBuildJobs = async (context) => {
     if (!(0, types_1.isOfBuildType)(buildConfig, "meteor")) {
         throw new Error("deploy config is not meteor");
     }
-    const [yarnInstall, nodeCache, meteorInstallScripts] = await Promise.all([
-        (0, yarn_1.getYarnInstall)(context),
+    const [packageManagerInstall, nodeCache, meteorInstallScripts] = await Promise.all([
+        (0, packageManagerInstall_1.getPackageManagerInstall)(context),
         (0, cache_1.getNodeCache)(context),
         buildConfig.installScripts
             ? getMeteorDockerInstallScripts(context)
@@ -64,7 +69,7 @@ const createMeteorBuildJobs = async (context) => {
                     METEOR_DISABLE_OPTIMISTIC_CACHING: "1", // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone
                 },
                 script: [
-                    ...yarnInstall,
+                    ...packageManagerInstall,
                     'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory',
                     "cp ./__build_info.json ./dist/bundle/programs/server",
                 ],

package/dist/packages/pipeline/src/build/node/meteor.js.map

@@ -1 +1 @@
-{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;AAAA,0CAAiD;AACjD,yCAA8C;AAQ9C,kCAAmD;AACnD,sCAAsE;AAEtE,oCAAyC;AACzC,mCAAuC;AACvC,iCAAwC;AAExC,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAiB,EAAE,CAAC;IACnE;QACE,GAAG,EAAE,oBAAoB;QACzB,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,0CAA0C;YAC1C,4BAA4B;YAC5B,wBAAwB;YACxB,qCAAqC;SACtC;KACF;CACF,CAAC;AACF,MAAM,6BAA6B,GAAG,KAAK,EACzC,OAAkC,EACT,EAAE;IAC3B,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC;IAC5D,IAAI,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACjC,OAAO,IAAI,qBAAc,CACvB;;;;;;OAMC,CAAC,IAAI,EAAE,CACT,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACzC,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,IAAI,qBAAc,CACvB;;;EAGF,6BAA6B;;KAE1B,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,KAAK,EACxC,OAAkC,EACT,EAAE;IAC3B,MAAM,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,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,oBAAoB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvE,IAAA,qBAAc,EAAC,OAAO,CAAC;QACvB,IAAA,oBAAY,EAAC,OAAO,CAAC;QACrB,WAAW,CAAC,cAAc;YACxB,CAAC,CAAC,6BAA6B,CAAC,OAAO,CAAC;YACxC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAW,CAAC;KACjC,CAAC,CAAC;IAEH,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI,IAAI,WAAW,CAAC,YAAY,KAAK,KAAK;YACrE,CAAC,CAAC;gBACE,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;gBACjD,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,EAAE;oBACN,GAAG,WAAW;oBAEd,kNAAkN;oBAElN,sDAAsD;iBACvD;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,EAAE,QAAQ,CAAC;YACpE,SAAS,EAAE;gBACT,sBAAsB,EAAE,oBAAoB;aAC7C;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA1CW,QAAA,qBAAqB,yBA0ChC"}
+{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;AAAA,0CAAiD;AACjD,yCAA8C;AAQ9C,kCAAmD;AACnD,sCAAsE;AAEtE,oCAAyC;AACzC,mCAAuC;AACvC,mEAAmE;AAEnE,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAiB,EAAE,CAAC;IACnE;QACE,GAAG,EAAE,oBAAoB;QACzB,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,0CAA0C;YAC1C,4BAA4B;YAC5B,wBAAwB;YACxB,qCAAqC;SACtC;KACF;CACF,CAAC;AACF,MAAM,6BAA6B,GAAG,KAAK,EACzC,OAAkC,EACT,EAAE;IAC3B,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC;IAC5D,IAAI,kBAAkB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACvC,mEAAmE;QACnE,sCAAsC;QACtC,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;IACJ,CAAC;IACD,IAAI,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACjC,OAAO,IAAI,qBAAc,CACvB;;;;;;OAMC,CAAC,IAAI,EAAE,CACT,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACzC,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,IAAI,qBAAc,CACvB;;;EAGF,6BAA6B;;KAE1B,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,KAAK,EACxC,OAAkC,EACT,EAAE;IAC3B,MAAM,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,MAAM,CAAC,qBAAqB,EAAE,SAAS,EAAE,oBAAoB,CAAC,GAC5D,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,gDAAwB,EAAC,OAAO,CAAC;QACjC,IAAA,oBAAY,EAAC,OAAO,CAAC;QACrB,WAAW,CAAC,cAAc;YACxB,CAAC,CAAC,6BAA6B,CAAC,OAAO,CAAC;YACxC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAW,CAAC;KACjC,CAAC,CAAC;IAEL,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI,IAAI,WAAW,CAAC,YAAY,KAAK,KAAK;YACrE,CAAC,CAAC;gBACE,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;gBACjD,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,EAAE;oBACN,GAAG,qBAAqB;oBAExB,kNAAkN;oBAElN,sDAAsD;iBACvD;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,EAAE,QAAQ,CAAC;YACpE,SAAS,EAAE;gBACT,sBAAsB,EAAE,oBAAoB;aAC7C;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA3CW,QAAA,qBAAqB,yBA2ChC"}